You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/02/14 13:11:25 UTC
svn commit: r1730322 - in /axis/axis2/java/core/trunk:
modules/jaxws-integration/pom.xml modules/jaxws/pom.xml
modules/metadata/pom.xml modules/osgi-tests/pom.xml pom.xml
Author: veithen
Date: Sun Feb 14 12:11:25 2016
New Revision: 1730322
URL: http://svn.apache.org/viewvc?rev=1730322&view=rev
Log:
Use alta-maven-plugin to compute boot classpaths (as described in http://veithen.github.io/alta/examples/bootclasspath.html).
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/metadata/pom.xml
axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml
axis/axis2/java/core/trunk/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=1730322&r1=1730321&r2=1730322&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Sun Feb 14 12:11:25 2016
@@ -139,34 +139,31 @@
</testResources>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>generate-properties</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
+ <artifacts>
+ <artifact>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
+ </artifact>
+ <artifact>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
+ </artifact>
+ <artifact>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- <stripVersion>true</stripVersion>
+ </artifact>
+ </artifacts>
+ <name>jaxws.bootclasspath</name>
+ <value>%file%</value>
+ <separator>${path.separator}</separator>
</configuration>
</execution>
</executions>
@@ -176,7 +173,7 @@
<inherited>true</inherited>
<configuration>
<compilerArgument>
- -Xbootclasspath/p:${basedir}/../jaxws-api/target/classes${path.separator}${basedir}/../jws-api/target/classes
+ -Xbootclasspath/p:${jaxws.bootclasspath}
</compilerArgument>
</configuration>
</plugin>
@@ -1288,7 +1285,7 @@
<inherited>true</inherited>
<configuration>
<forkMode>pertest</forkMode>
- <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>
+ <argLine>-Xms256m -Xmx512m -Xbootclasspath/p:${jaxws.bootclasspath}</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/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=1730322&r1=1730321&r2=1730322&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Sun Feb 14 12:11:25 2016
@@ -191,33 +191,31 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>generate-properties</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
+ <artifacts>
+ <artifact>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
+ </artifact>
+ <artifact>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
+ </artifact>
+ <artifact>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
- </artifactItem>
- </artifactItems>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- <stripVersion>true</stripVersion>
+ </artifact>
+ </artifacts>
+ <name>jaxws.bootclasspath</name>
+ <value>%file%</value>
+ <separator>${path.separator}</separator>
</configuration>
</execution>
</executions>
@@ -227,7 +225,7 @@
<inherited>true</inherited>
<configuration>
<compilerArgument>
- -Xbootclasspath/p:${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar${path.separator}${basedir}/../jaxws-api/target/classes${path.separator}${basedir}/../jws-api/target/classes
+ -Xbootclasspath/p:${jaxws.bootclasspath}
</compilerArgument>
</configuration>
</plugin>
@@ -347,7 +345,7 @@
<inherited>true</inherited>
<configuration>
<forkMode>once</forkMode>
- <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>
+ <argLine>-Xms256m -Xmx512m -Xbootclasspath/p:${jaxws.bootclasspath}</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=1730322&r1=1730321&r2=1730322&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Sun Feb 14 12:11:25 2016
@@ -158,24 +158,23 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>generate-properties</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
+ <artifacts>
+ <artifact>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- <stripVersion>true</stripVersion>
+ </artifact>
+ </artifacts>
+ <name>jaxws.bootclasspath</name>
+ <value>%file%</value>
+ <separator>${path.separator}</separator>
</configuration>
</execution>
</executions>
@@ -185,7 +184,7 @@
<inherited>true</inherited>
<configuration>
<compilerArgument>
- -Xbootclasspath/p:${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar
+ -Xbootclasspath/p:${jaxws.bootclasspath}
</compilerArgument>
</configuration>
</plugin>
@@ -283,7 +282,7 @@
<inherited>true</inherited>
<configuration>
<argLine>
- -Xbootclasspath/p:${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar
+ -Xbootclasspath/p:${jaxws.bootclasspath}
</argLine>
<includes>
<include>**/*Tests.java</include>
Modified: axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml?rev=1730322&r1=1730321&r2=1730322&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml Sun Feb 14 12:11:25 2016
@@ -95,7 +95,6 @@
<plugin>
<groupId>com.github.veithen.alta</groupId>
<artifactId>alta-maven-plugin</artifactId>
- <version>0.4</version>
<executions>
<execution>
<goals>
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1730322&r1=1730321&r2=1730322&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sun Feb 14 12:11:25 2016
@@ -1171,6 +1171,11 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.8.1</version>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <version>0.4</version>
+ </plugin>
<!-- Use 1.5.2 versions of the aar and mar plugins in order to avoid
the chicken and egg problem. -->