From 999d792d38d6c1225f34d39b03292e871a187240 Mon Sep 17 00:00:00 2001
From: Bill O'Neil <bill@dartalley.com>
Date: Tue, 19 Nov 2019 09:08:58 -0500
Subject: [PATCH 1/2] Switch to Java 11

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 84f06952..67a5669e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,8 +23,8 @@ allprojects {
     group = 'com.stubbornjava.StubbornJava'
     version = '0.0.0-SNAPSHOT'
     
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+    sourceCompatibility = 11
+    targetCompatibility = 11
 
     sourceSets {
         main {

From 5a42fa2915b26b7a71723900d834d969f4fa2fee Mon Sep 17 00:00:00 2001
From: Bill O'Neil <bill@dartalley.com>
Date: Fri, 3 Apr 2020 20:51:11 -0400
Subject: [PATCH 2/2] jib

---
 build.gradle                     | 17 ++++++++---------
 stubbornjava-webapp/build.gradle | 25 ++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 67a5669e..c5a249d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,7 @@
 // {{start:build}}
-buildscript {
-    repositories {
-        jcenter()
-    }
-    // buildscript dependencies can be used for build time plugins.
-    dependencies {
-        classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4"
-    }
+plugins {
+    id 'com.google.cloud.tools.jib' version '2.0.0' apply false
 }
-
 // Include a gradle script that has all of our dependencies split out.
 apply from: "gradle/dependencies.gradle"
 
@@ -37,6 +30,12 @@ allprojects {
         }
     }
 
+    // https://github.com/GoogleContainerTools/jib/tree/master/examples/multi-module#reproducibility-of-dependency-module-shared-library
+    jar {
+        preserveFileTimestamps false
+        reproducibleFileOrder true
+    }
+
     repositories {
         mavenLocal()
         mavenCentral()
diff --git a/stubbornjava-webapp/build.gradle b/stubbornjava-webapp/build.gradle
index 94f52edf..7b6959db 100644
--- a/stubbornjava-webapp/build.gradle
+++ b/stubbornjava-webapp/build.gradle
@@ -1,5 +1,6 @@
 // {{start:dependencies}}
-apply plugin: 'com.github.johnrengelman.shadow'
+
+apply plugin: 'com.google.cloud.tools.jib'
 
 dependencies {
     // Project reference
@@ -15,10 +16,24 @@ dependencies {
     testCompile libs.junit
 }
 
-shadowJar {
-   archiveBaseName = 'stubbornjava-all'
-   classifier = null
-   archiveVersion = null
+jib {
+  //containerizingMode = 'packaged'
+  from {
+    image = 'adoptopenjdk/openjdk11:alpine-jre'
+  }
+  // to {
+  //   image = 'localhost:5000/my-image/built-with-jib'
+  //   credHelper = 'osxkeychain'
+  //   tags = ['tag2', 'latest']
+  // }
+  container {
+    jvmFlags = ['-Denv=PROD']
+    mainClass = 'com.stubbornjava.webapp.StubbornJavaWebApp'
+    // args = ['some', 'args']
+    ports = ['8080', '8080/tcp']
+    // labels = [key1:'value1', key2:'value2']
+    // format = 'OCI'
+  }
 }
 
 // {{end:dependencies}}