From e29ea47ff74ae7fa787cbdd5dc2fb76da15b311e Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Wed, 27 Sep 2023 15:42:42 -0300 Subject: [PATCH] Use Gradle's Version Catalog Issue gh-13868 --- .../continuous-integration-workflow.yml | 2 +- build.gradle | 12 +- buildSrc/build.gradle | 47 ++++--- buildSrc/settings.gradle | 7 + .../gradle/sagan/SaganCreateReleaseTask.java | 2 +- .../spring-security-dependencies.gradle | 133 ++++++++++-------- docs/spring-security-docs.gradle | 7 + gradle.properties | 5 - gradle/libs.versions.toml | 112 +++++++++++++++ ...ing-security-saml2-service-provider.gradle | 6 +- 10 files changed, 233 insertions(+), 100 deletions(-) create mode 100644 buildSrc/settings.gradle create mode 100644 gradle/libs.versions.toml diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 8ca59fb92c..8c451336d7 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -83,7 +83,7 @@ jobs: export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER" export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" - ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion='20+' -PspringDataVersion='Neumann-BUILD-SNAPSHOT' -PrsocketVersion=1.1.0-SNAPSHOT -PspringBootVersion=2.4.0-SNAPSHOT -PlocksDisabled --stacktrace + ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PspringVersion='5.+' -PreactorVersion='20+' -PspringDataVersion='Neumann-BUILD-SNAPSHOT' -PrsocketVersion=1.1.0-SNAPSHOT -PspringBootVersion=2.4.0-SNAPSHOT -PlocksDisabled --stacktrace check_samples: name: Check Samples project needs: [prerequisites] diff --git a/build.gradle b/build.gradle index 1a086bd96f..3cf2155704 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,11 @@ import trang.RncToXsd buildscript { dependencies { - classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion" - classpath 'io.spring.nohttp:nohttp-gradle:0.0.11' - classpath "io.freefair.gradle:aspectj-plugin:6.5.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath "com.netflix.nebula:nebula-project-plugin:8.2.0" + classpath libs.io.spring.javaformat.spring.javaformat.gradle.plugin + classpath libs.io.spring.nohttp.nohttp.gradle + classpath libs.io.freefair.gradle.aspectj.plugin + classpath libs.org.jetbrains.kotlin.kotlin.gradle.plugin + classpath libs.com.netflix.nebula.nebula.project.plugin } repositories { gradlePluginPortal() @@ -157,7 +157,7 @@ allprojects { pluginManager.withPlugin("io.spring.convention.checkstyle", { plugin -> configure(plugin) { dependencies { - checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:$springJavaformatVersion" + checkstyle libs.io.spring.javaformat.spring.javaformat.checkstyle } checkstyle { toolVersion = '8.34' diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index f006adca29..939846216a 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -79,34 +79,37 @@ configurations { } dependencies { - implementation 'com.google.code.gson:gson:2.8.6' - implementation 'com.thaiopensource:trang:20091111' - implementation 'net.sourceforge.saxon:saxon:9.1.0.8' - implementation 'org.yaml:snakeyaml:1.30' + implementation platform(libs.io.projectreactor.reactor.bom) + + implementation libs.com.google.code.gson.gson + implementation libs.com.thaiopensource.trag + implementation libs.net.sourceforge.saxon.saxon + implementation libs.org.yaml.snakeyaml implementation localGroovy() - implementation 'io.github.gradle-nexus:publish-plugin:1.1.0' - implementation 'io.projectreactor:reactor-core:3.5.0' - implementation 'org.gretty:gretty:3.0.9' - implementation 'com.apollographql.apollo:apollo-runtime:2.4.5' - implementation 'com.github.ben-manes:gradle-versions-plugin:0.38.0' - implementation 'com.github.spullara.mustache.java:compiler:0.9.4' - implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15' - implementation 'io.spring.nohttp:nohttp-gradle:0.0.11' - implementation 'net.sourceforge.htmlunit:htmlunit:2.37.0' - implementation 'org.hidetake:gradle-ssh-plugin:2.10.1' - implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0' - implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1' + implementation libs.io.github.gradle.nexus.publish.plugin + implementation 'io.projectreactor:reactor-core' + implementation libs.org.gretty.gretty + implementation libs.com.apollographql.apollo.apollo.runtime + implementation libs.com.github.ben.manes.gradle.versions.plugin + implementation libs.com.github.spullara.mustache.java.compiler + implementation libs.io.spring.javaformat.spring.javaformat.gradle.plugin + implementation libs.io.spring.nohttp.nohttp.gradle + implementation libs.net.sourceforge.htmlunit + implementation libs.org.hidetake.gradle.ssh.plugin + implementation libs.org.jfrog.buildinfo.build.info.extractor.gradle + implementation libs.org.sonarsource.scanner.gradle.sonarqube.gradle.plugin - testImplementation platform('org.junit:junit-bom:5.9.3') + testImplementation platform(libs.org.junit.junit.bom) + testImplementation platform(libs.org.mockito.mockito.bom) testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-params" testImplementation "org.junit.jupiter:junit-jupiter-engine" - testImplementation 'org.apache.commons:commons-io:1.3.2' - testImplementation 'org.assertj:assertj-core:3.13.2' - testImplementation 'org.mockito:mockito-core:3.12.4' - testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4' - testImplementation "com.squareup.okhttp3:mockwebserver:3.14.9" + testImplementation libs.org.apache.commons.commons.io + testImplementation libs.org.assertj.assertj.core + testImplementation 'org.mockito:mockito-core' + testImplementation 'org.mockito:mockito-junit-jupiter' + testImplementation libs.com.squareup.okhttp3.mockwebserver } diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle new file mode 100644 index 0000000000..0aba7326a4 --- /dev/null +++ b/buildSrc/settings.gradle @@ -0,0 +1,7 @@ +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files("../gradle/libs.versions.toml")) + } + } +} diff --git a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganCreateReleaseTask.java b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganCreateReleaseTask.java index 0d1262a980..2e6d33f405 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganCreateReleaseTask.java +++ b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganCreateReleaseTask.java @@ -19,13 +19,13 @@ package org.springframework.gradle.sagan; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.core.runtime.Assert; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.TaskAction; import org.springframework.gradle.github.user.GitHubUserApi; import org.springframework.gradle.github.user.User; +import org.springframework.util.Assert; public class SaganCreateReleaseTask extends DefaultTask { diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index a51a6c2e3e..93e2b285af 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -7,69 +7,78 @@ javaPlatform { } dependencies { - api platform("org.springframework:spring-framework-bom:$springFrameworkVersion") - api platform("io.projectreactor:reactor-bom:2020.0.35") - api platform("io.rsocket:rsocket-bom:1.1.4") - api platform("org.junit:junit-bom:5.9.3") - api platform("org.mockito:mockito-bom:4.8.1") - api platform("org.springframework.data:spring-data-bom:2021.2.15") - api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion") - api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4") - api platform("com.fasterxml.jackson:jackson-bom:2.13.5") + if (project.hasProperty("isOverrideVersionCatalog")) { + def springFrameworkVersion = project.property("springFrameworkVersion") + def reactorVersion = project.property("reactorVersion") + def springDataVersion = project.property("springDataVersion") + api platform("org.springframework:spring-framework-bom:$springFrameworkVersion") + api platform("io.projectreactor:reactor-bom:$reactorVersion") + api platform("org.springframework.data:spring-data-bom:$springDataVersion") + } else { + api platform(libs.org.springframework.spring.framework.bom) + api platform(libs.io.projectreactor.reactor.bom) + api platform(libs.org.springframework.data.spring.data.bom) + } + api platform(libs.io.rsocket.rsocket.bom) + api platform(libs.org.junit.junit.bom) + api platform(libs.org.mockito.mockito.bom) + api platform(libs.org.jetbrains.kotlin.kotlin.bom) + api platform(libs.org.jetbrains.kotlinx.kotlinx.coroutines.bom) + api platform(libs.com.fasterxml.jackson.jackson.bom) constraints { - api "ch.qos.logback:logback-classic:1.2.12" - api "com.google.inject:guice:3.0" - api "com.nimbusds:nimbus-jose-jwt:9.24.4" - api "com.nimbusds:oauth2-oidc-sdk:9.43.3" - api "com.squareup.okhttp3:mockwebserver:3.14.9" - api "com.squareup.okhttp3:okhttp:3.14.9" - api "com.unboundid:unboundid-ldapsdk:4.0.14" - api "commons-collections:commons-collections:3.2.2" - api "io.mockk:mockk:1.13.3" - api "io.projectreactor.tools:blockhound:1.0.8.RELEASE" - api "jakarta.inject:jakarta.inject-api:1.0.5" - api "jakarta.annotation:jakarta.annotation-api:1.3.5" - api "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7" - api "jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6" - api "jakarta.servlet:jakarta.servlet-api:4.0.4" - api "jakarta.transaction:jakarta.transaction-api:1.3.3" - api "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" - api "ldapsdk:ldapsdk:4.1" - api "net.sf.ehcache:ehcache:2.10.9.2" - api "net.sourceforge.htmlunit:htmlunit:2.65.1" - api "net.sourceforge.nekohtml:nekohtml:1.9.22" - api "org.apache.directory.server:apacheds-core-entry:1.5.5" - api "org.apache.directory.server:apacheds-core:1.5.5" - api "org.apache.directory.server:apacheds-protocol-ldap:1.5.5" - api "org.apache.directory.server:apacheds-protocol-shared:1.5.5" - api "org.apache.directory.server:apacheds-server-jndi:1.5.5" - api "org.apache.directory.shared:shared-ldap:0.9.15" - api "org.apache.httpcomponents:httpclient:4.5.14" - api "org.aspectj:aspectjrt:$aspectjVersion" - api "org.aspectj:aspectjweaver:$aspectjVersion" - api "org.assertj:assertj-core:3.23.1" - api "org.bouncycastle:bcpkix-jdk15on:1.70" - api "org.bouncycastle:bcprov-jdk15on:1.70" - api "org.eclipse.jetty:jetty-server:9.4.51.v20230217" - api "org.eclipse.jetty:jetty-servlet:9.4.51.v20230217" - api "org.eclipse.persistence:javax.persistence:2.2.1" - api "org.hamcrest:hamcrest:2.2" - api "org.hibernate:hibernate-entitymanager:5.6.15.Final" - api "org.hsqldb:hsqldb:2.7.2" - api "org.jasig.cas.client:cas-client-core:3.6.4" - api "org.openid4java:openid4java-nodeps:0.9.6" - api "org.opensaml:opensaml-core:$openSamlVersion" - api "org.opensaml:opensaml-saml-api:$openSamlVersion" - api "org.opensaml:opensaml-saml-impl:$openSamlVersion" - api "org.python:jython:2.5.3" - api "org.seleniumhq.selenium:htmlunit-driver:2.65.0" - api "org.seleniumhq.selenium:selenium-java:3.141.59" - api "org.seleniumhq.selenium:selenium-support:3.141.59" - api "org.skyscreamer:jsonassert:1.5.1" - api "org.slf4j:log4j-over-slf4j:1.7.36" - api "org.slf4j:slf4j-api:1.7.36" - api "org.springframework.ldap:spring-ldap-core:2.4.1" - api "org.synchronoss.cloud:nio-multipart-parser:1.1.0" + api libs.ch.qos.logback.logback.classic + api libs.com.google.inject.guice + api libs.com.nimbusds.nimbus.jose.jwt + api libs.com.nimbusds.oauth2.oidc.sdk + api libs.com.squareup.okhttp3.mockwebserver + api libs.com.squareup.okhttp3.okhttp + api libs.com.unboundid.unboundid.ldapsdk + api libs.commons.collections + api libs.io.mockk + api libs.io.projectreactor.tools.blockhound + api libs.jakarta.inject.jakarta.inject.api + api libs.jakarta.annotation.jakarta.annotation.api + api libs.jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl.api + api libs.jakarta.servlet.jsp.jakarta.servlet.jsp.api + api libs.jakarta.servlet.jakarta.servlet.api + api libs.jakarta.transaction.jakarta.transaction.api + api libs.jakarta.xml.bind.jakarta.xml.bind.api + api libs.ldapsdk + api libs.net.sf.ehcache + api libs.net.sourceforge.htmlunit + api libs.net.sourceforge.nekohtml + api libs.org.apache.directory.server.apacheds.entry + api libs.org.apache.directory.server.apacheds.core + api libs.org.apache.directory.server.apacheds.protocol.ldap + api libs.org.apache.directory.server.apacheds.protocol.shared + api libs.org.apache.directory.server.apacheds.server.jndi + api libs.org.apache.directory.shared.shared.ldap + api libs.org.apache.httpcomponents.httpclient + api libs.org.aspectj.aspectjrt + api libs.org.aspectj.aspectjweaver + api libs.org.assertj.assertj.core + api libs.org.bouncycastle.bcpkix.jdk15on + api libs.org.bouncycastle.bcprov.jdk15on + api libs.org.eclipse.jetty.jetty.server + api libs.org.eclipse.jetty.jetty.servlet + api libs.org.eclipse.persistence.javax.persistence + api libs.org.hamcrest + api libs.org.hibernate.hibernate.entitymanager + api libs.org.hsqldb + api libs.org.jasig.cas.client.cas.client.core + api libs.org.openid4java.openid4java.nodeps + api libs.org.opensaml.opensaml.core + api libs.org.opensaml.opensaml.saml.api + api libs.org.opensaml.opensaml.saml.impl + api libs.org.python.jython + api libs.org.seleniumhq.selenium.htmlunit.driver + api libs.org.seleniumhq.selenium.selenium.java + api libs.org.seleniumhq.selenium.selenium.support + api libs.org.skyscreamer.jsonassert + api libs.org.slf4j.log4j.over.slf4j + api libs.org.slf4j.slf4j.api + api libs.org.springframework.ldap.spring.ldap.core + api libs.org.synchronoss.cloud.nio.multipart.parser } } diff --git a/docs/spring-security-docs.gradle b/docs/spring-security-docs.gradle index a5ca6fa8cf..8b199c0850 100644 --- a/docs/spring-security-docs.gradle +++ b/docs/spring-security-docs.gradle @@ -31,6 +31,13 @@ dependencies { } def generateAttributes() { + def springFrameworkVersion = libs.org.springframework.spring.framework.bom.get().versionConstraint.displayName + springFrameworkVersion = springFrameworkVersion.contains("-") + ? springFrameworkVersion.substring(0, springFrameworkVersion.indexOf("-")) + : springFrameworkVersion + def springBootVersion = project.property("springBootVersion") + def samplesBranch = project.property("samplesBranch") + def docsTag = snapshotBuild ? 'current' : project.version def ghTag = snapshotBuild ? 'main' : project.version def ghUrl = "https://github.com/spring-projects/spring-security/tree/$ghTag" diff --git a/gradle.properties b/gradle.properties index 479d5d4197..b9d81c3df3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,5 @@ -aspectjVersion=1.9.20 -springJavaformatVersion=0.0.39 springBootVersion=2.7.12 -springFrameworkVersion=5.3.29 -openSamlVersion=3.4.6 version=5.8.8-SNAPSHOT -kotlinVersion=1.7.22 samplesBranch=5.8.x org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000..f24542cef1 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,112 @@ +[versions] +com-squareup-okhttp3 = "3.14.9" +io-r2dbc = "0.9.1.RELEASE" +io-rsocket = "1.1.4" +io-spring-javaformat = "0.0.39" +io-spring-nohttp = "0.0.11" +org-apache-directory-server = "1.5.5" +org-aspectj = "1.9.20" +org-bouncycastle = "1.70" +org-eclipse-jetty = "9.4.51.v20230217" +org-jetbrains-kotlin = "1.7.22" +org-jetbrains-kotlinx = "1.6.4" +org-junit-jupiter = "5.9.3" +org-mockito = "4.8.1" +org-opensaml4 = "4.1.0" +org-opensaml3 = "3.4.6" +org-slf4j = "1.7.36" +org-springframework = "5.3.29" + +[libraries] +ch-qos-logback-logback-classic = "ch.qos.logback:logback-classic:1.2.12" +com-fasterxml-jackson-jackson-bom = "com.fasterxml.jackson:jackson-bom:2.13.5" +com-google-inject-guice = "com.google.inject:guice:3.0" +com-netflix-nebula-nebula-project-plugin = "com.netflix.nebula:nebula-project-plugin:8.2.0" +com-nimbusds-nimbus-jose-jwt = "com.nimbusds:nimbus-jose-jwt:9.24.4" +com-nimbusds-oauth2-oidc-sdk = "com.nimbusds:oauth2-oidc-sdk:9.43.3" +com-squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" } +com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" } +com-unboundid-unboundid-ldapsdk = "com.unboundid:unboundid-ldapsdk:4.0.14" +commons-collections = "commons-collections:commons-collections:3.2.2" +io-freefair-gradle-aspectj-plugin = "io.freefair.gradle:aspectj-plugin:6.5.1" +io-mockk = "io.mockk:mockk:1.13.3" +io-projectreactor-netty-reactor-netty = "io.projectreactor.netty:reactor-netty:1.0.35" +io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2020.0.35" +io-projectreactor-tools-blockhound = "io.projectreactor.tools:blockhound:1.0.8.RELEASE" +io-r2dbc-r2dbc-h2 = { module = "io.r2dbc:r2dbc-h2", version.ref = "io-r2dbc" } +io-r2dbc-r2dbc-spi-test = { module = "io.r2dbc:r2dbc-spi-test", version.ref = "io-r2dbc" } +io-rsocket-rsocket-bom = { module = "io.rsocket:rsocket-bom", version.ref = "io-rsocket" } +io-spring-javaformat-spring-javaformat-checkstyle = { module = "io.spring.javaformat:spring-javaformat-checkstyle", version.ref = "io-spring-javaformat" } +io-spring-javaformat-spring-javaformat-gradle-plugin = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version.ref = "io-spring-javaformat" } +io-spring-nohttp-nohttp-checkstyle = { module = "io.spring.nohttp:nohttp-checkstyle", version.ref = "io-spring-nohttp" } +io-spring-nohttp-nohttp-gradle = { module = "io.spring.nohttp:nohttp-gradle", version.ref = "io-spring-nohttp" } +jakarta-annotation-jakarta-annotation-api = "jakarta.annotation:jakarta.annotation-api:1.3.5" +jakarta-inject-jakarta-inject-api = "jakarta.inject:jakarta.inject-api:1.0.5" +jakarta-servlet-jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:4.0.4" +jakarta-servlet-jsp-jakarta-servlet-jsp-api = "jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6" +jakarta-servlet-jsp-jstl-jakarta-servlet-jsp-jstl-api = "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7" +jakarta-transaction-jakarta-transaction-api = "jakarta.transaction:jakarta.transaction-api:1.3.3" +jakarta-xml-bind-jakarta-xml-bind-api = "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" +ldapsdk = "ldapsdk:ldapsdk:4.1" +net-sf-ehcache = "net.sf.ehcache:ehcache:2.10.9.2" +net-sourceforge-htmlunit = "net.sourceforge.htmlunit:htmlunit:2.65.1" +net-sourceforge-nekohtml = "net.sourceforge.nekohtml:nekohtml:1.9.22" +org-apache-directory-server-apacheds-core = { module = "org.apache.directory.server:apacheds-core", version.ref = "org-apache-directory-server" } +org-apache-directory-server-apacheds-entry = { module = "org.apache.directory.server:apacheds-core-entry", version.ref = "org-apache-directory-server" } +org-apache-directory-server-apacheds-protocol-ldap = { module = "org.apache.directory.server:apacheds-protocol-ldap", version.ref = "org-apache-directory-server" } +org-apache-directory-server-apacheds-protocol-shared = { module = "org.apache.directory.server:apacheds-protocol-shared", version.ref = "org-apache-directory-server" } +org-apache-directory-server-apacheds-server-jndi = { module = "org.apache.directory.server:apacheds-server-jndi", version.ref = "org-apache-directory-server" } +org-apache-directory-shared-shared-ldap = "org.apache.directory.shared:shared-ldap:0.9.15" +org-apache-httpcomponents-httpclient = "org.apache.httpcomponents:httpclient:4.5.14" +org-apache-logging-log4j-log4j-core = "org.apache.logging.log4j:log4j-core:2.17.1" +org-aspectj-aspectjrt = { module = "org.aspectj:aspectjrt", version.ref = "org-aspectj" } +org-aspectj-aspectjweaver = { module = "org.aspectj:aspectjweaver", version.ref = "org-aspectj" } +org-assertj-assertj-core = "org.assertj:assertj-core:3.23.1" +org-bouncycastle-bcpkix-jdk15on = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "org-bouncycastle" } +org-bouncycastle-bcprov-jdk15on = { module = "org.bouncycastle:bcprov-jdk15on", version.ref = "org-bouncycastle" } +org-eclipse-jetty-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "org-eclipse-jetty" } +org-eclipse-jetty-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "org-eclipse-jetty" } +org-eclipse-persistence-javax-persistence = "org.eclipse.persistence:javax.persistence:2.2.1" +org-hamcrest = "org.hamcrest:hamcrest:2.2" +org-hibernate-hibernate-entitymanager = "org.hibernate:hibernate-entitymanager:5.6.15.Final" +org-hsqldb = "org.hsqldb:hsqldb:2.7.2" +org-jasig-cas-client-cas-client-core = "org.jasig.cas.client:cas-client-core:3.6.4" +org-jetbrains-kotlin-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "org-jetbrains-kotlin" } +org-jetbrains-kotlin-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "org-jetbrains-kotlin" } +org-jetbrains-kotlinx-kotlinx-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "org-jetbrains-kotlinx" } +org-junit-junit-bom = "org.junit:junit-bom:5.9.3" +org-mockito-mockito-bom = { module = "org.mockito:mockito-bom", version.ref = "org-mockito" } +org-openid4java-openid4java-nodeps = "org.openid4java:openid4java-nodeps:0.9.6" +org-opensaml4-opensaml-core = { module = "org.opensaml:opensaml-core", version.ref = "org-opensaml4" } +org-opensaml4-opensaml-saml-api = { module = "org.opensaml:opensaml-saml-api", version.ref = "org-opensaml4" } +org-opensaml4-opensaml-saml-impl = { module = "org.opensaml:opensaml-saml-impl", version.ref = "org-opensaml4" } +org-opensaml-opensaml-core = { module = "org.opensaml:opensaml-core", version.ref = "org-opensaml3" } +org-opensaml-opensaml-saml-api = { module = "org.opensaml:opensaml-saml-api", version.ref = "org-opensaml3" } +org-opensaml-opensaml-saml-impl = { module = "org.opensaml:opensaml-saml-impl", version.ref = "org-opensaml3" } +org-python-jython = "org.python:jython:2.5.3" +org-seleniumhq-selenium-htmlunit-driver = "org.seleniumhq.selenium:htmlunit-driver:2.65.0" +org-seleniumhq-selenium-selenium-java = "org.seleniumhq.selenium:selenium-java:3.141.59" +org-seleniumhq-selenium-selenium-support = "org.seleniumhq.selenium:selenium-support:3.141.59" +org-skyscreamer-jsonassert = "org.skyscreamer:jsonassert:1.5.1" +org-slf4j-log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "org-slf4j" } +org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org-slf4j" } +org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2021.2.15" +org-springframework-ldap-spring-ldap-core = "org.springframework.ldap:spring-ldap-core:2.4.1" +org-springframework-spring-framework-bom = { module = "org.springframework:spring-framework-bom", version.ref = "org-springframework" } +org-synchronoss-cloud-nio-multipart-parser = "org.synchronoss.cloud:nio-multipart-parser:1.1.0" + +com-google-code-gson-gson = "com.google.code.gson:gson:2.8.6" +com-thaiopensource-trag = "com.thaiopensource:trang:20091111" +net-sourceforge-saxon-saxon = "net.sourceforge.saxon:saxon:9.1.0.8" +org-yaml-snakeyaml = "org.yaml:snakeyaml:1.30" +org-apache-commons-commons-io = "org.apache.commons:commons-io:1.3.2" +io-github-gradle-nexus-publish-plugin = "io.github.gradle-nexus:publish-plugin:1.1.0" +org-gretty-gretty = "org.gretty:gretty:3.0.9" +com-apollographql-apollo-apollo-runtime = "com.apollographql.apollo:apollo-runtime:2.4.5" +com-github-ben-manes-gradle-versions-plugin = "com.github.ben-manes:gradle-versions-plugin:0.38.0" +com-github-spullara-mustache-java-compiler = "com.github.spullara.mustache.java:compiler:0.9.4" +org-hidetake-gradle-ssh-plugin = "org.hidetake:gradle-ssh-plugin:2.10.1" +org-jfrog-buildinfo-build-info-extractor-gradle = "org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0" +org-sonarsource-scanner-gradle-sonarqube-gradle-plugin = "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1" + +[plugins] diff --git a/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle b/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle index c9cc0e6f68..e7b21edbfe 100644 --- a/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle +++ b/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle @@ -55,9 +55,9 @@ dependencies { api "org.opensaml:opensaml-core" api "org.opensaml:opensaml-saml-api" api "org.opensaml:opensaml-saml-impl" - opensaml4MainImplementation "org.opensaml:opensaml-core:4.1.0" - opensaml4MainImplementation "org.opensaml:opensaml-saml-api:4.1.0" - opensaml4MainImplementation "org.opensaml:opensaml-saml-impl:4.1.0" + opensaml4MainImplementation libs.org.opensaml4.opensaml.core + opensaml4MainImplementation libs.org.opensaml4.opensaml.saml.api + opensaml4MainImplementation libs.org.opensaml4.opensaml.saml.impl provided 'jakarta.servlet:jakarta.servlet-api'