From: Oleksiy Stashok <Oleksiy.Stashok_at_Sun.COM>
Date: Mon, 12 Oct 2009 20:25:18 +0200

Hi Jane,

> The changes look fine.
> Can you also send me the pom.xml in Grizzly 1.9.18d that has the
> "provided" element added to artifactId servlet-api dependency?
> Please send me the diffs.

Here they are...

WBR,
Alexey.


Modified: tags/1_9_18c/modules/cometd/pom.xml
Url: https://grizzly.dev.java.net/source/browse/grizzly/tags/1_9_18c/modules/cometd/pom.xml?view=diff&rev=3674&p1=tags/1_9_18c/modules/cometd/pom.xml&p2=tags/1_9_18c/modules/cometd/pom.xml&r1=3673&r2=3674
=
=
=
=
=
=
========================================================================
--- tags/1_9_18c/modules/cometd/pom.xml (original)
+++ tags/1_9_18c/modules/cometd/pom.xml 2009-09-25 18:01:17+0000
@@ -50,6 +50,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>${servlet-version}</version>
+ <scope>provided</scope>
         </dependency>
     </dependencies>
</project>

Modified: tags/1_9_18c/modules/http-servlet/pom.xml
Url: https://grizzly.dev.java.net/source/browse/grizzly/tags/1_9_18c/modules/http-servlet/pom.xml?view=diff&rev=3677&p1=tags/1_9_18c/modules/http-servlet/pom.xml&p2=tags/1_9_18c/modules/http-servlet/pom.xml&r1=3676&r2=3677
=
=
=
=
=
=
========================================================================
--- tags/1_9_18c/modules/http-servlet/pom.xml (original)
+++ tags/1_9_18c/modules/http-servlet/pom.xml 2009-09-25 18:11:33+0000
@@ -76,6 +76,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>${servlet-version}</version>
+ <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.grizzly</groupId>

Modified: tags/1_9_18c/samples/comet/cometd-chat/pom.xml
Url: https://grizzly.dev.java.net/source/browse/grizzly/tags/1_9_18c/samples/comet/cometd-chat/pom.xml?view=diff&rev=3678&p1=tags/1_9_18c/samples/comet/cometd-chat/pom.xml&p2=tags/1_9_18c/samples/comet/cometd-chat/pom.xml&r1=3677&r2=3678
=
=
=
=
=
=
========================================================================
--- tags/1_9_18c/samples/comet/cometd-chat/pom.xml (original)
+++ tags/1_9_18c/samples/comet/cometd-chat/pom.xml 2009-09-25
18:16:46+0000
@@ -18,6 +18,12 @@
                <finalName>grizzly-cometd-chat</finalName>
     </build>
        <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-version}</version>
+ <scope>provided</scope>
+ </dependency>
                <dependency>
                        <groupId>com.sun.grizzly</groupId>
                        <artifactId>grizzly-cometd</artifactId>

Modified: tags/1_9_18c/samples/comet/cometd-echo/pom.xml
Url: https://grizzly.dev.java.net/source/browse/grizzly/tags/1_9_18c/samples/comet/cometd-echo/pom.xml?view=diff&rev=3678&p1=tags/1_9_18c/samples/comet/cometd-echo/pom.xml&p2=tags/1_9_18c/samples/comet/cometd-echo/pom.xml&r1=3677&r2=3678
=
=
=
=
=
=
========================================================================
--- tags/1_9_18c/samples/comet/cometd-echo/pom.xml (original)
+++ tags/1_9_18c/samples/comet/cometd-echo/pom.xml 2009-09-25
18:16:46+0000
@@ -18,6 +18,12 @@
                <finalName>grizzly-cometd-echo</finalName>
     </build>
        <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-version}</version>
+ <scope>provided</scope>
+ </dependency>
                <dependency>
                        <groupId>com.sun.grizzly</groupId>
                        <artifactId>grizzly-cometd</artifactId>

Modified: tags/1_9_18c/samples/comet/cometd-javaapiupdate-chat/pom.xml
Url: https://grizzly.dev.java.net/source/browse/grizzly/tags/1_9_18c/samples/comet/cometd-javaapiupdate-chat/pom.xml?view=diff&rev=3678&p1=tags/1_9_18c/samples/comet/cometd-javaapiupdate-chat/pom.xml&p2=tags/1_9_18c/samples/comet/cometd-javaapiupdate-chat/pom.xml&r1=3677&r2=3678
=
=
=
=
=
=
========================================================================
--- tags/1_9_18c/samples/comet/cometd-javaapiupdate-chat/pom.xml
(original)
+++ tags/1_9_18c/samples/comet/cometd-javaapiupdate-chat/pom.xml
2009-09-25 18:16:46+0000
@@ -18,6 +18,12 @@
                <finalName>grizzly-cometd-bayeux</finalName>
     </build>
        <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-version}</version>
+ <scope>provided</scope>
+ </dependency>
                <dependency>
                        <groupId>com.sun.grizzly</groupId>
                        <artifactId>grizzly-cometd</artifactId>



>
> Thanks,
> Jane
>
>
> Oleksiy Stashok wrote:
>>
>> Please review and approve the following POM changes to integrate
>> Grizzly 1.9.18d release.
>> We've also made one change in grizzly packager script. Once we
>> changed servlet-api dependancy in Grizzly pom to "provided" - we've
>> commented out servlet-api subtract in packager's build.xml file.
>>
>> Thanks.
>>
>> WBR,
>> Alexey.
>>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>>
>