From 654c00eaa1865bd29a6d1ca2bb135c45e7e02ae4 Mon Sep 17 00:00:00 2001
From: Marian Neagul <marian@info.uvt.ro>
Date: Thu, 21 Oct 2021 12:02:58 +0300
Subject: [PATCH 1/2] Switch from the unmaintained dockerfile-maven-version to
 jib-maven-plugin

---
 pom.xml                         | 14 ++++++++
 staccato-application/Dockerfile | 11 ------
 staccato-application/pom.xml    | 61 ++++++++++++---------------------
 staccato-collections/pom.xml    | 15 +++++++-
 staccato-commons/pom.xml        | 14 +++++++-
 staccato-community/pom.xml      | 15 +++++++-
 staccato-elasticsearch/pom.xml  | 15 +++++++-
 7 files changed, 91 insertions(+), 54 deletions(-)
 delete mode 100644 staccato-application/Dockerfile

diff --git a/pom.xml b/pom.xml
index 04e418f..6acc079 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
         <locationtech-jts.version>1.16.0</locationtech-jts.version>
         <locationtech-spatial4j.version>0.7</locationtech-spatial4j.version>
         <vividsolutions-jts.version>1.13</vividsolutions-jts.version>
+        <image>gcr.io/focus-cargo-315523/staccato:${project.version}</image>
     </properties>
 
     <modules>
@@ -98,6 +99,19 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <!-- Defines plugins that are used in the modules. -->
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.google.cloud.tools</groupId>
+                    <artifactId>jib-maven-plugin</artifactId>
+                    <version>3.1.4</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/staccato-application/Dockerfile b/staccato-application/Dockerfile
deleted file mode 100644
index 9420761..0000000
--- a/staccato-application/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM amazoncorretto:11.0.7
-MAINTAINER josh@federal.planet.com
-
-ARG JAR_NAME
-ENV JAR_NAME $JAR_NAME
-
-#COPY target/${JAR_NAME} /${JAR_NAME}
-ADD target/${JAR_NAME} /${JAR_NAME}
-
-ENTRYPOINT ["java", "-jar", "/staccato-1.0.0.jar"]
-#ENTRYPOINT java "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" -jar /$JAR_NAME
\ No newline at end of file
diff --git a/staccato-application/pom.xml b/staccato-application/pom.xml
index 5e423f2..dec24df 100644
--- a/staccato-application/pom.xml
+++ b/staccato-application/pom.xml
@@ -61,13 +61,13 @@
             <artifactId>noggit</artifactId>
             <version>0.7</version>
         </dependency>
-<!--
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-core</artifactId>
-            <version>1.0.7</version>
-        </dependency>
--->
+        <!--
+                <dependency>
+                    <groupId>io.micrometer</groupId>
+                    <artifactId>micrometer-core</artifactId>
+                    <version>1.0.7</version>
+                </dependency>
+        -->
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -115,7 +115,6 @@
     </dependencies>
 
     <build>
-
         <plugins>
 
             <plugin>
@@ -129,6 +128,21 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>jib-maven-plugin</artifactId>
+                <version>3.1.4</version>
+                <configuration>
+                    <containerizingMode>packaged</containerizingMode>
+                    <to>
+                        <image>gcr.io/focus-cargo-315523/staccato:${project.version}</image>
+                    </to>
+                    <from>
+                        <image>amazoncorretto:11.0.7</image>
+                    </from>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <!-- Build an executable JAR -->
                 <groupId>org.apache.maven.plugins</groupId>
@@ -162,37 +176,6 @@
                     <executable>true</executable>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${dockerfile-maven-version}</version>
-                <executions>
-                    <execution>
-                        <id>default</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <!--<repository>quay.io/boundlessgeo/staccato</repository>-->
-                    <repository>gcr.io/focus-cargo-315523/staccato</repository>
-                    <tag>${project.version}</tag>
-                    <buildArgs>
-                        <JAR_NAME>staccato-${project.version}.jar</JAR_NAME>
-                    </buildArgs>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>javax.activation-api</artifactId>
-                        <version>1.2.0</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
diff --git a/staccato-collections/pom.xml b/staccato-collections/pom.xml
index c1430b9..302ce3e 100644
--- a/staccato-collections/pom.xml
+++ b/staccato-collections/pom.xml
@@ -24,6 +24,19 @@
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
+    <build>
+        <plugins>
+            <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>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -39,4 +52,4 @@
         </dependencies>
     </dependencyManagement>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/staccato-commons/pom.xml b/staccato-commons/pom.xml
index 3536926..9707a98 100644
--- a/staccato-commons/pom.xml
+++ b/staccato-commons/pom.xml
@@ -12,6 +12,18 @@
     <groupId>com.planet.staccato</groupId>
     <artifactId>staccato-commons</artifactId>
 
+    <build>
+        <plugins>
+            <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>org.springframework.boot</groupId>
@@ -51,4 +63,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/staccato-community/pom.xml b/staccato-community/pom.xml
index 116061c..6cc9c1f 100644
--- a/staccato-community/pom.xml
+++ b/staccato-community/pom.xml
@@ -27,4 +27,17 @@
         <staccato.version>${project.version}</staccato.version>
     </properties>
 
-</project>
\ No newline at end of file
+    <build>
+        <plugins>
+            <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>
+
+</project>
diff --git a/staccato-elasticsearch/pom.xml b/staccato-elasticsearch/pom.xml
index 7552b76..0ccdf5a 100644
--- a/staccato-elasticsearch/pom.xml
+++ b/staccato-elasticsearch/pom.xml
@@ -16,6 +16,19 @@
         <xbib-content-core.version>2.5.2</xbib-content-core.version>
     </properties>
 
+    <build>
+        <plugins>
+            <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>com.planet.staccato</groupId>
@@ -92,4 +105,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

From 92afa8c16fff555f05ae3faf841bd076aecc873e Mon Sep 17 00:00:00 2001
From: Marian Neagul <marian@info.uvt.ro>
Date: Thu, 21 Oct 2021 12:25:58 +0300
Subject: [PATCH 2/2] comment out the global default image

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

diff --git a/pom.xml b/pom.xml
index 6acc079..2ac1cee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
         <locationtech-jts.version>1.16.0</locationtech-jts.version>
         <locationtech-spatial4j.version>0.7</locationtech-spatial4j.version>
         <vividsolutions-jts.version>1.13</vividsolutions-jts.version>
-        <image>gcr.io/focus-cargo-315523/staccato:${project.version}</image>
+        <!-- <image>gcr.io/focus-cargo-315523/staccato:${project.version}</image> -->
     </properties>
 
     <modules>