semver: major - updated to spring boot 3

AppDirect · Jun 13, 2024 · c1b8899 · c1b8899
1 parent fac5e39
commit c1b8899
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,15 +10,15 @@ import org.json.JSONObject
 def version
 pipeline {
 
-    agent {
-            docker {
-                image "docker.appdirect.tools/appdirect/build-jdk17:latest"
-                args "-v /var/run/docker.sock:/var/run/docker.sock "
-        	reuseNode true
-            }
-        }
-
-    options { disableConcurrentBuilds() }
+	agent {
+		docker {
+			image "docker.appdirect.tools/appdirect/build-jdk17:latest"
+			args "-v /var/run/docker.sock:/var/run/docker.sock "
+			reuseNode true
+		}
+	}
+
+	options { disableConcurrentBuilds() }
 	environment {
 		GITHUB_REPO_NAME = 'service-integration-sdk'
 		GITHUB_REPO_OWNER = 'AppDirect'
@@ -32,7 +32,7 @@ pipeline {
 		stage('PR approval') {
 		        steps {
 				script {
-					if (BRANCH_NAME != 'master' || BRANCH_NAME != 'release-v1') {
+					if (BRANCH_NAME != 'master' || BRANCH_NAME != 'release-v1'  || BRANCH_NAME != 'release-v3') {
 						timeout(time: 15, unit: "MINUTES") {
 						   input message: 'Do you want to approve the PR build?', ok: 'Yes'
 						}
@@ -41,7 +41,7 @@ pipeline {
 			}
 		}
 		stage('Checkout') {
-		        steps {
+			steps {
 
 				echo 'Checking out from repository...'
 				checkout scm: [
@@ -54,8 +54,8 @@ pipeline {
 						]
 				]
 				script {
-					if (env.BRANCH_NAME == "release-v1") {
-						version = getSemver('release-v1', '', env.BRANCH_NAME != 'release-v1' ? '-SNAPSHOT' : '')
+					if (env.BRANCH_NAME == "release-v1" || env.BRANCH_NAME == "release-v3") {
+						version = getSemver(env.BRANCH_NAME, '', '')
 					} else {
 						version = getSemver('master', '', env.BRANCH_NAME != 'master' ? '-SNAPSHOT' : '')
 					}
@@ -64,8 +64,8 @@ pipeline {
 		}
 
 		stage('Setup') {
-                        when {
-			   expression { BRANCH_NAME ==~ /(release-v1|master)/ }
+			when {
+			   expression { BRANCH_NAME ==~ /(release-v1|release-v3|master)/ }
 			}
 
 			steps {
@@ -104,7 +104,7 @@ pipeline {
 					}
 					script {
 
-						if (BRANCH_NAME == 'master' || BRANCH_NAME == 'release-v1') {
+						if (BRANCH_NAME == 'master' || BRANCH_NAME == 'release-v1' || BRANCH_NAME == 'release-v3') {
 							sh "gpg2 --batch --no-tty --import $GPG_KEY || /bin/true"
 							sh '''
 							    ./mvnw deploy source:jar-no-fork -Prelease -U -s settings.xml
@@ -123,7 +123,7 @@ pipeline {
 
 		stage('Release scope') {
 			when {
-				expression { BRANCH_NAME ==~ /(release-v1|master)/ }
+				expression { BRANCH_NAME ==~ /(release-v1|release-v3|master)/ }
 			}
 			steps {
 				pushGitTag version

diff --git a/README.md b/README.md
@@ -9,8 +9,8 @@ Integrate your application with the AppDirect platform. Create a connector using
 For more details see [GitHub wiki](https://github.com/AppDirect/service-integration-sdk/wiki).
 
 ## Prerequisites
-* Java 8 or higher
-* Build your connector using [Spring Boot 2.0](https://projects.spring.io/spring-boot/)
+* Java 17 or higher
+* Build your connector using [Spring Boot 3.0](https://projects.spring.io/spring-boot/)
 
 ## Features
 * Automatic parsing of incoming AppDirect distribution API calls