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 jo...@apache.org on 2006/11/16 10:50:24 UTC
svn commit: r475663 - in /webservices/axis2/branches/java/1_1: ./
modules/adb-codegen/ modules/adb/ modules/codegen/ modules/java2wsdl/
modules/kernel/ modules/parent/ modules/tool/
modules/tool/axis2-aar-maven-plugin/ modules/tool/axis2-ant-plugin/ mo...
Author: jochen
Date: Thu Nov 16 01:50:22 2006
New Revision: 475663
URL: http://svn.apache.org/viewvc?view=rev&rev=475663
Log:
The Woden POM is exporting XmlSchema 1.1 and Axiom 1.1.1, we exclude them now.
Modified:
webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml
webservices/axis2/branches/java/1_1/modules/adb/pom.xml
webservices/axis2/branches/java/1_1/modules/codegen/pom.xml
webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml
webservices/axis2/branches/java/1_1/modules/kernel/pom.xml
webservices/axis2/branches/java/1_1/modules/parent/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-ant-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/pom.xml
webservices/axis2/branches/java/1_1/pom.xml
Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml Thu Nov 16 01:50:22 2006
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: webservices/axis2/branches/java/1_1/modules/adb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/pom.xml Thu Nov 16 01:50:22 2006
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: webservices/axis2/branches/java/1_1/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/pom.xml Thu Nov 16 01:50:22 2006
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml Thu Nov 16 01:50:22 2006
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/pom.xml Thu Nov 16 01:50:22 2006
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: webservices/axis2/branches/java/1_1/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/parent/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/parent/pom.xml Thu Nov 16 01:50:22 2006
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Axis 2.0 Parent Project</name>
<inceptionYear>2004</inceptionYear>
@@ -405,7 +405,19 @@
<dependency>
<groupId>org.apache.woden</groupId>
<artifactId>woden</artifactId>
- <version>1.0.0M6</version>
+ <version>1.0.0M6</version>
+ <exclusions>
+ <!-- Woden 1.0.0M6 uses Axiom 1.1.1 -->
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <!-- Woden 1.0.0M6 uses XmlSchema 1.1 -->
+ <exclusion>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml Thu Nov 16 01:50:22 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-ant-plugin/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-ant-plugin/pom.xml Thu Nov 16 01:50:22 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-ant-plugin</artifactId>
@@ -75,32 +75,32 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-common</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Thu Nov 16 01:50:22 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-wsdl2code-maven-plugin</artifactId>
@@ -95,27 +95,27 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-common</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/pom.xml Thu Nov 16 01:50:22 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-wsdl2code-maven-plugin</artifactId>
@@ -90,27 +90,27 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/pom.xml Thu Nov 16 01:50:22 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-idea-plugin</artifactId>
@@ -97,27 +97,27 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Thu Nov 16 01:50:22 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-java2wsdl-maven-plugin</artifactId>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/pom.xml Thu Nov 16 01:50:22 2006
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-wsdl2code-maven-plugin-test1</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<name>Test 1 of the axis2-wsdl2code-maven-plugin</name>
<build>
<plugins>
<plugin>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-java2wsdl-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<configuration>
<className>org.apache.axis2.maven2.java2wsdl.test.Adder</className>
</configuration>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Thu Nov 16 01:50:22 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-wsdl2code-maven-plugin</artifactId>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/pom.xml Thu Nov 16 01:50:22 2006
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-wsdl2code-maven-plugin-test1</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<name>Test 1 of the axis2-wsdl2code-maven-plugin</name>
<build>
<plugins>
<plugin>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-wsdl2code-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<configuration>
<generateServerSide>true</generateServerSide>
<generateServerSideInterface>true</generateServerSideInterface>
Modified: webservices/axis2/branches/java/1_1/modules/tool/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/pom.xml Thu Nov 16 01:50:22 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: webservices/axis2/branches/java/1_1/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/pom.xml?view=diff&rev=475663&r1=475662&r2=475663
==============================================================================
--- webservices/axis2/branches/java/1_1/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/pom.xml Thu Nov 16 01:50:22 2006
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
- <version>1.1</version>
+ <version>1.1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Axis 2.0</name>
<modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org