From 712cb28475651ec092610714369d01b9a2c625d0 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 13:41:41 -0500 Subject: [PATCH 1/8] [SHIBUI-941] release script update --- backend/build.gradle | 1 - build.gradle | 18 ++++++++++++++++++ gradle.properties | 5 +++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index c7792db77..4e5822e2e 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -3,7 +3,6 @@ plugins { id 'war' id 'org.springframework.boot' version '2.0.0.RELEASE' id 'com.gorylenko.gradle-git-properties' version '1.4.21' - id 'net.researchgate.release' version '2.6.0' id 'io.franzbecker.gradle-lombok' version '1.13' id 'com.palantir.docker' version '0.20.1' id 'com.palantir.docker-run' version '0.20.1' diff --git a/build.gradle b/build.gradle index b1dad6f5c..bd14f8776 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,21 @@ +plugins { + id 'base' + id 'net.researchgate.release' version '2.6.0' + id 'com.github.breadmoirai.github-release' version '2.2.9' +} + +tasks.findByName('release').dependsOn project.getTasksByName('test', true) + +githubRelease { + token project.'github.token' + owner project.'github.owner' + repo project.'github.repo' + releaseAssets project('backend').getTasksByName('bootWar', false).outputs, project('backend').getTasksByName('bootJar', false).outputs + overwrite true +} + +afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false) + task wrapper(type: Wrapper) { gradleVersion = '4.8.1' } diff --git a/gradle.properties b/gradle.properties index 01ee65808..7fdfbddf8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,3 +12,8 @@ hibernate.version=5.2.11.Final lucene.version=7.2.1 org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit + +# set token in personal global +github.token= +github.owner= +github.repo= \ No newline at end of file From 7c00915c4ff2e2e93ba0ee5fe326ff5d4d33f6cf Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 13:45:45 -0500 Subject: [PATCH 2/8] [SHIBUI-941] release script update --- build.gradle | 6 +++--- gradle.properties | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index bd14f8776..e7990c82b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,9 @@ plugins { tasks.findByName('release').dependsOn project.getTasksByName('test', true) githubRelease { - token project.'github.token' - owner project.'github.owner' - repo project.'github.repo' + token project.'i2.github.token' + owner project.'i2.github.owner' + repo project.'i2.github.repo' releaseAssets project('backend').getTasksByName('bootWar', false).outputs, project('backend').getTasksByName('bootJar', false).outputs overwrite true } diff --git a/gradle.properties b/gradle.properties index 7fdfbddf8..6d589c817 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,6 @@ lucene.version=7.2.1 org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit # set token in personal global -github.token= -github.owner= -github.repo= \ No newline at end of file +i2.github.token= +i2.github.owner=tier +i2.github.repo=shib-idp-ui \ No newline at end of file From 1567a9ee526b0199ae33de1190c987f6a5dc1bc8 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 13:52:33 -0500 Subject: [PATCH 3/8] [SHIBUI-941] release script update --- build.gradle | 1 + gradle.properties | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e7990c82b..ff3c80edc 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,7 @@ githubRelease { repo project.'i2.github.repo' releaseAssets project('backend').getTasksByName('bootWar', false).outputs, project('backend').getTasksByName('bootJar', false).outputs overwrite true + apiEndpoint project.'i2.github.apiEndpoint' } afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false) diff --git a/gradle.properties b/gradle.properties index 6d589c817..c2bc345fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,5 @@ org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit # set token in personal global i2.github.token= i2.github.owner=tier -i2.github.repo=shib-idp-ui \ No newline at end of file +i2.github.repo=shib-idp-ui +i2.github.apiEndpoint=https://github.internet2.edu \ No newline at end of file From 27f83820b3d8038530d522a9c020e4958b99e294 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 14:11:04 -0500 Subject: [PATCH 4/8] update release script config --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c2bc345fd..39de3eeab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit # set token in personal global i2.github.token= -i2.github.owner=tier +i2.github.owner=TIER i2.github.repo=shib-idp-ui -i2.github.apiEndpoint=https://github.internet2.edu \ No newline at end of file +i2.github.apiEndpoint=https://github.internet2.edu From 256d7c1b84f010dcdc283822861db11e8a4001e0 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 15:17:40 -0500 Subject: [PATCH 5/8] update configuration --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 39de3eeab..a3b72a8b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit i2.github.token= i2.github.owner=TIER i2.github.repo=shib-idp-ui -i2.github.apiEndpoint=https://github.internet2.edu +i2.github.apiEndpoint=https://github.internet2.edu/api/v3/ From 9f4196052e6be54ba47580754a5e267e67fa6628 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 15:38:38 -0500 Subject: [PATCH 6/8] update configuration --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a3b72a8b0..335e4cb7b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit i2.github.token= i2.github.owner=TIER i2.github.repo=shib-idp-ui -i2.github.apiEndpoint=https://github.internet2.edu/api/v3/ +i2.github.apiEndpoint=https://github.internet2.edu/api/v3 From 712f537c5ba458dfaead04874758c52fef4c410b Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 15:51:35 -0500 Subject: [PATCH 7/8] [Gradle Release Plugin] - pre tag commit: '1.5.3'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 335e4cb7b..2b79a1117 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.6.0-SNAPSHOT +version=1.5.3 shibboleth.version=3.4.0 opensaml.version=3.4.0 From df3abf73502e58840f62851e36286f03b1317528 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 10 Jun 2019 15:52:08 -0500 Subject: [PATCH 8/8] [Gradle Release Plugin] - new version commit: '1.6.0-SNAPSHOT'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2b79a1117..335e4cb7b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.5.3 +version=1.6.0-SNAPSHOT shibboleth.version=3.4.0 opensaml.version=3.4.0