Author: rfeng
Date: Wed Jan 16 15:32:18 2008
New Revision: 612623
URL: http://svn.apache.org/viewvc?rev=612623&view=rev
Log:
Update pom.xml to match latest version of Surefire, JAXB, Tomcat and Jetty
Modified:
incubator/tuscany/java/sca/itest/bpel/helloworld/pom.xml
incubator/tuscany/java/sca/itest/databindings/interop/pom.xml
incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml
incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml
incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml
incubator/tuscany/java/sca/modules/host-jetty/pom.xml
incubator/tuscany/java/sca/modules/host-tomcat/pom.xml
incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml
incubator/tuscany/java/sca/pom.xml
incubator/tuscany/java/sca/samples/helloworld-bpel/pom.xml
Modified: incubator/tuscany/java/sca/itest/bpel/helloworld/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/bpel/helloworld/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/bpel/helloworld/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/bpel/helloworld/pom.xml Wed Jan 16
15:32:18 2008
@@ -83,7 +83,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!--
http://jira.codehaus.org/browse/SUREFIRE-322 -->
- <version>2.3.1</version>
+ <version>2.4</version>
<configuration>
<useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>
Modified: incubator/tuscany/java/sca/itest/databindings/interop/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/pom.xml Wed Jan 16
15:32:18 2008
@@ -86,16 +86,18 @@
<version>2.1</version>
<scope>compile</scope>
</dependency>
+ <!--
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.4</version>
<scope>runtime</scope>
</dependency>
+ -->
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.1.1</version>
+ <version>2.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml Wed Jan 16
15:32:18 2008
@@ -45,13 +45,9 @@
<pluginRepositories>
<pluginRepository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>java.net</id>
- <name>java.net Maven 1.x Repository</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
+ <id>java.net2</id>
+ <name>java.net Maven 2.x Repository</name>
+ <url>http://download.java.net/maven/2</url>
</pluginRepository>
</pluginRepositories>
@@ -61,7 +57,7 @@
<artifactId>tuscany-binding-ws-axis2</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-jaxb</artifactId>
@@ -85,47 +81,49 @@
<artifactId>itest-databindings-common</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface-java-xml</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
<scope>compile</scope>
</dependency>
+ <!--
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.4</version>
<scope>runtime</scope>
</dependency>
+ -->
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.1.1</version>
+ <version>2.1.3</version>
</dependency>
</dependencies>
@@ -138,55 +136,55 @@
<argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-databindings-common</artifactId>
- <version>${project.version}</version>
- <overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/classes</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tuscany.sca</groupId>
+
<artifactId>itest-databindings-common</artifactId>
+ <version>${project.version}</version>
+ <overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
<execution>
- <id>copy</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.1</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
-
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
+ <id>copy</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
</execution>
- </executions>
- </plugin>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -212,7 +210,7 @@
<executions>
<execution>
<id>generate-test-source</id>
- <phase>process-resources</phase>
+ <phase>process-resources</phase>
<goals>
<goal>java</goal>
</goals>
@@ -220,17 +218,18 @@
</executions>
<configuration>
<mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
- <arguments>
+ <arguments>
<argument>${project.build.directory}</argument>
</arguments>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
+ <version>1.9</version>
<executions>
<execution>
- <phase>process-resources</phase>
+ <phase>process-resources</phase>
<goals>
<goal>wsimport</goal>
</goals>
@@ -243,7 +242,8 @@
<wsdlFile>Greeter.wsdl</wsdlFile>
</wsdlFiles>
<sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <verbose>true</verbose>
+ <verbose>false</verbose>
+ <xnocompile>true</xnocompile>
</configuration>
</plugin>
</plugins>
Modified: incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml
(original)
+++ incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml Wed
Jan 16 15:32:18 2008
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.1</version>
+ <version>2.1.3</version>
</dependency>
<dependency>
@@ -115,6 +115,15 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>java.net2</id>
+ <name>java.net Maven 2.x Repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -160,6 +169,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
+ <version>1.9</version>
<executions>
<execution>
<id>generate-jaxb</id>
@@ -171,17 +181,11 @@
</executions>
<configuration>
<wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
- <verbose>true</verbose>
+ <verbose>false</verbose>
+ <xnocompile>true</xnocompile>
<packageName>org.apache.tuscany.sca.test.exceptions.impl.jaxb</packageName>
<keep>true</keep>
</configuration>
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- </dependencies>
</plugin>
<!-- SDO Generation -->
<plugin>
Modified: incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml Wed Jan
16 15:32:18 2008
@@ -32,7 +32,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.1</version>
+ <version>2.1.3</version>
</dependency>
<dependency>
@@ -108,7 +108,15 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>java.net2</id>
+ <name>java.net Maven 2.x Repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -154,6 +162,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
+ <version>1.9</version>
<executions>
<execution>
<id>generate-jaxb</id>
@@ -165,17 +174,11 @@
</executions>
<configuration>
<wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
- <verbose>true</verbose>
+ <verbose>false</verbose>
+ <xnocompile>true</xnocompile>
<packageName>org.apache.tuscany.sca.test.exceptions.impl.jaxb</packageName>
<keep>true</keep>
</configuration>
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- </dependencies>
</plugin>
<!-- SDO Generation -->
<plugin>
Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml Wed Jan 16
15:32:18 2008
@@ -60,7 +60,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -92,13 +92,9 @@
<pluginRepositories>
<pluginRepository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>java.net</id>
- <name>java.net Maven 1.x Repository</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
+ <id>java.net2</id>
+ <name>java.net Maven 2.x Repository</name>
+ <url>http://download.java.net/maven/2</url>
</pluginRepository>
</pluginRepositories>
@@ -164,9 +160,9 @@
</plugin>
<plugin>
- <groupId>com.sun.tools.xjc.maven2</groupId>
- <artifactId>maven-jaxb-plugin</artifactId>
- <version>1.1</version>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>0.5</version>
<executions>
<execution>
<id>generate-jaxb</id>
@@ -180,9 +176,9 @@
<generatePackage>com.example.ipo.jaxb</generatePackage>
<generateDirectory>${project.build.directory}/jaxb-source</generateDirectory>
<schemaDirectory>${basedir}/src/test/resources</schemaDirectory>
- <includeSchemas>
- <includeSchema>ipo.xsd</includeSchema>
- </includeSchemas>
+ <schemaIncludes>
+ <include>ipo.xsd</include>
+ </schemaIncludes>
</configuration>
</plugin>
Modified: incubator/tuscany/java/sca/modules/host-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-jetty/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-jetty/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/host-jetty/pom.xml Wed Jan 16 15:32:18
2008
@@ -38,19 +38,13 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.3</version>
+ <version>6.1.7</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
</exclusion>
</exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.3</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/modules/host-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-tomcat/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-tomcat/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/host-tomcat/pom.xml Wed Jan 16 15:32:18
2008
@@ -28,21 +28,6 @@
<artifactId>tuscany-host-tomcat</artifactId>
<name>Apache Tuscany SCA Tomcat Servlet Host Extension</name>
- <repositories>
- <repository>
- <id>tomcat-m2-repo</id>
- <name>Tomcat M2 Repository</name>
- <url>http://tomcat.apache.org/dev/dist/m2-repository/</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -59,7 +44,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.10</version>
+ <version>6.0.14</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
@@ -71,7 +56,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>coyote</artifactId>
- <version>6.0.10</version>
+ <version>6.0.14</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Wed Jan 16
15:32:18 2008
@@ -355,7 +355,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
- <version>2.3.1</version>
+ <version>2.4</version>
<configuration>
<useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>
Modified: incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml Wed Jan 16
15:32:18 2008
@@ -28,27 +28,12 @@
<artifactId>tuscany-runtime-tomcat</artifactId>
<name>Apache Tuscany SCA Runtime for Tomcat deep integration</name>
- <repositories>
- <repository>
- <id>tomcat-m2-repo</id>
- <name>Tomcat M2 Repository</name>
- <url>http://tomcat.apache.org/dev/dist/m2-repository/</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.10</version>
+ <version>6.0.14</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
@@ -61,7 +46,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>coyote</artifactId>
- <version>6.0.10</version>
+ <version>6.0.14</version>
<scope>provided</scope>
</dependency>
Modified: incubator/tuscany/java/sca/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Wed Jan 16 15:32:18 2008
@@ -168,7 +168,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<configuration>
<includes>
<include>**/*TestCase.java</include>
Modified: incubator/tuscany/java/sca/samples/helloworld-bpel/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-bpel/pom.xml?rev=612623&r1=612622&r2=612623&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-bpel/pom.xml Wed Jan 16
15:32:18 2008
@@ -81,15 +81,15 @@
<finalName>${artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!--
http://jira.codehaus.org/browse/SUREFIRE-322 -->
- <version>2.3.1</version>
- <configuration>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
-
<useSystemClassLoader>true</useSystemClassLoader>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- http://jira.codehaus.org/browse/SUREFIRE-322
-->
+ <version>2.4</version>
+ <configuration>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+
<useSystemClassLoader>true</useSystemClassLoader>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
