Author: veithen
Date: Sat Mar 19 13:46:17 2011
New Revision: 1083180
URL: http://svn.apache.org/viewvc?rev=1083180&view=rev
Log:
* Fixed the dependency versions in the java_first_jaxws sample and removed
dependencies that are already included as transitive dependencies.
* Automatically invoke the build of the java_first_jaxws sample during the
integration-test phase of the distribution module.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1083180&r1=1083179&r2=1083180&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sat Mar 19 13:46:17
2011
@@ -352,6 +352,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>build-maven-samples</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+
<projectsDirectory>${project.build.directory}/axis2-${project.version}/samples</projectsDirectory>
+ <pomIncludes>
+
<pomInclude>java_first_jaxws/pom.xml</pomInclude>
+ </pomIncludes>
+ <streamLogs>true</streamLogs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<!-- We don't want to deploy the distributions to the Maven
repository.
Modified: axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml?rev=1083180&r1=1083179&r2=1083180&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml Sat Mar
19 13:46:17 2011
@@ -38,109 +38,22 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx</artifactId>
- <version>asl-3.2.4</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.6</version>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.1.6</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
@@ -181,21 +94,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-tools</artifactId>
- <version>2.1.3</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
@@ -258,32 +156,4 @@
</testResource>
</testResources>
</build>
-
- <!-- needed for XmlSchema -->
- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio maven repository</name>
- <url>http://ibiblio.org/maven/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache</id>
- <name>Apache maven repository</name>
- <url>http://www.apache.org/dist/java-repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
</project>
