From 2e5a6b1aca825a61ef49693f9da93c0b2ce34004 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Thu, 14 Sep 2023 14:25:06 -0700 Subject: [PATCH] SHIBUI-2510 Update to use the release 5.0.0 versions of Shib and OpenSAML - removed all the SNAPSHOT versions of deps --- backend/build.gradle | 7 +------ gradle.properties | 12 ++++++------ pac4j-module/build.gradle | 5 ----- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 443bf9e8f..71575911a 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -19,15 +19,10 @@ test { } repositories { - jcenter() maven { url 'https://build.shibboleth.net/nexus/content/groups/public' artifactUrls = ['https://build.shibboleth.net/nexus/content/repositories/thirdparty-snapshots'] } - // TODO remove snapshots after the versions become final - maven { - url 'https://build.shibboleth.net/maven/snapshots' - } maven { // for the springboot plugin url "https://plugins.gradle.org/m2/" } @@ -171,7 +166,7 @@ dependencies { } // shibboleth idp deps - ['idp-profile-spring', 'idp-profile-api'].each { + ['idp-profile-impl', 'idp-profile-api'].each { implementation "net.shibboleth.idp:${it}:${project.'shibbolethVersion'}" integrationTestImplementation "net.shibboleth.idp:${it}:${project.'shibbolethVersion'}" } diff --git a/gradle.properties b/gradle.properties index 6978848ee..beef423a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,15 +14,15 @@ log4JVersion=2.20.0 lombokVersion=6.6.2 nashornVersion=15.4 opencsvVersion=5.7.1 -opensamlVersion=5.0.0-SNAPSHOT +opensamlVersion=5.0.0 pac4JVersion=5.7.0 pac4jSpringSecurityVersion=9.0.0 seleneseRunnerVersion=4.3.0 shedlockVersion=5.2.0 -shibbolethVersion=5.0.0-SNAPSHOT -shibExtSpringExtensionsVersion=6.3.1-SNAPSHOT +shibbolethVersion=5.0.0 +shibExtSpringExtensionsVersion=6.2.0 shibOIDCVersion=2.1.0 -shibUtilitiesJavaSupportVersion=8.4.1-SNAPSHOT +shibUtilitiesJavaSupportVersion=8.1.0 spockVersion=2.3-groovy-4.0 springbootVersion=3.1.2 ## Used for testing deps, match spring security version used @@ -51,5 +51,5 @@ use.release.app.yml=false org.gradle.daemon=false ## NOTES -# pac4j spring security 7.0.3 here uses the pac4j 5.4.3 core, thus differences in versions (they used use the same versions, now -# keeping them in sync takes paying attention \ No newline at end of file +# pac4j spring security 7.0.3 here uses the pac4j 5.4.3 core, thus differences in versions (they used to use the same versions, now +# keeping them in sync takes paying attention) \ No newline at end of file diff --git a/pac4j-module/build.gradle b/pac4j-module/build.gradle index 002b507c7..70e420eb8 100644 --- a/pac4j-module/build.gradle +++ b/pac4j-module/build.gradle @@ -12,16 +12,11 @@ targetCompatibility = 17 bootJar.enabled = false repositories { - jcenter() mavenCentral() maven { url 'https://build.shibboleth.net/nexus/content/groups/public' artifactUrls = ['https://build.shibboleth.net/nexus/content/repositories/thirdparty-snapshots'] } - // TODO remove snapshots after the versions become final - maven { - url 'https://build.shibboleth.net/maven/snapshots' - } maven { // for the springboot plugin url "https://plugins.gradle.org/m2/" }