geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Jencks <david_jen...@yahoo.com>
Subject Re: svn commit: r722730 - in /geronimo/server/trunk: plugins/jasper/jasper/src/main/history/dependencies.xml plugins/tomcat/tomcat6/src/main/history/dependencies.xml pom.xml repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.pom
Date Wed, 03 Dec 2008 07:03:39 GMT
Thanks for fixing this, I ran out of time after realizing it caused a  
problem.  I made a couple more tweaks to get the dependencies.xml back  
to where they were in rev 722795

david jencks

On Dec 2, 2008, at 7:03 PM, dwoods@apache.org wrote:

> Author: dwoods
> Date: Tue Dec  2 19:03:40 2008
> New Revision: 722730
>
> URL: http://svn.apache.org/viewvc?rev=722730&view=rev
> Log:
> updates related to Rev722685, which introduced new depends for some  
> of the patched Tomcat artifacts
>
> Modified:
>    geronimo/server/trunk/plugins/jasper/jasper/src/main/history/ 
> dependencies.xml
>    geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/ 
> dependencies.xml
>    geronimo/server/trunk/pom.xml
>    geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.18- 
> G678601/jasper-6.0.18-G678601.pom
>
> Modified: geronimo/server/trunk/plugins/jasper/jasper/src/main/ 
> history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml?rev=722730&r1=722729&r2=722730&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/server/trunk/plugins/jasper/jasper/src/main/history/ 
> dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/jasper/jasper/src/main/history/ 
> dependencies.xml Tue Dec  2 19:03:40 2008
> @@ -12,6 +12,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.tomcat</groupId>
> +        <artifactId>catalina</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>j2ee-server</artifactId>
>         <type>car</type>
>
> Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/ 
> history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml?rev=722730&r1=722729&r2=722730&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/ 
> dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/ 
> dependencies.xml Tue Dec  2 19:03:40 2008
> @@ -12,11 +12,6 @@
>         <type>car</type>
>     </dependency>
>     <dependency>
> -        <groupId>org.apache.tomcat</groupId>
> -        <artifactId>catalina</artifactId>
> -        <type>jar</type>
> -    </dependency>
> -    <dependency>
>         <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>j2ee-server</artifactId>
>         <type>car</type>
>
> Modified: geronimo/server/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=722730&r1=722729&r2=722730&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/server/trunk/pom.xml (original)
> +++ geronimo/server/trunk/pom.xml Tue Dec  2 19:03:40 2008
> @@ -1402,12 +1402,36 @@
>                 <groupId>org.apache.tomcat</groupId>
>                 <artifactId>jasper</artifactId>
>                 <version>6.0.18-G678601</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>org.apache.tomcat</groupId>
> +                        <artifactId>servlet-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>org.apache.tomcat</groupId>
> +                        <artifactId>juli</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>org.apache.tomcat</groupId>
> +                        <artifactId>jsp-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>org.apache.tomcat</groupId>
> +                        <artifactId>el-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
>             </dependency>
>
>             <dependency>
>                 <groupId>org.apache.tomcat</groupId>
>                 <artifactId>jasper-el</artifactId>
>                 <version>6.0.18-G678601</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>org.apache.tomcat</groupId>
> +                        <artifactId>el-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
>             </dependency>
>
>             <dependency>
> @@ -1444,6 +1468,20 @@
>                 <groupId>org.apache.tomcat</groupId>
>                 <artifactId>catalina</artifactId>
>                 <version>6.0.18-G678601</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>org.apache.tomcat</groupId>
> +                        <artifactId>servlet-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>org.apache.tomcat</groupId>
> +                        <artifactId>juli</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>org.apache.tomcat</groupId>
> +                        <artifactId>annotations-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
>             </dependency>
>
>             <dependency>
>
> Modified: geronimo/server/trunk/repository/org/apache/tomcat/jasper/ 
> 6.0.18-G678601/jasper-6.0.18-G678601.pom
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.pom?rev=722730&r1=722729&r2=722730&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.18- 
> G678601/jasper-6.0.18-G678601.pom (original)
> +++ geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.18- 
> G678601/jasper-6.0.18-G678601.pom Tue Dec  2 19:03:40 2008
> @@ -44,7 +44,7 @@
>     <dependency>
>       <groupId>org.apache.tomcat</groupId>
>       <artifactId>catalina</artifactId>
> -      <version>6.0.18</version>
> +      <version>6.0.18-G678601</version>
>       <scope>compile</scope>
>     </dependency>
>     <dependency>
>
>


Mime
View raw message