From 8adda36483a713b3a49c10038a461687bc9e73af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= <csviri@gmail.com>
Date: Thu, 18 Jan 2024 11:20:32 +0100
Subject: [PATCH] feat: run spotless on compile

Signed-off-by: Chris Laprun <claprun@redhat.com>
---
 .github/workflows/e2e-test.yml |  8 +++-----
 pom.xml                        | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 5e0a629bbc..5450a18a3f 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -19,7 +19,7 @@ jobs:
   sample_operators_tests:
     strategy:
       matrix:
-        sample_dir:
+        sample:
           - "sample-operators/mysql-schema"
           - "sample-operators/tomcat-operator"
           - "sample-operators/webpage"
@@ -48,12 +48,10 @@ jobs:
         run: mvn install -DskipTests
 
       - name: Run integration tests in local mode
-        working-directory: ${{ matrix.sample_dir }}
         run: |
-          mvn test -P end-to-end-tests
+          mvn test -P end-to-end-tests -pl ${{ matrix.sample }}
 
       - name: Run E2E tests as a deployment
-        working-directory: ${{ matrix.sample_dir }}
         run: |
           eval $(minikube -p minikube docker-env)
-          mvn jib:dockerBuild test -P end-to-end-tests -Dtest.deployment=remote
+          mvn jib:dockerBuild test -P end-to-end-tests -Dtest.deployment=remote -pl ${{ matrix.sample }}
diff --git a/pom.xml b/pom.xml
index d3b9d6391d..0d922dbb17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,9 +323,11 @@
           <pom>
             <includes>
               <include>pom.xml</include>
-              <inclide>./**/pom.xml</inclide>
+              <include>./**/pom.xml</include>
             </includes>
-            <sortPom></sortPom>
+            <sortPom>
+              <expandEmptyElements>false</expandEmptyElements>
+            </sortPom>
           </pom>
           <java>
             <eclipse>
@@ -334,9 +336,17 @@
             <importOrder>
               <file>contributing/eclipse.importorder</file>
             </importOrder>
-            <removeUnusedImports></removeUnusedImports>
+            <removeUnusedImports/>
           </java>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>apply</goal>
+            </goals>
+            <phase>compile</phase>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>