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 2008/01/28 21:42:55 UTC
svn commit: r616032 - in /webservices/axis2/trunk/java/modules:
corba/pom.xml distribution/pom.xml documentation/pom.xml
fastinfoset/pom.xml parent/pom.xml soapmonitor/pom.xml
tool/axis2-eclipse-codegen-plugin/pom.xml webapp/pom.xml
Author: dims
Date: Mon Jan 28 12:42:38 2008
New Revision: 616032
URL: http://svn.apache.org/viewvc?rev=616032&view=rev
Log:
update a whole bunch of dependencies. please holler if you see a build break.
Modified:
webservices/axis2/trunk/java/modules/corba/pom.xml
webservices/axis2/trunk/java/modules/distribution/pom.xml
webservices/axis2/trunk/java/modules/documentation/pom.xml
webservices/axis2/trunk/java/modules/fastinfoset/pom.xml
webservices/axis2/trunk/java/modules/parent/pom.xml
webservices/axis2/trunk/java/modules/soapmonitor/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
webservices/axis2/trunk/java/modules/webapp/pom.xml
Modified: webservices/axis2/trunk/java/modules/corba/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/corba/pom.xml?rev=616032&r1=616031&r2=616032&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/corba/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/corba/pom.xml Mon Jan 28 12:42:38 2008
@@ -32,18 +32,8 @@
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
- <version>2.7.6</version>
+ <version>${antlr.version}</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-core</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- </dependency-->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
@@ -63,21 +53,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- <!--dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
- <version>1.2.2</version>
- </dependency-->
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?rev=616032&r1=616031&r2=616032&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Mon Jan 28 12:42:38 2008
@@ -233,7 +233,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>${maven.assembly.version}</version>
<executions>
<execution>
<id>distribution-package</id>
@@ -257,7 +257,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>${maven.antrun.version}</version>
<inherited>false</inherited>
<executions>
<execution>
Modified: webservices/axis2/trunk/java/modules/documentation/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/pom.xml?rev=616032&r1=616031&r2=616032&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/pom.xml Mon Jan 28 12:42:38 2008
@@ -230,7 +230,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>${maven.antrun.version}</version>
<inherited>false</inherited>
<executions>
<execution>
Modified: webservices/axis2/trunk/java/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/pom.xml?rev=616032&r1=616031&r2=616032&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/pom.xml Mon Jan 28 12:42:38 2008
@@ -109,12 +109,12 @@
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
- <version>1.1.8</version>
+ <version>${fi.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>${junit.version}</version>
</dependency>
</dependencies>
</profile>
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=616032&r1=616031&r2=616032&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Mon Jan 28 12:42:38 2008
@@ -80,69 +80,75 @@
as the maven-release-plugin will not update this value.
-->
<version>SNAPSHOT</version>
- <addressing.mar.version>SNAPSHOT</addressing.mar.version>
- <soapmonitor.mar.version>SNAPSHOT</soapmonitor.mar.version>
- <mex.mar.version>SNAPSHOT</mex.mar.version>
- <ping.mar.version>SNAPSHOT</ping.mar.version>
- <scripting.mar.version>SNAPSHOT</scripting.mar.version>
+
+ <!-- Version #'s for the mars that we generate -->
+ <addressing.mar.version>SNAPSHOT</addressing.mar.version>
+ <soapmonitor.mar.version>SNAPSHOT</soapmonitor.mar.version>
+ <mex.mar.version>SNAPSHOT</mex.mar.version>
+ <ping.mar.version>SNAPSHOT</ping.mar.version>
+ <scripting.mar.version>SNAPSHOT</scripting.mar.version>
+
+ <!-- Version #'s of all out dependencies -->
+ <activemq.version>5.0.0</activemq.version>
<annogen.version>0.1.0</annogen.version>
<ant.version>1.7.0</ant.version>
- <antlr.version>2.7.4</antlr.version>
- <activemq.version>4.1.1</activemq.version>
+ <antlr.version>2.7.7</antlr.version>
<axiom.version>SNAPSHOT</axiom.version>
- <backport.util.concurrent.version>2.2</backport.util.concurrent.version>
+ <backport.util.concurrent.version>3.1</backport.util.concurrent.version>
<bcel.version>5.2</bcel.version>
<bsf.version>2.4.0</bsf.version>
<commons.codec.version>1.3</commons.codec.version>
- <commons.fileupload.version>1.1.1</commons.fileupload.version>
- <commons.httpclient.version>3.0.1</commons.httpclient.version>
- <commons.io.version>1.2</commons.io.version>
- <commons.logging.version>1.1</commons.logging.version>
+ <commons.fileupload.version>1.2</commons.fileupload.version>
+ <commons.httpclient.version>3.1</commons.httpclient.version>
+ <commons.io.version>1.4</commons.io.version>
+ <commons.logging.version>1.1.1</commons.logging.version>
+ <eclipse.plugins.version>1.3.0</eclipse.plugins.version>
<eclipse.version>3.2.0</eclipse.version>
- <eclipse.plugins.version>1.3.0</eclipse.plugins.version>
- <fi.version>1.2.1</fi.version>
- <geronimo.spec.activation.version>1.0-M1</geronimo.spec.activation.version>
- <geronimo.spec.javamail.version>1.0-M1</geronimo.spec.javamail.version>
- <geronimo.spec.jms.version>1.1</geronimo.spec.jms.version>
+ <fi.version>1.1.8</fi.version>
+ <geronimo.spec.activation.version>1.0.1</geronimo.spec.activation.version>
<geronimo.spec.annotation.version>1.1</geronimo.spec.annotation.version>
- <groovy.all.version>1.0-jsr-06</groovy.all.version>
- <intellij.version>5.0</intellij.version>
+ <geronimo.spec.javamail.version>1.2</geronimo.spec.javamail.version>
+ <geronimo.spec.jms.version>1.1</geronimo.spec.jms.version>
+ <groovy.all.version>1.0</groovy.all.version>
<httpcore.version>4.0-alpha6</httpcore.version>
+ <intellij.version>5.0</intellij.version>
<jalopy.version>1.5rc3</jalopy.version>
- <jaxb.api.version>2.0</jaxb.api.version>
- <jaxbri.version>2.0.5</jaxbri.version>
+ <jaxb.api.version>2.1</jaxb.api.version>
+ <jaxbri.version>2.1</jaxbri.version>
<jaxen.version>1.1.1</jaxen.version>
<jaxme2.version>0.5.2</jaxme2.version>
- <jettison.version>1.0-RC1</jettison.version>
+ <jettison.version>1.0-RC2</jettison.version>
<jibx.version>1.1.5</jibx.version>
- <junit.version>4.3.1</junit.version>
<junit.version-jdk1.4>3.8.2</junit.version-jdk1.4>
- <log4j.version>1.2.14</log4j.version>
- <maven.archiver.version>2.2</maven.archiver.version>
- <maven.artifact.version>2.0.4</maven.artifact.version>
- <maven.assembly.version>2.2-beta-1</maven.assembly.version>
- <maven.plugin.testing.version>1.0-beta-1</maven.plugin.testing.version>
- <maven.version>2.0.7</maven.version>
+ <junit.version>4.4</junit.version>
+ <log4j.version>1.2.15</log4j.version>
+ <maven.antrun.version>1.1</maven.antrun.version> <!-- ??? -->
+ <maven.archiver.version>2.2</maven.archiver.version> <!-- ??? -->
+ <maven.artifact.version>2.0.4</maven.artifact.version> <!-- ??? -->
+ <maven.assembly.version>2.2-beta-1</maven.assembly.version> <!-- ??? -->
+ <maven.plugin.testing.version>1.0-beta-1</maven.plugin.testing.version> <!-- ??? -->
+ <maven.version>2.0.7</maven.version> <!-- ??? -->
+ <maven.war.version>2.0.2</maven.war.version> <!-- ??? -->
<neethi.version>SNAPSHOT</neethi.version>
- <plexus.utils.version>1.1</plexus.utils.version>
- <rhino.version>1.6R5</rhino.version>
+ <plexus.utils.version>1.1</plexus.utils.version> <!-- ??? -->
+ <rhino.version>1.6R7</rhino.version>
<servlet.api.version>2.3</servlet.api.version>
- <spring.version>2.0.4</spring.version>
+ <spring.version>2.5.1</spring.version>
<stax.api.version>1.0.1</stax.api.version>
<stax.impl.artifactid>wstx-asl</stax.impl.artifactid>
<stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
- <stax.impl.version>3.2.1</stax.impl.version>
- <stax_utils.version>20060915</stax_utils.version>
- <tomcat.version>6.0.10</tomcat.version>
+ <stax.impl.version>3.2.4</stax.impl.version>
+ <stax_utils.version>20060915</stax_utils.version> <!-- ??? -->
+ <tomcat.version>6.0.14</tomcat.version>
<woden.version>1.0-incubating-SNAPSHOT</woden.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xalan.version>2.7.0</xalan.version>
- <xmlbeans.version>2.3.0</xmlbeans.version>
<xerces.version>2.8.1</xerces.version>
- <xml_apis.version>1.3.03</xml_apis.version>
+ <xml_apis.version>1.3.04</xml_apis.version>
+ <xmlbeans.version>2.3.0</xmlbeans.version>
<xmlschema.version>SNAPSHOT</xmlschema.version>
- <xmlunit.version>1.0</xmlunit.version>
-
+ <xmlunit.version>1.1</xmlunit.version>
+
<!-- The build failing if tests are skipped is very annoying -->
<failIfNoTests>false</failIfNoTests>
</properties>
@@ -819,6 +825,32 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
Modified: webservices/axis2/trunk/java/modules/soapmonitor/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/soapmonitor/pom.xml?rev=616032&r1=616031&r2=616032&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/soapmonitor/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/soapmonitor/pom.xml Mon Jan 28 12:42:38 2008
@@ -31,6 +31,10 @@
<description>soapmonitor for Axis 2.0</description>
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${version}</version>
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?rev=616032&r1=616031&r2=616032&view=diff
==============================================================================
--- 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 Mon Jan 28 12:42:38 2008
@@ -141,7 +141,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>${geronimo.spec.activation.version}</version>
+ <version>${geronimo.spec.javamail.version}</version>
</dependency>
<dependency>
<groupId>annogen</groupId>
Modified: webservices/axis2/trunk/java/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/pom.xml?rev=616032&r1=616031&r2=616032&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/pom.xml Mon Jan 28 12:42:38 2008
@@ -449,7 +449,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
+ <version>${maven.war.version}</version>
<configuration>
<warName>axis2</warName>
<archive>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org