From 2141ad7ac4244072f5b2aafd1e068e55f0ac6e34 Mon Sep 17 00:00:00 2001
From: Andre Henn <henn@terrestris.de>
Date: Sun, 3 Sep 2023 18:22:09 +0200
Subject: [PATCH 1/4] chore: adds .java-version file

---
 .java-version | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .java-version

diff --git a/.java-version b/.java-version
new file mode 100644
index 00000000..4181564b
--- /dev/null
+++ b/.java-version
@@ -0,0 +1,2 @@
+17
+

From b1d88a6ec7e9308e410e948981950c0d6bf84bda Mon Sep 17 00:00:00 2001
From: Andre Henn <henn@terrestris.de>
Date: Sun, 3 Sep 2023 18:25:18 +0200
Subject: [PATCH 2/4] chore: bump git-commit-id-maven-plugin to version 5.0.0

---
 shogun-boot/pom.xml           | 23 +++++++++++++++++++----
 shogun-config/pom.xml         | 18 +++++++++++++++++-
 shogun-gs-interceptor/pom.xml |  9 +--------
 shogun-lib/pom.xml            |  8 ++++++++
 shogun-manager/pom.xml        | 17 +++++++++++++++++
 shogun-proxy/pom.xml          | 23 +++++++++++++++++++----
 6 files changed, 81 insertions(+), 17 deletions(-)

diff --git a/shogun-boot/pom.xml b/shogun-boot/pom.xml
index 1d07f3fa..4e55388f 100644
--- a/shogun-boot/pom.xml
+++ b/shogun-boot/pom.xml
@@ -176,11 +176,26 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
+        <version>5.0.0</version>
+        <executions>
+          <execution>
+            <id>get-the-git-infos</id>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+            <phase>initialize</phase>
+          </execution>
+        </executions>
         <configuration>
-          <offline>true</offline>
-          <abbrevLength>8</abbrevLength>
+          <generateGitPropertiesFile>true</generateGitPropertiesFile>
+          <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+          <includeOnlyProperties>
+            <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+            <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+          </includeOnlyProperties>
+          <commitIdGenerationMode>full</commitIdGenerationMode>
         </configuration>
       </plugin>
       <plugin>
diff --git a/shogun-config/pom.xml b/shogun-config/pom.xml
index 1d398c3c..51b1d0db 100644
--- a/shogun-config/pom.xml
+++ b/shogun-config/pom.xml
@@ -30,8 +30,24 @@
   <name>SHOGun Config</name>
   <packaging>jar</packaging>
 
-  <dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <!-- we don't want jib to execute on this module -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
+  <dependencies>
     <!-- Spring Boot -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/shogun-gs-interceptor/pom.xml b/shogun-gs-interceptor/pom.xml
index 852b5170..6cfb242a 100644
--- a/shogun-gs-interceptor/pom.xml
+++ b/shogun-gs-interceptor/pom.xml
@@ -144,14 +144,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
-        <configuration>
-          <offline>true</offline>
-          <abbrevLength>8</abbrevLength>
-        </configuration>
-      </plugin>
+
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
diff --git a/shogun-lib/pom.xml b/shogun-lib/pom.xml
index db18ab20..e8664f0a 100644
--- a/shogun-lib/pom.xml
+++ b/shogun-lib/pom.xml
@@ -36,6 +36,14 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <!-- we don't want jib to execute on this module -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/shogun-manager/pom.xml b/shogun-manager/pom.xml
index bca5bd8a..4577dc62 100644
--- a/shogun-manager/pom.xml
+++ b/shogun-manager/pom.xml
@@ -28,6 +28,23 @@
   <name>SHOGun Manager client</name>
   <packaging>jar</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <!-- we don't want jib to execute on this module -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>de.terrestris</groupId>
diff --git a/shogun-proxy/pom.xml b/shogun-proxy/pom.xml
index c2ab6367..f19fb11b 100644
--- a/shogun-proxy/pom.xml
+++ b/shogun-proxy/pom.xml
@@ -123,11 +123,26 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
+        <version>5.0.0</version>
+        <executions>
+          <execution>
+            <id>get-the-git-infos</id>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+            <phase>initialize</phase>
+          </execution>
+        </executions>
         <configuration>
-          <offline>true</offline>
-          <abbrevLength>8</abbrevLength>
+          <generateGitPropertiesFile>true</generateGitPropertiesFile>
+          <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+          <includeOnlyProperties>
+            <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+            <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+          </includeOnlyProperties>
+          <commitIdGenerationMode>full</commitIdGenerationMode>
         </configuration>
       </plugin>
       <plugin>

From 8be68e562aa330d8e08138a69164ec9f70c9d71a Mon Sep 17 00:00:00 2001
From: Andre Henn <henn@terrestris.de>
Date: Sun, 3 Sep 2023 18:25:48 +0200
Subject: [PATCH 3/4] fix: set correct creation time for docker images

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

diff --git a/pom.xml b/pom.xml
index a3990bbb..04d42b15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,7 @@
                 <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
                 <jvmFlag>-Djdk.serialSetFilterAfterRead=true</jvmFlag>
               </jvmFlags>
-              <creationTime>EPOCH</creationTime>
+              <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
             </container>
 
           </configuration>

From a32e9102ef7cf892ecd265360d46c682b01cfb80 Mon Sep 17 00:00:00 2001
From: Andre Henn <henn@terrestris.de>
Date: Sun, 3 Sep 2023 18:36:53 +0200
Subject: [PATCH 4/4] chore: ignore java-version from license check

---
 .licenserc.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.licenserc.yaml b/.licenserc.yaml
index 3f7f739d..62041777 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -40,5 +40,6 @@ header:
     - '**/*.iml'
     - '.releaserc.json'
     - '.commitlintrc.json'
+    - '.java-version'
 
   comment: on-failure