You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/03 04:44:49 UTC
svn commit: r514064 - in /webservices/axis2/trunk/java/modules: java2wsdl/
parent/ saaj-api/ tool/axis2-ant-plugin/ tool/axis2-eclipse-codegen-plugin/
tool/axis2-idea-plugin/ tool/conf/codegen/
Author: dims
Date: Fri Mar 2 19:44:48 2007
New Revision: 514064
URL: http://svn.apache.org/viewvc?view=rev&rev=514064
Log:
switch the m2 poms to use Geronimo's mail & activation jar
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
webservices/axis2/trunk/java/modules/parent/pom.xml
webservices/axis2/trunk/java/modules/saaj-api/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml
webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties
webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
Modified: webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/pom.xml?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/pom.xml Fri Mar 2 19:44:48 2007
@@ -69,8 +69,8 @@
<artifactId>XmlSchema</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
</dependency>
<dependency>
<groupId>jaxen</groupId>
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Fri Mar 2 19:44:48 2007
@@ -85,7 +85,7 @@
as the maven-release-plugin will not update this value.
-->
<version>SNAPSHOT</version>
- <activation.version>1.1</activation.version>
+ <activation.version>1.0-SNAPSHOT</activation.version>
<annogen.version>0.1.0</annogen.version>
<ant.version>1.6.5</ant.version>
<axiom.version>SNAPSHOT</axiom.version>
@@ -498,9 +498,9 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: webservices/axis2/trunk/java/modules/saaj-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj-api/pom.xml?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj-api/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj-api/pom.xml Fri Mar 2 19:44:48 2007
@@ -41,14 +41,14 @@
<version>1.3.03</version>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml Fri Mar 2 19:44:48 2007
@@ -151,14 +151,14 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml Fri Mar 2 19:44:48 2007
@@ -51,7 +51,7 @@
<!--Codegen wizard libraries -->
<fileset id="codegen.libs" dir="${axis2.lib.dir}">
- <include name="activation-${activation.version}.jar" />
+ <include name="geronimo-activation_1.1_spec-${activation.version}.jar" />
<include name="annogen-${annogen.version}.jar" />
<include name="ant-${ant.version}.jar" />
<include name="axiom-api-${axiom.version}.jar" />
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml Fri Mar 2 19:44:48 2007
@@ -14,7 +14,7 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>javax.activation:activation:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar</include>
<include>annogen:annogen:jar</include>
<include>org.apache.ws.commons.axiom:axiom-api:jar</include>
<include>org.apache.ws.commons.axiom:axiom-dom:jar</include>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Fri Mar 2 19:44:48 2007
@@ -101,9 +101,9 @@
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>annogen</groupId>
@@ -292,7 +292,7 @@
<!--Filter tockens for the copy command to filter the versions of external dependencies -->
<filter token="version_number" value="SNAPSHOT" />
- <filter token="activation.version" value="1.1" />
+ <filter token="activation.version" value="1.0-SNAPSHOT" />
<filter token="annogen.version" value="0.1.0" />
<filter token="ant.version" value="1.6.5" />
<filter token="axiom.version" value="SNAPSHOT" />
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml Fri Mar 2 19:44:48 2007
@@ -141,14 +141,14 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties Fri Mar 2 19:44:48 2007
@@ -7,7 +7,7 @@
help/,\
lib/,\
src/,\
- lib/activation-@activation.version@.jar,\
+ lib/geronimo-activation_1.1_spec-@activation.version@.jar,\
lib/annogen-@annogen.version@.jar,\
lib/ant-@ant.version@.jar,\
lib/axiom-api-@axiom.version@.jar,\
Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml?view=diff&rev=514064&r1=514063&r2=514064
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml Fri Mar 2 19:44:48 2007
@@ -11,7 +11,7 @@
<library name="Axis2CodegenWizard.jar">
<export name="*"/>
</library>
- <library name="lib/activation-@activation.version@.jar">
+ <library name="lib/geronimo-activation_1.1_spec-@activation.version@.jar">
<export name="*"/>
</library>
<library name="lib/annogen-@annogen.version@.jar">
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org