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 2019/01/07 20:17:39 UTC
svn commit: r1850683 - in /axis/axis1/java/trunk:
axis-rt-transport-http-javanet/pom.xml samples/jaxm-sample/pom.xml
tests/interop-tests/pom.xml
Author: veithen
Date: Mon Jan 7 20:17:39 2019
New Revision: 1850683
URL: http://svn.apache.org/viewvc?rev=1850683&view=rev
Log:
Use alta-maven-plugin instead of maven-dependency-plugin to supply WAR files to jetty-maven-plugin.
Modified:
axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml
axis/axis1/java/trunk/samples/jaxm-sample/pom.xml
axis/axis1/java/trunk/tests/interop-tests/pom.xml
Modified: axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml?rev=1850683&r1=1850682&r2=1850683&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml (original)
+++ axis/axis1/java/trunk/axis-rt-transport-http-javanet/pom.xml Mon Jan 7 20:17:39 2019
@@ -152,17 +152,23 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
<executions>
<execution>
<phase>pre-integration-test</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>generate-properties</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <includeTypes>war</includeTypes>
- <stripVersion>true</stripVersion>
+ <name>%artifactId%.location</name>
+ <value>%file%</value>
+ <dependencySet>
+ <scope>test</scope>
+ <includes>
+ <include>*:*:war:*</include>
+ </includes>
+ </dependencySet>
</configuration>
</execution>
</executions>
@@ -171,7 +177,7 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
- <war>${project.build.directory}/interop-mock.war</war>
+ <war>${interop-mock.location}</war>
<stopKey>foo</stopKey>
<stopPort>${jetty.stopPort}</stopPort>
<connectors>
Modified: axis/axis1/java/trunk/samples/jaxm-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxm-sample/pom.xml?rev=1850683&r1=1850682&r2=1850683&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/jaxm-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/jaxm-sample/pom.xml Mon Jan 7 20:17:39 2019
@@ -85,17 +85,23 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
<executions>
<execution>
<phase>pre-integration-test</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>generate-properties</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <includeTypes>war</includeTypes>
- <stripVersion>true</stripVersion>
+ <name>%artifactId%.location</name>
+ <value>%file%</value>
+ <dependencySet>
+ <scope>test</scope>
+ <includes>
+ <include>*:*:war:*</include>
+ </includes>
+ </dependencySet>
</configuration>
</execution>
</executions>
@@ -104,7 +110,7 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
- <war>${project.build.directory}/interop-mock.war</war>
+ <war>${interop-mock.location}</war>
<stopKey>foo</stopKey>
<stopPort>${jetty.stopPort}</stopPort>
<connectors>
Modified: axis/axis1/java/trunk/tests/interop-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/tests/interop-tests/pom.xml?rev=1850683&r1=1850682&r2=1850683&view=diff
==============================================================================
--- axis/axis1/java/trunk/tests/interop-tests/pom.xml (original)
+++ axis/axis1/java/trunk/tests/interop-tests/pom.xml Mon Jan 7 20:17:39 2019
@@ -151,17 +151,23 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
<executions>
<execution>
<phase>pre-integration-test</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>generate-properties</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <includeTypes>war</includeTypes>
- <stripVersion>true</stripVersion>
+ <name>%artifactId%.location</name>
+ <value>%file%</value>
+ <dependencySet>
+ <scope>test</scope>
+ <includes>
+ <include>*:*:war:*</include>
+ </includes>
+ </dependencySet>
</configuration>
</execution>
</executions>
@@ -170,7 +176,7 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
- <war>${project.build.directory}/interop-mock.war</war>
+ <war>${interop-mock.location}</war>
<stopKey>foo</stopKey>
<stopPort>${jetty.stopPort}</stopPort>
<connectors>