From 536534dd257fbc58e5950f92c7aff8553854d1e7 Mon Sep 17 00:00:00 2001
From: rmartinc <rmartinc@redhat.com>
Date: Mon, 3 Jun 2024 13:21:26 +0200
Subject: [PATCH] Remove the transformed output directory before executing
 JakartaTransformer Closes #30086

Signed-off-by: rmartinc <rmartinc@redhat.com>
---
 adapters/saml/core-jakarta/pom.xml                |  4 ++--
 adapters/saml/wildfly-elytron-jakarta/pom.xml     |  2 +-
 .../wildfly/wildfly-jakarta-subsystem/pom.xml     |  2 +-
 integration/admin-client/pom.xml                  | 12 +-----------
 .../test-apps/servlets-jakarta/pom.xml            | 15 ++++-----------
 5 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/adapters/saml/core-jakarta/pom.xml b/adapters/saml/core-jakarta/pom.xml
index e500be46da2..0d02b6f1ea1 100644
--- a/adapters/saml/core-jakarta/pom.xml
+++ b/adapters/saml/core-jakarta/pom.xml
@@ -94,8 +94,8 @@
                         <configuration>
                             <target>
                                 <property name="plugin_classpath" refid="maven.plugin.classpath" />
+                                <delete dir="${jakarta-transformer-target}"/>
                                 <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <arg value="-o" />
                                     <arg value="${jakarta-transformer-sources}" />
                                     <arg value="${jakarta-transformer-target}" />
                                     <classpath>
@@ -122,4 +122,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/adapters/saml/wildfly-elytron-jakarta/pom.xml b/adapters/saml/wildfly-elytron-jakarta/pom.xml
index b509ff16983..b112bc08e26 100755
--- a/adapters/saml/wildfly-elytron-jakarta/pom.xml
+++ b/adapters/saml/wildfly-elytron-jakarta/pom.xml
@@ -115,8 +115,8 @@
                         <configuration>
                             <target>
                                 <property name="plugin_classpath" refid="maven.plugin.classpath" />
+                                <delete dir="${jakarta-transformer-target}"/>
                                 <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <arg value="-o" />
                                     <arg value="${jakarta-transformer-sources}" />
                                     <arg value="${jakarta-transformer-target}" />
                                     <classpath>
diff --git a/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml b/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
index 821e6d23306..640531d7eba 100755
--- a/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
+++ b/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
@@ -55,8 +55,8 @@
                         <configuration>
                             <target>
                                 <property name="plugin_classpath" refid="maven.plugin.classpath" />
+                                <delete dir="${jakarta-transformer-target}"/>
                                 <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <arg value="-o" />
                                     <arg value="${jakarta-transformer-sources}" />
                                     <arg value="${jakarta-transformer-target}" />
                                     <classpath>
diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml
index 2930ce99be6..5e8212558f0 100755
--- a/integration/admin-client/pom.xml
+++ b/integration/admin-client/pom.xml
@@ -93,24 +93,14 @@
                         <configuration>
                             <target>
                                 <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+                                <delete dir="${jakarta-transformer-target}"/>
                                 <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <arg value="-o"/>
                                     <arg value="${jakarta-transformer-sources}"/>
                                     <arg value="${jakarta-transformer-target}"/>
                                     <classpath>
                                         <pathelement path="${plugin_classpath}"/>
                                     </classpath>
                                 </java>
-                                <!-- Possibility to override classes for admin-client-jee -->
-                                <!-- Remove this comment in that case
-                                <touch>
-                                    <fileset dir="${jakarta-transformer-target}"/>
-                                </touch>
-                                <copy todir="${jakarta-transformer-target}" overwrite="false">
-                                    <fileset dir="${jakarta-transformer-target}/tmp"/>
-                                </copy>
-                                <delete dir="${jakarta-transformer-target}/tmp"/>
-                                -->
                             </target>
                         </configuration>
                     </execution>
diff --git a/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml b/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml
index 5cec6336b4e..37e157d6a58 100644
--- a/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml
+++ b/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml
@@ -16,8 +16,8 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <jakarta-transformer-sources>${project.basedir}/../servlets</jakarta-transformer-sources>
-        <jakarta-transformer-target>${project.basedir}</jakarta-transformer-target>
+        <jakarta-transformer-sources>${project.basedir}/../servlets/src</jakarta-transformer-sources>
+        <jakarta-transformer-target>${project.basedir}/src</jakarta-transformer-target>
     </properties>
 
     <dependencies>
@@ -96,21 +96,14 @@
                         <configuration>
                             <target>
                                 <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+                                <delete dir="${jakarta-transformer-target}"/>
                                 <java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
-                                    <arg value="-o"/>
                                     <arg value="${jakarta-transformer-sources}"/>
-                                    <arg value="${jakarta-transformer-target}/tmp"/>
+                                    <arg value="${jakarta-transformer-target}"/>
                                     <classpath>
                                         <pathelement path="${plugin_classpath}"/>
                                     </classpath>
                                 </java>
-                                <touch>
-                                    <fileset dir="${jakarta-transformer-target}"/>
-                                </touch>
-                                <copy todir="${jakarta-transformer-target}" overwrite="false">
-                                    <fileset dir="${jakarta-transformer-target}/tmp"/>
-                                </copy>
-                                <delete dir="${jakarta-transformer-target}/tmp"/>
                             </target>
                         </configuration>
                     </execution>