From fec4e9e811a5fa5f005c5914e34822e94d9b0e22 Mon Sep 17 00:00:00 2001 From: Alex Sheppard Date: Tue, 16 Jun 2020 07:55:35 +0100 Subject: [PATCH 1/5] No jira: specify release repo for master non release builds. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 571bf3642..ee4bb8751 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,7 @@ pipeline { 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/" + 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/" } } } From 3d87a18fe57da5411ead825b088516bb990ede70 Mon Sep 17 00:00:00 2001 From: Alex Sheppard Date: Tue, 16 Jun 2020 07:58:40 +0100 Subject: [PATCH 2/5] No jira: bump to 1.3.3.GRESHAM-20. --- openid-connect-client/pom.xml | 2 +- openid-connect-common/pom.xml | 2 +- openid-connect-server-webapp/pom.xml | 2 +- openid-connect-server/pom.xml | 2 +- pom.xml | 2 +- uma-server-webapp/pom.xml | 2 +- uma-server/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openid-connect-client/pom.xml b/openid-connect-client/pom.xml index 22d57a64c..84265c496 100644 --- a/openid-connect-client/pom.xml +++ b/openid-connect-client/pom.xml @@ -22,7 +22,7 @@ openid-connect-parent org.mitre - 1.3.3.GRESHAM-20-SNAPSHOT + 1.3.3.GRESHAM-20 .. openid-connect-client diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml index f298c1ec0..7da34b61a 100644 --- a/openid-connect-common/pom.xml +++ b/openid-connect-common/pom.xml @@ -22,7 +22,7 @@ openid-connect-parent org.mitre - 1.3.3.GRESHAM-20-SNAPSHOT + 1.3.3.GRESHAM-20 .. openid-connect-common diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml index 28576fb36..ef1aa574b 100644 --- a/openid-connect-server-webapp/pom.xml +++ b/openid-connect-server-webapp/pom.xml @@ -21,7 +21,7 @@ org.mitre openid-connect-parent - 1.3.3.GRESHAM-20-SNAPSHOT + 1.3.3.GRESHAM-20 openid-connect-server-webapp war diff --git a/openid-connect-server/pom.xml b/openid-connect-server/pom.xml index d42043494..01b8aaff9 100644 --- a/openid-connect-server/pom.xml +++ b/openid-connect-server/pom.xml @@ -23,7 +23,7 @@ org.mitre openid-connect-parent - 1.3.3.GRESHAM-20-SNAPSHOT + 1.3.3.GRESHAM-20 .. diff --git a/pom.xml b/pom.xml index e0665cac7..610d812c0 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.mitre openid-connect-parent - 1.3.3.GRESHAM-20-SNAPSHOT + 1.3.3.GRESHAM-20 MITREid Connect pom diff --git a/uma-server-webapp/pom.xml b/uma-server-webapp/pom.xml index cdb50603c..41a1791af 100644 --- a/uma-server-webapp/pom.xml +++ b/uma-server-webapp/pom.xml @@ -19,7 +19,7 @@ org.mitre openid-connect-parent - 1.3.3.GRESHAM-20-SNAPSHOT + 1.3.3.GRESHAM-20 .. uma-server-webapp diff --git a/uma-server/pom.xml b/uma-server/pom.xml index d7cbae630..1b77d737b 100644 --- a/uma-server/pom.xml +++ b/uma-server/pom.xml @@ -19,7 +19,7 @@ org.mitre openid-connect-parent - 1.3.3.GRESHAM-20-SNAPSHOT + 1.3.3.GRESHAM-20 .. uma-server From 5ca997f8d75d629f38b38ad836054b3550109234 Mon Sep 17 00:00:00 2001 From: Alex Sheppard Date: Tue, 16 Jun 2020 08:07:03 +0100 Subject: [PATCH 3/5] No jira: temporarily remove version discovery. --- Jenkinsfile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee4bb8751..3bbea38ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,22 +22,22 @@ pipeline { 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 ('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 { From 513ff5f82fb347dcf9f0763d376d7144e7583fac Mon Sep 17 00:00:00 2001 From: Alex Sheppard Date: Tue, 16 Jun 2020 13:44:58 +0100 Subject: [PATCH 4/5] Revert "No jira: temporarily remove version discovery." This reverts commit 5ca997f8d75d629f38b38ad836054b3550109234. --- Jenkinsfile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3bbea38ff..ee4bb8751 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,22 +22,22 @@ pipeline { 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 ('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 { From 86fb63759d46e89a87d1c2dc9a544644c83bbdd4 Mon Sep 17 00:00:00 2001 From: Alex Sheppard Date: Tue, 16 Jun 2020 13:47:34 +0100 Subject: [PATCH 5/5] New Development Version 1.3.3.GRESHAM-21-SNAPSHOT. --- openid-connect-client/pom.xml | 2 +- openid-connect-common/pom.xml | 2 +- openid-connect-server-webapp/pom.xml | 2 +- openid-connect-server/pom.xml | 2 +- pom.xml | 2 +- uma-server-webapp/pom.xml | 2 +- uma-server/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openid-connect-client/pom.xml b/openid-connect-client/pom.xml index 84265c496..db56fbd11 100644 --- a/openid-connect-client/pom.xml +++ b/openid-connect-client/pom.xml @@ -22,7 +22,7 @@ openid-connect-parent org.mitre - 1.3.3.GRESHAM-20 + 1.3.3.GRESHAM-21-SNAPSHOT .. openid-connect-client diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml index 7da34b61a..a65e7e871 100644 --- a/openid-connect-common/pom.xml +++ b/openid-connect-common/pom.xml @@ -22,7 +22,7 @@ openid-connect-parent org.mitre - 1.3.3.GRESHAM-20 + 1.3.3.GRESHAM-21-SNAPSHOT .. openid-connect-common diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml index ef1aa574b..27dbe7960 100644 --- a/openid-connect-server-webapp/pom.xml +++ b/openid-connect-server-webapp/pom.xml @@ -21,7 +21,7 @@ org.mitre openid-connect-parent - 1.3.3.GRESHAM-20 + 1.3.3.GRESHAM-21-SNAPSHOT openid-connect-server-webapp war diff --git a/openid-connect-server/pom.xml b/openid-connect-server/pom.xml index 01b8aaff9..118881a1b 100644 --- a/openid-connect-server/pom.xml +++ b/openid-connect-server/pom.xml @@ -23,7 +23,7 @@ org.mitre openid-connect-parent - 1.3.3.GRESHAM-20 + 1.3.3.GRESHAM-21-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 610d812c0..340c91d25 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.mitre openid-connect-parent - 1.3.3.GRESHAM-20 + 1.3.3.GRESHAM-21-SNAPSHOT MITREid Connect pom diff --git a/uma-server-webapp/pom.xml b/uma-server-webapp/pom.xml index 41a1791af..034143ea0 100644 --- a/uma-server-webapp/pom.xml +++ b/uma-server-webapp/pom.xml @@ -19,7 +19,7 @@ org.mitre openid-connect-parent - 1.3.3.GRESHAM-20 + 1.3.3.GRESHAM-21-SNAPSHOT .. uma-server-webapp diff --git a/uma-server/pom.xml b/uma-server/pom.xml index 1b77d737b..5dd31632a 100644 --- a/uma-server/pom.xml +++ b/uma-server/pom.xml @@ -19,7 +19,7 @@ org.mitre openid-connect-parent - 1.3.3.GRESHAM-20 + 1.3.3.GRESHAM-21-SNAPSHOT .. uma-server