Use alta-maven-plugin instead of maven-dependency-plugin to supply WAR files to jetty-maven-plugin.

veithen · veithen · commit aa37259bc63f · 2019-01-07T20:17:39.000Z
diff --git a/axis-rt-transport-http-javanet/pom.xml b/axis-rt-transport-http-javanet/pom.xml
@@ -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>
diff --git a/samples/jaxm-sample/pom.xml b/samples/jaxm-sample/pom.xml
@@ -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>
diff --git a/tests/interop-tests/pom.xml b/tests/interop-tests/pom.xml
@@ -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>
