geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jason Dillon <ja...@planet57.com>
Subject Re: svn commit: r421872 - in /geronimo/trunk: ./ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/zzzzj2ee-installer/ configs/javamail/ configs/rmi-naming/ etc/ modules/ modules/activation/ modules/axis/ modules/javamail-transport/ m...
Date Fri, 14 Jul 2006 22:36:57 GMT
I will apply this to m2migration once we have the latest specs  
published to the m2 repo.

Else we will have to bootstrap the specs... :-(

--jason


On Jul 14, 2006, at 4:26 AM, rickmcguire@apache.org wrote:

> Author: rickmcguire
> Date: Fri Jul 14 04:26:41 2006
> New Revision: 421872
>
> URL: http://svn.apache.org/viewvc?rev=421872&view=rev
> Log:
> GERONIMO-2147 Remove javamail-transport from Geronimo build and  
> replace with javamail-provider dependency.
>
>
> Removed:
>     geronimo/trunk/modules/javamail-transport/
> Modified:
>     geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
>     geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
>     geronimo/trunk/assemblies/zzzzj2ee-installer/project.xml
>     geronimo/trunk/configs/javamail/project.xml
>     geronimo/trunk/configs/rmi-naming/project.xml
>     geronimo/trunk/etc/project.properties
>     geronimo/trunk/modules/activation/project.xml
>     geronimo/trunk/modules/axis/project.xml
>     geronimo/trunk/modules/mail/pom.xml
>     geronimo/trunk/modules/mail/project.xml
>     geronimo/trunk/modules/pom.xml
>     geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1.xml
>     geronimo/trunk/modules/upgrade/src/test-data/ 
> appclient_dep_1_result.xml
>     geronimo/trunk/pom.xml
>
> Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee- 
> jetty-server/project.xml?rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
> +++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Fri Jul  
> 14 04:26:41 2006
> @@ -25,7 +25,7 @@
>      <description>An assembly of Geronimo into a J2EE Server using  
> Jetty as the web container</description>
>
>      <dependencies>
> -        <!-- plugin we use -->
> +        <!-- plugin we use -->
>          <dependency>
>              <groupId>geronimo</groupId>
>              <artifactId>geronimo-assembly-plugin</artifactId>
> @@ -292,7 +292,7 @@
>                  <geronimo.assemble>install</geronimo.assemble>
>              </properties>
>          </dependency>
> -        <!-- unpack -->
> +        <!-- unpack -->
>          <dependency>
>              <groupId>geronimo</groupId>
>              <artifactId>geronimo-scripts</artifactId>
> @@ -359,7 +359,7 @@
>                  <geronimo.assemble>library</geronimo.assemble>
>              </properties>
>          </dependency>
> -
> +
>         <dependency>
>              <groupId>geronimo</groupId>
>              <artifactId>geronimo-kernel</artifactId>
> @@ -368,7 +368,7 @@
>                  <geronimo.assemble>library</geronimo.assemble>
>              </properties>
>          </dependency>
> -
> +
>          <dependency>
>              <groupId>geronimo</groupId>
>              <artifactId>geronimo-system</artifactId>
> @@ -639,7 +639,7 @@
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -            <version>${geronimo_spec_javamail_version}</version>
> +            <version>${geronimo_spec_javamail_13_version}</version>
>          </dependency>
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
> @@ -701,14 +701,14 @@
>          <dependency>
>              <groupId>antlr</groupId>
>              <artifactId>antlr</artifactId>
> -            <version>${antlr_version}</version>
> +            <version>${antlr_version}</version>
>          </dependency>
>
>          <dependency>
>              <!--what is using this? -->
>              <groupId>asm</groupId>
>              <artifactId>asm</artifactId>
> -            <version>${asm_version}</version>
> +            <version>${asm_version}</version>
>          </dependency>
>
>          <dependency>
> @@ -1018,7 +1018,7 @@
>          </dependency>
>
>          <!-- Specification dependencies to preload into the  
> repository -->
> -
> +
>          <!-- Geronimo modules to preload into the repository -->
>          <dependency>
>              <groupId>geronimo</groupId>
>
> Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/j2ee- 
> tomcat-server/project.xml?rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml  
> (original)
> +++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Fri  
> Jul 14 04:26:41 2006
> @@ -25,7 +25,7 @@
>      <description>An assembly of Geronimo into a J2EE Server using  
> Tomcat for the web container</description>
>
>      <dependencies>
> -        <!-- plugin we use -->
> +        <!-- plugin we use -->
>          <dependency>
>              <groupId>geronimo</groupId>
>              <artifactId>geronimo-assembly-plugin</artifactId>
> @@ -292,7 +292,7 @@
>                  <geronimo.assemble>install</geronimo.assemble>
>              </properties>
>          </dependency>
> -        <!-- unpack -->
> +        <!-- unpack -->
>          <dependency>
>              <groupId>geronimo</groupId>
>              <artifactId>geronimo-scripts</artifactId>
> @@ -359,7 +359,7 @@
>                  <geronimo.assemble>library</geronimo.assemble>
>              </properties>
>          </dependency>
> -
> +
>         <dependency>
>              <groupId>geronimo</groupId>
>              <artifactId>geronimo-kernel</artifactId>
> @@ -368,7 +368,7 @@
>                  <geronimo.assemble>library</geronimo.assemble>
>              </properties>
>          </dependency>
> -
> +
>          <dependency>
>              <groupId>geronimo</groupId>
>              <artifactId>geronimo-system</artifactId>
> @@ -639,7 +639,7 @@
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -            <version>${geronimo_spec_javamail_version}</version>
> +            <version>${geronimo_spec_javamail_13_version}</version>
>          </dependency>
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
> @@ -702,14 +702,14 @@
>          <dependency>
>              <groupId>antlr</groupId>
>              <artifactId>antlr</artifactId>
> -            <version>${antlr_version}</version>
> +            <version>${antlr_version}</version>
>          </dependency>
>
>          <dependency>
>              <!--what is using this? -->
>              <groupId>asm</groupId>
>              <artifactId>asm</artifactId>
> -            <version>${asm_version}</version>
> +            <version>${asm_version}</version>
>          </dependency>
>
>          <dependency>
> @@ -1035,7 +1035,7 @@
>          </dependency>
>
>          <!-- Specification dependencies to preload into the  
> repository -->
> -
> +
>          <!-- Geronimo modules to preload into the repository -->
>          <dependency>
>              <groupId>geronimo</groupId>
>
> Modified: geronimo/trunk/assemblies/zzzzj2ee-installer/project.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/assemblies/ 
> zzzzj2ee-installer/project.xml? 
> rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/assemblies/zzzzj2ee-installer/project.xml  
> (original)
> +++ geronimo/trunk/assemblies/zzzzj2ee-installer/project.xml Fri  
> Jul 14 04:26:41 2006
> @@ -796,7 +796,7 @@
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -            <version>${geronimo_spec_javamail_version}</version>
> +            <version>${geronimo_spec_javamail_13_version}</version>
>              <properties>
>                  <geronimo.assemble>repository</geronimo.assemble>
>              </properties>
> @@ -841,7 +841,7 @@
>                  <geronimo.assemble>repository</geronimo.assemble>
>              </properties>
>          </dependency>
> -        <!--
> +        <!--
>          #<dependency>
>          #    <groupId>org.apache.geronimo.specs</groupId>
>          #    <artifactId>geronimo-qname_1.1_spec</artifactId>
>
> Modified: geronimo/trunk/configs/javamail/project.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/javamail/ 
> project.xml?rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/configs/javamail/project.xml (original)
> +++ geronimo/trunk/configs/javamail/project.xml Fri Jul 14 04:26:41  
> 2006
> @@ -62,9 +62,9 @@
>          </dependency>
>
>          <dependency>
> -            <groupId>geronimo</groupId>
> -            <artifactId>geronimo-javamail-transport</artifactId>
> -            <version>${pom.currentVersion}</version>
> +            <groupId>org.apache.geronimo.javamail</groupId>
> +            <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
> +            <version>${geronimo_javamail_provider_13_version}</ 
> version>
>              <properties>
>                   <geronimo.dependency>true</geronimo.dependency>
>               </properties>
> @@ -73,7 +73,7 @@
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -            <version>${geronimo_spec_javamail_version}</version>
> +            <version>${geronimo_spec_javamail_13_version}</version>
>              <properties>
>                   <geronimo.dependency>true</geronimo.dependency>
>               </properties>
>
> Modified: geronimo/trunk/configs/rmi-naming/project.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/rmi-naming/ 
> project.xml?rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/configs/rmi-naming/project.xml (original)
> +++ geronimo/trunk/configs/rmi-naming/project.xml Fri Jul 14  
> 04:26:41 2006
> @@ -111,7 +111,7 @@
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -            <version>${geronimo_spec_javamail_version}</version>
> +            <version>${geronimo_spec_javamail_13_version}</version>
>              <properties>
>                   <geronimo.dependency>true</geronimo.dependency>
>               </properties>
>
> Modified: geronimo/trunk/etc/project.properties
> URL: http://svn.apache.org/viewvc/geronimo/trunk/etc/ 
> project.properties?rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/etc/project.properties (original)
> +++ geronimo/trunk/etc/project.properties Fri Jul 14 04:26:41 2006
> @@ -112,7 +112,7 @@
>  geronimo_spec_j2ee_deployment_version=1.0.1
>  geronimo_spec_j2ee_jacc_version=1.0.1
>  geronimo_spec_j2ee_management_version=1.0.1
> -geronimo_spec_javamail_version=1.1
> +geronimo_spec_javamail_13_version=1.2-SNAPSHOT
>  geronimo_spec_jaxr_version=1.0.1
>  geronimo_spec_jaxrpc_version=1.0.1
>  geronimo_spec_jcache_version=1.1
> @@ -123,6 +123,8 @@
>  geronimo_spec_saaj_version=1.0.1
>  geronimo_spec_servlet_version=1.0.1
>
> +geronimo_javamail_provider_13_version=1.0-SNAPSHOT
> +
>  ant_version=1.6.5
>  antlr_version=2.7.2
>  apacheds_version=0.9.2
> @@ -225,7 +227,7 @@
>  # assembly projects already have geronimo- as a prefix on their  
> artifactId
>  geronimo.maven.eclipse.assemblies.project.prefix=$ 
> {geronimo.maven.eclipse.project.prefix}
>
> -# configs projects don't have geronimo- as a prefix on their  
> artifactId
> +# configs projects don't have geronimo- as a prefix on their  
> artifactId
>  # therefore there can be conflicts with other projects (e.g. the  
> activemq config)
>  geronimo.maven.eclipse.configs.project.prefix=$ 
> {geronimo.maven.eclipse.project.prefix}geronimo-configs-
>
>
> Modified: geronimo/trunk/modules/activation/project.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activation/ 
> project.xml?rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/activation/project.xml (original)
> +++ geronimo/trunk/modules/activation/project.xml Fri Jul 14  
> 04:26:41 2006
> @@ -55,7 +55,7 @@
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -            <version>${geronimo_spec_javamail_version}</version>
> +            <version>${geronimo_spec_javamail_13_version}</version>
>          </dependency>
>
>      </dependencies>
>
> Modified: geronimo/trunk/modules/axis/project.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/ 
> project.xml?rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/axis/project.xml (original)
> +++ geronimo/trunk/modules/axis/project.xml Fri Jul 14 04:26:41 2006
> @@ -128,7 +128,7 @@
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -            <version>${geronimo_spec_javamail_version}</version>
> +            <version>${geronimo_spec_javamail_13_version}</version>
>              <properties>
>                   <geronimo.dependency>true</geronimo.dependency>
>               </properties>
>
> Modified: geronimo/trunk/modules/mail/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/mail/ 
> pom.xml?rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/mail/pom.xml (original)
> +++ geronimo/trunk/modules/mail/pom.xml Fri Jul 14 04:26:41 2006
> @@ -71,6 +71,11 @@
>          </dependency>
>
>          <dependency>
> +            <groupId>org.apache.geronimo.javamail</groupId>
> +            <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
> +        </dependency>
> +
> +        <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-activation_1.0.2_spec</artifactId>
>          </dependency>
>
> Modified: geronimo/trunk/modules/mail/project.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/mail/ 
> project.xml?rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/mail/project.xml (original)
> +++ geronimo/trunk/modules/mail/project.xml Fri Jul 14 04:26:41 2006
> @@ -64,7 +64,13 @@
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -            <version>${geronimo_spec_javamail_version}</version>
> +            <version>${geronimo_spec_javamail_13_version}</version>
> +        </dependency>
> +
> +        <dependency>
> +            <groupId>org.apache.geronimo.javamail</groupId>
> +            <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
> +            <version>${geronimo_javamail_provider_13_version}</ 
> version>
>          </dependency>
>
>          <dependency>
>
> Modified: geronimo/trunk/modules/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/pom.xml? 
> rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/pom.xml (original)
> +++ geronimo/trunk/modules/pom.xml Fri Jul 14 04:26:41 2006
> @@ -63,7 +63,6 @@
>          <module>j2ee-schema</module>
>          <module>jetty</module>
>          <module>jetty-builder</module>
> -        <module>javamail-transport</module>
>          <module>jmx-remoting</module>
>          <module>kernel</module>
>          <module>management</module>
>
> Modified: geronimo/trunk/modules/upgrade/src/test-data/ 
> appclient_dep_1.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/ 
> src/test-data/appclient_dep_1.xml? 
> rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/upgrade/src/test-data/ 
> appclient_dep_1.xml (original)
> +++ geronimo/trunk/modules/upgrade/src/test-data/ 
> appclient_dep_1.xml Fri Jul 14 04:26:41 2006
> @@ -30,12 +30,12 @@
>                  <groupId>org.apache.geronimo.specs</groupId>
>                  <type>jar</type>
>                  <artifactId>geronimo-activation_1.0.2_spec</ 
> artifactId>
> -                <version>${geronimo_spec_javamail_version}</version>
> +                <version>${geronimo_spec_activation_version}</ 
> version>
>              </dependency>
>              <dependency>
>                  <groupId>org.apache.geronimo.specs</groupId>
>                  <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -                <version>${geronimo_spec_javamail_version}</version>
> +                <version>${geronimo_spec_javamail_13_version}</ 
> version>
>              </dependency>
>
>              <resource-ref xmlns="http://geronimo.apache.org/xml/ns/ 
> naming">
>
> Modified: geronimo/trunk/modules/upgrade/src/test-data/ 
> appclient_dep_1_result.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/ 
> src/test-data/appclient_dep_1_result.xml? 
> rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/upgrade/src/test-data/ 
> appclient_dep_1_result.xml (original)
> +++ geronimo/trunk/modules/upgrade/src/test-data/ 
> appclient_dep_1_result.xml Fri Jul 14 04:26:41 2006
> @@ -67,7 +67,7 @@
>            <dep:dependency>
>              <dep:groupId>org.apache.geronimo.specs</dep:groupId>
>              <dep:artifactId>geronimo-javamail_1.3.1_spec</ 
> dep:artifactId>
> -            <dep:version>${geronimo_spec_javamail_version}</ 
> dep:version>
> +            <dep:version>${geronimo_spec_javamail_13_version}</ 
> dep:version>
>              <dep:type>jar</dep:type>
>            </dep:dependency>
>          </dep:dependencies>
>
> Modified: geronimo/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml? 
> rev=421872&r1=421871&r2=421872&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/pom.xml (original)
> +++ geronimo/trunk/pom.xml Fri Jul 14 04:26:41 2006
> @@ -115,7 +115,7 @@
>          <geronimoSpecJ2eeDeploymentVersion>1.0.1</ 
> geronimoSpecJ2eeDeploymentVersion>
>          <geronimoSpecJ2eeJaccVersion>1.0.1</ 
> geronimoSpecJ2eeJaccVersion>
>          <geronimoSpecJ2eeManagementVersion>1.0.1</ 
> geronimoSpecJ2eeManagementVersion>
> -        <geronimoSpecJavamailVersion>1.1</ 
> geronimoSpecJavamailVersion>
> +        <geronimoSpecJavamail13Version>1.2-SNAPSHOT</ 
> geronimoSpecJavamail13Version>
>          <geronimoSpecJaxrVersion>1.0.1</geronimoSpecJaxrVersion>
>          <geronimoSpecJaxrpcVersion>1.0.1</geronimoSpecJaxrpcVersion>
>          <geronimoSpecJmsVersion>1.0.1</geronimoSpecJmsVersion>
> @@ -270,7 +270,7 @@
>              <dependency>
>                  <groupId>org.apache.geronimo.specs</groupId>
>                  <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
> -                <version>${geronimoSpecJavamailVersion}</version>
> +                <version>${geronimoSpecJavamail13Version}</version>
>              </dependency>
>
>              <dependency>
>
>


Mime
View raw message