Author: barrettj Date: Tue Apr 27 21:21:52 2010 New Revision: 938653 URL: http://svn.apache.org/viewvc?rev=938653&view=rev Log: Changed Geronimo JAXWS 2.2 dependency to 1.0 rather than SNAPSHOT. Fixed jaxws-integration bootclasspath specification to be platform independent.
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml axis/axis2/java/core/trunk/modules/metadata/pom.xml axis/axis2/java/core/trunk/modules/parent/pom.xml Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=938653&r1=938652&r2=938653&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Tue Apr 27 21:21:52 2010 @@ -1397,7 +1397,7 @@ <inherited>true</inherited> <configuration> <forkMode>pertest</forkMode> - <argLine>-Xms256m -Xmx512m -Xbootclasspath/p:${project.build.directory}/endorsed/jaxb-api.jar:${project.build.directory}/endorsed/geronimo-saaj_1.3_spec.jar:${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar</argLine> + <argLine>-Xms256m -Xmx512m -Xbootclasspath/p:${project.build.directory}/endorsed/jaxb-api.jar${path.separator}${project.build.directory}/endorsed/geronimo-saaj_1.3_spec.jar${path.separator}${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar</argLine> <!-- Enable the next 2 lines if you want to attach a debugger <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>--> <includes> Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=938653&r1=938652&r2=938653&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Tue Apr 27 21:21:52 2010 @@ -148,10 +148,11 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxws_2.2_spec</artifactId> <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>target/endorsed</outputDirectory> </artifactItem> </artifactItems> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/endorsed</outputDirectory> + <stripVersion>true</stripVersion> </configuration> </execution> </executions> @@ -169,7 +170,7 @@ <inherited>true</inherited> <configuration> <compilerArgument> - -Xbootclasspath/p:${basedir}/target/endorsed/geronimo-jaxws_2.2_spec-1.0-SNAPSHOT.jar + -Xbootclasspath/p:${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar </compilerArgument> <compilerVersion>1.5</compilerVersion> <source>1.5</source> @@ -258,7 +259,7 @@ <inherited>true</inherited> <configuration> <argLine> - -Xbootclasspath/p:${basedir}/target/endorsed/geronimo-jaxws_2.2_spec-1.0-SNAPSHOT.jar + -Xbootclasspath/p:${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar </argLine> <includes> <include>**/*Tests.java</include> Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=938653&r1=938652&r2=938653&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/parent/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/parent/pom.xml Tue Apr 27 21:21:52 2010 @@ -110,7 +110,7 @@ <geronimo.spec.stax.version>1.0.1</geronimo.spec.stax.version> <geronimo.spec.metadata.version>1.1.2</geronimo.spec.metadata.version> <geronimo.spec.saaj.version>1.0.1</geronimo.spec.saaj.version> - <geronimo.spec.jaxws.version>1.0-SNAPSHOT</geronimo.spec.jaxws.version> + <geronimo.spec.jaxws.version>1.0</geronimo.spec.jaxws.version> <httpcore.version>4.0</httpcore.version> <intellij.version>5.0</intellij.version> <jalopy.version>1.5rc3</jalopy.version>