From fe938f683427ae1b66f686bb4b8a5e9fd2af0a40 Mon Sep 17 00:00:00 2001
From: Ferdinand Mayo <fmayo@greshamtech.com>
Date: Thu, 2 Sep 2021 12:06:29 +0100
Subject: [PATCH] Updated circle to new Corretto and removed jenkinsfile

---
 .circleci/config.yml |   2 +-
 CHANGELOG.md         |   1 +
 Jenkinsfile          | 127 -------------------------------------------
 3 files changed, 2 insertions(+), 128 deletions(-)
 delete mode 100644 Jenkinsfile

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1a88c74ea..0addb3357 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ orbs:
 executors:
   docker-executor:
     docker:
-      - image: 455456581940.dkr.ecr.eu-west-1.amazonaws.com/circleci-build-images:corretto-8u275
+      - image: 455456581940.dkr.ecr.eu-west-1.amazonaws.com/circleci-build-images:corretto-8u302
         aws_auth:
           aws_access_key_id: $AWS_ACCESS_KEY_ID
           aws_secret_access_key: $AWS_SECRET_ACCESS_KEY
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8c651118..487207669 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 Unreleased:
+- Updated JDK to Corretto 1.8.302
 
 *1.3.3-GRESHAM:
 - Upgraded libraries with known vulnerabilities
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 0e75e8952..000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,127 +0,0 @@
-pipeline {
-	agent any
-	tools {
-		maven 'Maven 3.6.3'
-		jdk 'Corretto 8.275'
-	}
-	environment {
-		VERSION = ''
-		NEW_VERSION = ''
-	}
-	parameters {
-		booleanParam(name: 'RELEASE', defaultValue: false, description: 'Release a new version of the open id connect component')
-	}
-	options {
-		// Only keep 10 builds in total
-		buildDiscarder(logRotator(numToKeepStr:'10', daysToKeepStr:'2'))
-
-		// Display timestamps
-		timestamps()
-
-		// Prevent concurrent builds
-		disableConcurrentBuilds()
-	}
-	stages {
-		stage ('Discover Version Number') {
-			steps {
-				script {
-					def pom = readMavenPom file: 'pom.xml'
-					def currentVersion = pom.getVersion()
-
-					VERSION = currentVersion.substring(0, currentVersion.indexOf('-SNAPSHOT'))
-
-					def parts = VERSION.tokenize('-')
-					def currentGreshamVersion = parts[1].toInteger()
-
-					parts.remove(1)
-					NEW_VERSION = parts.join('-') + '-' + (currentGreshamVersion + 1)
-				}
-			}
-		}
-		stage ('1.3.3 Release Build') {
-			when {
-				expression {
-					return BRANCH_NAME == "1.3.x" && params.RELEASE
-				}
-			}
-			steps {
-				sh "mvn versions:set -B -DnewVersion=$VERSION"
-				sh "mvn -N -B versions:update-child-modules"
-				script {
-					sh "git commit --all --message 'Creating Release $VERSION'"
-					sh "git tag --annotate v$VERSION --message 'Creating Release $VERSION'"
-					sh "git push origin HEAD:${BRANCH_NAME} --tags"
-				}
-				timeout(time: 10, unit: 'MINUTES') {
-					withMaven(options: [junitPublisher(disabled: true)]) {
-						sh "mvn -B -V -U -T4 clean deploy -DaltReleaseDeploymentRepository=releases::default::https://nexus.greshamtech.com/repository/thirdparty-maven-releases/"
-					}
-				}
-			}
-			post {
-				success {
-					junit '**/target/surefire-reports/**/*.xml'
-				}
-			}
-		}
-		stage ('1.3.3 Snapshot Build') {
-			when {
-				expression {
-					return BRANCH_NAME == "1.3.x" && !params.RELEASE
-				}
-			}
-			steps {
-				timeout(time: 10, unit: 'MINUTES') {
-					withMaven(options: [junitPublisher(disabled: true)]) {
-						sh "mvn -B -V -U -T4 clean deploy -DaltSnapshotDeploymentRepository=snapshots::default::https://nexus.greshamtech.com/repository/thirdparty-maven-snapshots/ -DaltReleaseDeploymentRepository=releases::default::https://nexus.greshamtech.com/repository/thirdparty-maven-releases/"
-					}
-				}
-			}
-			post {
-				success {
-					junit '**/target/surefire-reports/**/*.xml'
-				}
-			}
-		}
-		stage ('Feature Branch Build') {
-			when {
-				not {
-				   branch "1.3.x"
-				}
-			}
-			steps {
-				timeout(time: 10, unit: 'MINUTES') {
-					withMaven(options: [junitPublisher(disabled: true)]) {
-						sh "mvn versions:set -B -DnewVersion=${env.BRANCH_NAME}.GRESHAM-SNAPSHOT"
-						sh "mvn -N -B versions:update-child-modules"
-						sh "mvn -B -V -U -T4 clean deploy -DaltSnapshotDeploymentRepository=snapshots::default::https://nexus.greshamtech.com/repository/thirdparty-maven-snapshots/"
-					}
-				}
-			}
-			post {
-				success {
-					junit '**/target/surefire-reports/**/*.xml'
-				}
-			}
-		}
-		stage ('Bump Development Version') {
-			when {
-				expression {
-					return BRANCH_NAME == '1.3.x' && params.RELEASE
-				}
-			}
-			steps {
-				script {
-					sh "mvn versions:set -DnewVersion=${NEW_VERSION}-SNAPSHOT --batch-mode"
-					sh "git commit --all --message 'New Development Version $NEW_VERSION-SNAPSHOT'"
-					sh "git push origin HEAD:${BRANCH_NAME}"
-				}
-			}
-		}
-	}
-	post {
-		always {
-			deleteDir()
-		}
-	}
-}