From 30aa39357f8cf03e2f5eab7913cadb922e9af285 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Mon, 12 Dec 2022 12:20:29 -0700 Subject: [PATCH 1/7] [Gradle Release Plugin] - pre tag commit: '1.16.0'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 26fc19c5b..73fa2ad59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=1.17.0-SNAPSHOT +version=1.16.0 ### library versions ### commonsCollections4Version=4.4 From 6a57d127d4aecd2b3d3211bb0f9435d278e2dc1f Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 7 Nov 2023 12:58:40 -0700 Subject: [PATCH 2/7] NOJIRA RELEASE 2.0.0-BETA --- Versioning.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Versioning.md b/Versioning.md index 00835c677..a51dad257 100644 --- a/Versioning.md +++ b/Versioning.md @@ -28,5 +28,4 @@ Examples of version: * `2.0.0` - Major GA release of 2.0.0 line * `2.0.1` - Patch release of 2.0.x line * `2.1.0` - First minor feature release of 2.x line - - +* `2.0.0-BETA` - Pre-release version \ No newline at end of file From d8ac580e41570f0f32e477f28c87cde4e14b066b Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 7 Nov 2023 13:53:18 -0700 Subject: [PATCH 3/7] NOJIRA fixes for unit test --- .../admin/ui/controller/EntitiesControllerTests.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerTests.groovy index 7f0f16606..1b03ee6f8 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerTests.groovy @@ -150,7 +150,7 @@ class EntitiesControllerTests extends AbstractBaseDataJpaTest { ''' when: - def result = mockMvc.perform(get('/api/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1').header('Accept', 'application/xml')) + def result = mockMvc.perform(get('/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1').header('Accept', 'application/xml')) then: result.andExpect(status().isOk()) From 5e3b7e6ecee25f79a533badd4982556bcb75905b Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 7 Nov 2023 14:09:47 -0700 Subject: [PATCH 4/7] NOJIRA chaning back to i2/master branch --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6c6217cee..1fcee520b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -42,7 +42,7 @@ i2.github.owner=TIER i2.github.repo=shib-idp-ui i2.github.apiEndpoint=https://github.internet2.edu/api/v3 i2.git.remote=i2 -i2.git.branch=2.0.0-BETA +i2.git.branch=master # set app use.release.app.yml=false From ff9403fc0de0e6fcc5f185c8335c2d5b46a8361e Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 7 Nov 2023 15:52:12 -0700 Subject: [PATCH 5/7] NOJIRA updating beta version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1fcee520b..76e9d0314 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=2.0.0-BETA +version=2.0.0-BETA-R1 ### library versions ### ## As of 2-23-23 From 34757016999e1302f799fedad31f40bd41bea525 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 7 Nov 2023 16:01:37 -0700 Subject: [PATCH 6/7] [Gradle Release Plugin] - new version commit: '2.0.0-BETA-R2'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 76e9d0314..ac75875b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=shibui group=edu.internet2.tier.shibboleth.admin.ui -version=2.0.0-BETA-R1 +version=2.0.0-BETA-R2 ### library versions ### ## As of 2-23-23 From 68cfe9c75ccd61e154e84edece6fbcda534ba1b0 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 28 Nov 2023 11:05:04 -0700 Subject: [PATCH 7/7] NOJIRA fixing duplicates in the WAR file issue --- backend/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 71575911a..e2e080dbc 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -129,7 +129,7 @@ bootWar { } dependsOn 'copyApplicationYAML' archiveName = "${baseName}-${version}.war" - duplicatesStrategy(DuplicatesStrategy.INCLUDE) + duplicatesStrategy(DuplicatesStrategy.EXCLUDE) } springBoot { @@ -363,7 +363,7 @@ task enversTest(type: Test) { classpath = sourceSets.enversTest.runtimeClasspath systemProperties = System.properties systemProperties['user.dir'] = workingDir - processEnversTestResources.duplicatesStrategy(DuplicatesStrategy.INCLUDE) + processEnversTestResources.duplicatesStrategy(DuplicatesStrategy.EXCLUDE) useJUnitPlatform() } @@ -486,7 +486,7 @@ docker { files tasks.bootWar.outputs files 'src/main/docker-files/loader.properties' buildArgs(['JAR_FILE': "shibui-${version}.war"]) - copySpec.duplicatesStrategy(DuplicatesStrategy.INCLUDE) + copySpec.duplicatesStrategy(DuplicatesStrategy.EXCLUDE) } tasks.dockerRun.dependsOn tasks.docker