From 043291d086f220b1046b2b52acfdf4829d37e136 Mon Sep 17 00:00:00 2001
From: crowlandsCH <119855149+crowlandsCH@users.noreply.github.com>
Date: Tue, 9 Jul 2024 09:50:32 +0100
Subject: [PATCH] DSND-2695: Add jib specific config to Pom (#120)

* removed unnecessary jib version duplicate in properties section
* removed unnecessary Tiltfile.dev
---
 Tiltfile.dev | 18 ------------------
 pom.xml      | 11 +++++++++--
 2 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 Tiltfile.dev

diff --git a/Tiltfile.dev b/Tiltfile.dev
deleted file mode 100644
index b2cb97df..00000000
--- a/Tiltfile.dev
+++ /dev/null
@@ -1,18 +0,0 @@
-local_resource(
-  name = 'dev:psc-data-api-build',
-  cmd = 'mvn compile',
-  deps = ['src']
-)
-
-custom_build(
-  ref = '169942020521.dkr.ecr.eu-west-1.amazonaws.com/local/psc-data-api',
-  command = 'mvn compile jib:dockerBuild -Dimage=$EXPECTED_REF',
-  live_update = [
-    sync(
-      local_path = './target/classes',
-      remote_path = '/app/classes'
-    ),
-    restart_container()
-  ],
-  deps = ['./target/classes']
-)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 662f712f..7ea29406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
-        <jib-maven-plugin.version>3.3.1</jib-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
 
         <!-- Internal -->
@@ -32,7 +32,6 @@
         <api-sdk-manager-java-library.version>3.0.5</api-sdk-manager-java-library.version>
 
         <!-- tests -->
-        <jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
         <io-cucumber.version>7.18.0</io-cucumber.version>
         <test-containers.version>1.19.8</test-containers.version>
         <skip.integration.tests>false</skip.integration.tests>
@@ -277,6 +276,14 @@
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
                 <version>${jib-maven-plugin.version}</version>
+                <configuration>
+                    <from>
+                        <image>416670754337.dkr.ecr.eu-west-2.amazonaws.com/ci-corretto-runtime-21:latest</image>
+                    </from>
+                    <to>
+                        <image>416670754337.dkr.ecr.eu-west-2.amazonaws.com/psc-data-api:latest</image>
+                    </to>
+                </configuration>
             </plugin>
         </plugins>
     </build>