From 6a39ef6aa3eaae0dfbf4fe98a2152c6f20070412 Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Fri, 4 Oct 2024 10:29:18 +0200
Subject: [PATCH 1/4] wip

---
 jitexecutor/jitexecutor-runner/pom.xml | 9 +++++++++
 pom.xml                                | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/jitexecutor/jitexecutor-runner/pom.xml b/jitexecutor/jitexecutor-runner/pom.xml
index a91c51fbb7..bb4d661985 100644
--- a/jitexecutor/jitexecutor-runner/pom.xml
+++ b/jitexecutor/jitexecutor-runner/pom.xml
@@ -128,6 +128,15 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-artifact-plugin</artifactId>
+        <configuration>
+          <ignore>
+            <ignore>image-build.zip</ignore>
+          </ignore>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index cbabbcbbf7..ae739181de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,6 @@
 
   <properties>
     <project.build.outputTimestamp>2024-01-16T00:00:00Z</project.build.outputTimestamp>
-    <version.maven.artifact.plugin>3.4.1</version.maven.artifact.plugin>
   </properties>
 
   <build>
@@ -99,7 +98,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-artifact-plugin</artifactId>
-          <version>${version.maven.artifact.plugin}</version>
           <configuration>
             <outputTimestamp>${project.build.outputTimestamp}</outputTimestamp>
           </configuration>

From 1c9417e75f6497bb8e8982326910afe624a1c2b5 Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Fri, 4 Oct 2024 10:43:31 +0200
Subject: [PATCH 2/4] wip

---
 jitexecutor/jitexecutor-runner/pom.xml | 9 ---------
 pom.xml                                | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/jitexecutor/jitexecutor-runner/pom.xml b/jitexecutor/jitexecutor-runner/pom.xml
index bb4d661985..a91c51fbb7 100644
--- a/jitexecutor/jitexecutor-runner/pom.xml
+++ b/jitexecutor/jitexecutor-runner/pom.xml
@@ -128,15 +128,6 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-artifact-plugin</artifactId>
-        <configuration>
-          <ignore>
-            <ignore>image-build.zip</ignore>
-          </ignore>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index ae739181de..ea403816fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,7 @@
           <artifactId>maven-artifact-plugin</artifactId>
           <configuration>
             <outputTimestamp>${project.build.outputTimestamp}</outputTimestamp>
+            <ignore>image-build.zip</ignore>
           </configuration>
         </plugin>
       </plugins>

From 7ef8229dc70137a8a3b87517d923b6b1f854429a Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Fri, 4 Oct 2024 12:55:42 +0200
Subject: [PATCH 3/4] WIP

---
 .ci/jenkins/Jenkinsfile.deploy |  4 +++-
 pom.xml                        | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 58e0c532bb..51afe0271e 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -119,7 +119,9 @@ pipeline {
 
                         if (isRelease()) {
                             releaseUtils.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
-                            mavenCommand.withProfiles(['apache-release'])
+                            mavenCommand
+                            .withProfiles(['apache-release'])
+                            .withProperty('only.reproducible')
                         }
 
                         configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
diff --git a/pom.xml b/pom.xml
index ea403816fb..06c6451e44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,10 +130,20 @@
     <module>explainability</module>
     <module>trusty</module>
     <module>jitexecutor</module>
-    <module>apps-integration-tests</module>
   </modules>
 
   <profiles>
+    <profile>
+      <id>allSubmodules</id>
+      <activation>
+        <property>
+          <name>!only.reproducible</name>
+        </property>
+      </activation>
+      <modules>
+        <module>apps-integration-tests</module>
+      </modules>
+    </profile>
     <profile>
       <id>optaplanner-downstream</id>
       <activation>

From eb6af7b2ccd067d2bd1a50ba1375c363a97c69ef Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Fri, 4 Oct 2024 13:09:15 +0200
Subject: [PATCH 4/4] WIP

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 06c6451e44..1894254322 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,7 @@
           <artifactId>maven-artifact-plugin</artifactId>
           <configuration>
             <outputTimestamp>${project.build.outputTimestamp}</outputTimestamp>
+            <!-- Generated images in zip format are not reproducible-->
             <ignore>image-build.zip</ignore>
           </configuration>
         </plugin>