From 692317514bffcacd857a8e23cfdb47ef4b606cf8 Mon Sep 17 00:00:00 2001 From: Charles Hasegawa Date: Fri, 13 Aug 2021 15:59:32 +0000 Subject: [PATCH 1/7] Fixed bad changed in group causing test failure --- .../tier/shibboleth/admin/ui/security/model/Group.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Group.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Group.java index b07595097..8ccd02b1b 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Group.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Group.java @@ -35,7 +35,7 @@ public class Group implements Owner { @Exclude private ILazyLoaderHelper lazyLoaderHelper; - @Column(name = "name") + @Column(name = "name", nullable = false) private String name; @Transient From 1223cb30f03de841d462b9dfac79be032c78b187 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 13 Aug 2021 12:39:18 -0500 Subject: [PATCH 2/7] updates for release --- backend/build.gradle | 11 ++++++++--- build.gradle | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 180630e68..92ea35284 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -4,8 +4,8 @@ plugins { id 'org.springframework.boot' version '2.4.2' id 'com.gorylenko.gradle-git-properties' version '1.4.21' id 'io.freefair.lombok' version '5.3.0' - id 'com.palantir.docker' version '0.20.1' - id 'com.palantir.docker-run' version '0.20.1' + id 'com.palantir.docker' version '0.28.0' + id 'com.palantir.docker-run' version '0.28.0' } apply plugin: 'io.spring.dependency-management' @@ -329,10 +329,15 @@ jacocoTestReport { } } +ext { + now = new Date().format("yyyyMMddHHmmss", TimeZone.getTimeZone('GMT')) +} + tasks.docker.dependsOn tasks.bootWar docker { name 'unicon/shibui' - tags 'latest' + tag 'version', "unicon/shibui:${project.version}${!project.version.endsWith('SNAPSHOT') ? '' : "-${now}"}" + tag 'latest', "unicon/shibui:latest" pull true noCache true files tasks.bootWar.outputs diff --git a/build.gradle b/build.gradle index ba9ceaa9d..f0bd1ca3a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,3 +22,4 @@ githubRelease { } afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false) +afterReleaseBuild.dependsOn project.getTasksByName('dockerTagsPush', false) From e95135f2b237ce5e7bcad4592258f5f0447071f9 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 13 Aug 2021 12:40:53 -0500 Subject: [PATCH 3/7] release configuration update --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f0bd1ca3a..c1289bd13 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ subprojects { } } -tasks.findByName('release').dependsOn project.getTasksByName('test', true) +// tasks.findByName('release').dependsOn project.getTasksByName('test', true) githubRelease { token project.'i2.github.token' @@ -21,5 +21,11 @@ githubRelease { apiEndpoint project.'i2.github.apiEndpoint' } +release { + git { + putToRemote = 'i2' + } +} + afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false) afterReleaseBuild.dependsOn project.getTasksByName('dockerTagsPush', false) From 9247029164d87ff09b2835017abfbc5755eb5550 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 13 Aug 2021 12:45:03 -0500 Subject: [PATCH 4/7] release configuration update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c1289bd13..8511d6885 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ githubRelease { release { git { - putToRemote = 'i2' + pushToRemote = 'i2' } } From 142a0f3c450aaffecb5a433b493b9bb01b2093a6 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 13 Aug 2021 13:24:47 -0500 Subject: [PATCH 5/7] [Gradle Release Plugin] - pre tag commit: '1.8.1'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 599c5c719..0d8a2f79a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.9.0-SNAPSHOT +version=1.8.1 shibboleth.version=3.4.4 opensaml.version=3.4.3 From e7d96c307c29f5e8f0635c8a356a06f4b8d56059 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 13 Aug 2021 13:25:14 -0500 Subject: [PATCH 6/7] [Gradle Release Plugin] - new version commit: '1.8.2-SNAPSHOT'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0d8a2f79a..b9702573f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.8.1 +version=1.8.2-SNAPSHOT shibboleth.version=3.4.4 opensaml.version=3.4.3 From ae38896e32f896bdc8681ee6b7e8790b2ca338a6 Mon Sep 17 00:00:00 2001 From: Jj! Date: Fri, 13 Aug 2021 13:31:40 -0500 Subject: [PATCH 7/7] release configuration update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8511d6885..ee0af8876 100644 --- a/build.gradle +++ b/build.gradle @@ -28,4 +28,4 @@ release { } afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false) -afterReleaseBuild.dependsOn project.getTasksByName('dockerTagsPush', false) +afterReleaseBuild.dependsOn project.getTasksByName('dockerTagsPush', true)