From 784e44334446b42e2ace570b072744323aa1cd6b Mon Sep 17 00:00:00 2001
From: jim <thejimnicholson@gmail.com>
Date: Thu, 15 Dec 2022 12:56:57 +0000
Subject: [PATCH] Try to clean up this stuff (#2)

Switching to jdk 17 image

Co-authored-by: Jim Nicholson <thejimnicholson@gmail.com>
Reviewed-on: https://git.thejimnicholson.com/homelab/java-spring-microservice/pulls/2
---
 Jenkinsfile | 10 ++++------
 pom.xml     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b4ce097..1ac2a43 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 
 def POD_LABEL="servicedemo-${UUID.randomUUID().toString()}"
-def REGISTRY="docker.home.thejimnicholson.com/servicedemo"
+def REGISTRY="registry.thejimnicholson.com/servicedemo"
 def POM_VERSION="unknown"
 def MVN_OPTS="-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 
@@ -8,7 +8,7 @@ def MVN_OPTS="-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4
 podTemplate(label: POD_LABEL, containers: [
   containerTemplate(
     name: 'maven',
-    image: 'maven:3.8.4-openjdk-11',
+    image: 'maven:3.8.4-openjdk-17',
     command: 'sleep',
     args: '30d'
   ),
@@ -56,11 +56,9 @@ podTemplate(label: POD_LABEL, containers: [
                -c `pwd` \
                --insecure \
                --skip-tls-verify \
+               --no-push \
                --tarPath ./target/servicedemo-${POM_VERSION}.image.tar \
-               --destination=${REGISTRY}/servicedemo:${POM_VERSION} \
-               --destination=${REGISTRY}/servicedemo:${GIT_HASH} \
-               --destination=${REGISTRY}/servicedemo:latest"
-
+               --destination=servicedemo:${GIT_HASH}"
           }
         }
         stage('Archive') {
diff --git a/pom.xml b/pom.xml
index aca5d4d..f1b3d28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<name>servicedemo</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 		<spring-cloud.version>2020.0.4</spring-cloud.version>
 		<spring-boot.build-image.imageName>servicedemo</spring-boot.build-image.imageName>
 	</properties>