correct build lifecycle phases

Author: aamotharald

cf-java-logging-support-servlet-jakarta/pom.xml

@@ -88,7 +88,7 @@
 				<version>${maven-dependency-plugin.version}</version>
 				<executions>
 					<execution>
-						<id>unpack</id>
+						<id>unpack-sources</id>
 						<phase>generate-sources</phase>
 						<goals>
 							<goal>unpack</goal>
@@ -105,6 +105,17 @@
 									<outputDirectory>target/generated-sources/java</outputDirectory>
 									<includes>**/*.java</includes>
 								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+					<execution>
+						<id>unpack-test-sources</id>
+						<phase>generate-test-sources</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>cf-java-logging-support-servlet</artifactId>
@@ -113,8 +124,19 @@
 									<classifier>test-sources</classifier>
 									<overWrite>false</overWrite>
 									<outputDirectory>target/generated-test-sources/java</outputDirectory>
-									<includes>**/*.java,**/logback-test.xml</includes>
+									<includes>**/*.java</includes>
 								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+					<execution>
+						<id>unpack-test-rersources</id>
+						<phase>generate-test-resources</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>cf-java-logging-support-servlet</artifactId>
@@ -127,7 +149,7 @@
 								</artifactItem>
 							</artifactItems>
 						</configuration>
-					</execution>
+					</execution>										
 				</executions>
 			</plugin>
 
@@ -141,7 +163,6 @@
 						<goals>
 							<goal>add-source</goal>
 						</goals>
-						<phase>generate-sources</phase>
 						<configuration>
 							<sources>
 								<source>target/generated-sources/java</source>
@@ -153,7 +174,6 @@
 						<goals>
 							<goal>add-test-source</goal>
 						</goals>
-						<phase>generate-test-sources</phase>
 						<configuration>
 							<sources>
 								<source>target/generated-test-sources/java</source>
@@ -165,7 +185,6 @@
 						<goals>
 							<goal>add-test-resource</goal>
 						</goals>
-						<phase>generate-test-resources</phase>
 						<configuration>
 							<resources>
 								<resource>
@@ -181,6 +200,10 @@
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 					<execution>
+					    <id>package-replace-sources</id>
+						<goals>
+							<goal>run</goal>
+						</goals>					
 						<phase>process-sources</phase>
 						<configuration>
 							<tasks>
@@ -189,17 +212,25 @@
 									token="javax.servlet" value="jakarta.servlet">
 									<include name="**/*.java" />
 								</replace>
+							</tasks>
+						</configuration>
+					</execution>
+					<execution>
+					    <id>package-replace-test-sources</id>
+						<goals>
+							<goal>run</goal>
+						</goals>					
+						<phase>process-test-sources</phase>
+						<configuration>
+							<tasks>
 								<!-- replace javax.servlet with jakarta.servlet in generated-test-sources -->
 								<replace dir="target/generated-test-sources/java"
 									token="javax.servlet" value="jakarta.servlet">
 									<include name="**/*.java" />
 								</replace>
 							</tasks>
 						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
+					</execution>					
 				</executions>
 			</plugin>