From c574c3d463dea7d38d4119c9639a7a8f248d3f8a Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Fri, 26 Feb 2021 15:12:56 -0600
Subject: [PATCH] Polishing.

---
 Jenkinsfile  | 18 +-----------------
 settings.xml |  4 ++--
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fe5ae12a..a92d946f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,22 +11,6 @@ pipeline {
 	}
 
 	stages {
-		stage('Publish OpenJDK 8 + jq docker image') {
-			when {
-				changeset "ci/Dockerfile"
-			}
-			agent any
-
-			steps {
-				script {
-					def image = docker.build("springci/spring-ws-openjdk8-with-jq", "ci/")
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						image.push()
-					}
-				}
-			}
-		}
-
 		stage("Test: baseline (jdk8)") {
 			agent {
 				docker {
@@ -199,7 +183,7 @@ pipeline {
 					}
 
 					if (RELEASE_TYPE == 'release') {
-						sh "PROFILE=distribute,central USERNAME=${SONATYPE_USR} PASSWORD=${SONATYPE_PSW} ci/build-and-deploy-to-maven-central.sh ${PROJECT_VERSION}"
+						sh "PROFILE=distribute,central ci/build-and-deploy-to-maven-central.sh ${PROJECT_VERSION}"
 
 						slackSend(
 							color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger',
diff --git a/settings.xml b/settings.xml
index 7368837c..11275707 100644
--- a/settings.xml
+++ b/settings.xml
@@ -6,8 +6,8 @@
 	<servers>
 		<server>
 			<id>sonatype</id>
-			<username>${env.USERNAME}</username>
-			<password>${env.PASSWORD}</password>
+			<username>${env.SONATYPE_USR}</username>
+			<password>${env.SONATYPE_PSW}</password>
 		</server>
 	</servers>