Skip to content

Commit b71d7c2

Browse files
arjantijmsarjantijms
authored
Merge pull request #26 from dmatej/issue-25-tomcat-users
Issue 25 tomcat-users.xml management
2 parents 40a40c8 + 5b959f9 commit b71d7c2

File tree

2 files changed

+35
-23
lines changed

2 files changed

+35
-23
lines changed

‎pom.xml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
</configuration>
287287
</plugin>
288288
<plugin>
289-
<groupId>org.apache.maven.plugins</groupId>
289+
<groupId>org.apache.maven.plugins</groupId>
290290
<artifactId>maven-enforcer-plugin</artifactId>
291291
<version>3.0.0-M1</version>
292292
<configuration>
@@ -717,7 +717,7 @@
717717
<dependency>
718718
<groupId>org.jboss.arquillian.container</groupId>
719719
<artifactId>arquillian-tomcat-remote-7</artifactId>
720-
<version>1.0.0.CR7</version>
720+
<version>1.0.1.Final</version>
721721
<scope>test</scope>
722722
</dependency>
723723
</dependencies>
@@ -777,7 +777,7 @@
777777
<dependency>
778778
<groupId>org.jboss.arquillian.container</groupId>
779779
<artifactId>arquillian-tomcat-managed-7</artifactId>
780-
<version>1.0.0.CR7</version>
780+
<version>1.0.1.Final</version>
781781
<scope>test</scope>
782782
</dependency>
783783
</dependencies>
@@ -789,7 +789,7 @@
789789
<artifactId>maven-dependency-plugin</artifactId>
790790
<executions>
791791
<execution>
792-
<id>unpack</id>
792+
<id>unpack-tomcat</id>
793793
<phase>process-test-classes</phase>
794794
<goals>
795795
<goal>unpack</goal>
@@ -807,25 +807,24 @@
807807
</artifactItems>
808808
</configuration>
809809
</execution>
810-
</executions>
811-
</plugin>
812-
<plugin>
813-
<groupId>org.apache.maven.plugins</groupId>
814-
<artifactId>maven-antrun-plugin</artifactId>
815-
<version>1.1</version>
816-
<executions>
817810
<execution>
811+
<id>unpack-tomcat-users</id>
818812
<phase>process-test-classes</phase>
819813
<goals>
820-
<goal>run</goal>
814+
<goal>unpack</goal>
821815
</goals>
822816
<configuration>
823-
<tasks>
824-
<echo>Copying server.xml</echo>
825-
<copy failonerror="false"
826-
file="../../test-utils/src/main/resources/tomcat-users.xml"
827-
tofile="${project.build.directory}/apache-tomcat-${tomcat.version}/conf/tomcat-users.xml" />
828-
</tasks>
817+
<artifactItems>
818+
<artifactItem>
819+
<groupId>org.javaee8</groupId>
820+
<artifactId>test-utils</artifactId>
821+
<version>${project.version}</version>
822+
<type>jar</type>
823+
<overWrite>true</overWrite>
824+
<outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/conf</outputDirectory>
825+
<includes>tomcat-users.xml</includes>
826+
</artifactItem>
827+
</artifactItems>
829828
</configuration>
830829
</execution>
831830
</executions>
@@ -846,8 +845,8 @@
846845

847846

848847

849-
<!-- Activate this profile to download javadoc and sources jars.
850-
run: mvn process-resources -Ddownload Notice: This feature has been removed
848+
<!-- Activate this profile to download javadoc and sources jars.
849+
run: mvn process-resources -Ddownload Notice: This feature has been removed
851850
with plugin version 2.5, so keep this plugin configuration in a profile section. -->
852851
<profile>
853852
<id>javadocs</id>

‎test-utils/pom.xml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>org.javaee8</groupId>
99
<version>1.0-SNAPSHOT</version>
1010
</parent>
11-
11+
1212
<artifactId>test-utils</artifactId>
1313
<name>Java EE 8 Samples: test-utils</name>
1414

@@ -27,5 +27,18 @@
2727
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
2828
</dependency>
2929
</dependencies>
30-
31-
</project>
30+
31+
<build>
32+
<plugins>
33+
<plugin>
34+
<groupId>org.apache.maven.plugins</groupId>
35+
<artifactId>maven-dependency-plugin</artifactId>
36+
<configuration>
37+
<!-- no need to unpack tomcat here! -->
38+
<skip>true</skip>
39+
</configuration>
40+
</plugin>
41+
</plugins>
42+
</build>
43+
44+
</project>

0 commit comments

Comments
 (0)