Merge pull request #26 from dmatej/issue-25-tomcat-users

arjantijms · web-flow · commit b71d7c21aa45 · 2018-07-30T22:29:53.000+02:00
Issue 25 tomcat-users.xml management
diff --git a/pom.xml b/pom.xml
@@ -286,7 +286,7 @@
                 </configuration>
             </plugin>
             <plugin>
-            		<groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>3.0.0-M1</version>
                 <configuration>
@@ -717,7 +717,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-tomcat-remote-7</artifactId>
-                    <version>1.0.0.CR7</version>
+                    <version>1.0.1.Final</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -777,7 +777,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-tomcat-managed-7</artifactId>
-                    <version>1.0.0.CR7</version>
+                    <version>1.0.1.Final</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -789,7 +789,7 @@
                         <artifactId>maven-dependency-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>unpack</id>
+                                <id>unpack-tomcat</id>
                                 <phase>process-test-classes</phase>
                                 <goals>
                                     <goal>unpack</goal>
@@ -807,25 +807,24 @@
                                     </artifactItems>
                                 </configuration>
                             </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.1</version>
-                        <executions>
                             <execution>
+                                <id>unpack-tomcat-users</id>
                                 <phase>process-test-classes</phase>
                                 <goals>
-                                    <goal>run</goal>
+                                    <goal>unpack</goal>
                                 </goals>
                                 <configuration>
-                                    <tasks>
-                                        <echo>Copying server.xml</echo>
-                                        <copy failonerror="false"
-                                            file="../../test-utils/src/main/resources/tomcat-users.xml"
-                                            tofile="${project.build.directory}/apache-tomcat-${tomcat.version}/conf/tomcat-users.xml" />
-                                    </tasks>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.javaee8</groupId>
+                                            <artifactId>test-utils</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>jar</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/conf</outputDirectory>
+                                            <includes>tomcat-users.xml</includes>
+                                        </artifactItem>
+                                    </artifactItems>
                                 </configuration>
                             </execution>
                         </executions>
@@ -846,8 +845,8 @@
 
 
 
-        <!-- Activate this profile to download javadoc and sources jars. 
-            run: mvn process-resources -Ddownload Notice: This feature has been removed 
+        <!-- Activate this profile to download javadoc and sources jars.
+            run: mvn process-resources -Ddownload Notice: This feature has been removed
             with plugin version 2.5, so keep this plugin configuration in a profile section. -->
         <profile>
             <id>javadocs</id>
diff --git a/test-utils/pom.xml b/test-utils/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.javaee8</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>test-utils</artifactId>
     <name>Java EE 8 Samples: test-utils</name>
 
@@ -27,5 +27,18 @@
             <artifactId>shrinkwrap-resolver-api-maven</artifactId>
         </dependency>
     </dependencies>
-    
-</project>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <!-- no need to unpack tomcat here! -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+      </plugins>
+    </build>
+
+</project>
