From f73f213f50e10874c20fa071943be1b2d929712a Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 12 Jul 2021 13:06:44 -0500 Subject: [PATCH] Remove DependencySetPlugin Closes gh-10070 --- acl/spring-security-acl.gradle | 8 +- aspects/spring-security-aspects.gradle | 7 + .../AbstractSpringJavaPlugin.groovy | 1 - .../convention/DependencySetPlugin.groovy | 107 --- ...pring.convention.dependency-set.properties | 1 - .../convention/DependencySetPluginITest.java | 31 - .../gradle/convention/ShowcaseITest.java | 1 - .../samples/dependencyset/build.gradle | 20 - .../gradle/dependency-management.gradle | 722 ------------------ .../showcase/sgbcs-api/sgbcs-api.gradle | 3 +- .../sgbcs-api/src/test/java/api/ApiTest.java | 2 +- .../showcase/sgbcs-core/sgbcs-core.gradle | 3 +- .../src/test/java/core/CoreClassTest.java | 2 +- .../src/test/java/core/HasOptionalTest.java | 2 +- cas/spring-security-cas.gradle | 7 + config/spring-security-config.gradle | 14 +- core/spring-security-core.gradle | 8 +- crypto/spring-security-crypto.gradle | 8 + data/spring-security-data.gradle | 8 + .../manual/spring-security-docs-manual.gradle | 1 - .../spring-security-itest-context.gradle | 7 + ...test-ldap-embedded-apacheds-default.gradle | 14 +- ...y-itest-ldap-embedded-mode-apacheds.gradle | 14 +- ...-itest-ldap-embedded-mode-unboundid.gradle | 7 + ...g-security-itest-ldap-embedded-none.gradle | 8 + ...est-ldap-embedded-unboundid-default.gradle | 7 + itest/web/spring-security-itest-web.gradle | 7 + ldap/spring-security-ldap.gradle | 14 +- messaging/spring-security-messaging.gradle | 13 +- .../spring-security-oauth2-client.gradle | 10 +- .../spring-security-oauth2-core.gradle | 10 +- .../spring-security-oauth2-jose.gradle | 10 +- ...ing-security-oauth2-resource-server.gradle | 9 +- openid/spring-security-openid.gradle | 8 + remoting/spring-security-remoting.gradle | 7 + rsocket/spring-security-rsocket.gradle | 7 + ...ing-security-saml2-service-provider.gradle | 7 + taglibs/spring-security-taglibs.gradle | 8 + test/spring-security-test.gradle | 8 +- web/spring-security-web.gradle | 9 +- 40 files changed, 233 insertions(+), 907 deletions(-) delete mode 100644 buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy delete mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.dependency-set.properties delete mode 100644 buildSrc/src/test/java/io/spring/gradle/convention/DependencySetPluginITest.java delete mode 100644 buildSrc/src/test/resources/samples/dependencyset/build.gradle delete mode 100644 buildSrc/src/test/resources/samples/dependencyset/gradle/dependency-management.gradle diff --git a/acl/spring-security-acl.gradle b/acl/spring-security-acl.gradle index 27dc016aaf..8de65558b8 100644 --- a/acl/spring-security-acl.gradle +++ b/acl/spring-security-acl.gradle @@ -11,9 +11,15 @@ dependencies { optional 'net.sf.ehcache:ehcache' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" testImplementation 'org.springframework:spring-beans' testImplementation 'org.springframework:spring-context-support' - testImplementation 'org.springframework:spring-test' + testImplementation "org.springframework:spring-test" testRuntimeOnly 'org.hsqldb:hsqldb' } diff --git a/aspects/spring-security-aspects.gradle b/aspects/spring-security-aspects.gradle index d66ebe447c..3a58595619 100644 --- a/aspects/spring-security-aspects.gradle +++ b/aspects/spring-security-aspects.gradle @@ -10,6 +10,13 @@ dependencies { api 'org.springframework:spring-core' testImplementation 'org.springframework:spring-aop' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" testAspect sourceSets.main.output } diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy index 58028b4de3..fe6eac2899 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy @@ -57,7 +57,6 @@ public abstract class AbstractSpringJavaPlugin implements Plugin { } pluginManager.apply("io.spring.convention.tests-configuration"); pluginManager.apply("io.spring.convention.integration-test"); - pluginManager.apply("io.spring.convention.dependency-set"); pluginManager.apply("io.spring.convention.javadoc-options"); pluginManager.apply("io.spring.convention.checkstyle"); pluginManager.apply(CopyPropertiesPlugin); diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy deleted file mode 100644 index 3f650936bb..0000000000 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package io.spring.gradle.convention; - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.plugins.JavaPlugin - -/** - * Adds sets of dependencies to make it easy to add a grouping of dependencies. The - * dependencies added are: - * - * - * - * @author Rob Winch - */ -public class DependencySetPlugin implements Plugin { - @Override - public void apply(Project project) { - - project.ext.spockDependencies = [ - project.dependencies.create("org.spockframework:spock-spring") { - exclude group: 'junit', module: 'junit-dep' - }, - project.dependencies.create("org.spockframework:spock-core") { - exclude group: 'junit', module: 'junit-dep' - } - ] - - project.ext.seleniumDependencies = [ - "org.seleniumhq.selenium:htmlunit-driver", - "org.seleniumhq.selenium:selenium-support" - ] - - project.ext.gebDependencies = project.spockDependencies + - project.seleniumDependencies + [ - "org.gebish:geb-spock", - 'commons-httpclient:commons-httpclient', - "org.codehaus.groovy:groovy", - "org.codehaus.groovy:groovy-all" - ] - - project.ext.slf4jDependencies = [ - "org.slf4j:slf4j-api", - "org.slf4j:jcl-over-slf4j", - "org.slf4j:log4j-over-slf4j", - "ch.qos.logback:logback-classic" - ] - - project.ext.springCoreDependency = [ - project.dependencies.create("org.springframework:spring-core") { - exclude(group: 'commons-logging', module: 'commons-logging') - } - ] - - project.ext.testDependencies = [ - "org.mockito:mockito-core", - "org.springframework:spring-test", - "org.assertj:assertj-core", - "org.junit.jupiter:junit-jupiter-api", - "org.junit.jupiter:junit-jupiter-params", - "org.junit.jupiter:junit-jupiter-engine", - "org.mockito:mockito-core", - "org.mockito:mockito-junit-jupiter" - ] - - project.ext.jstlDependencies = [ - "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api", - "org.apache.taglibs:taglibs-standard-jstlel" - ] - - project.ext.apachedsDependencies = [ - "org.apache.directory.server:apacheds-core", - "org.apache.directory.server:apacheds-core-entry", - "org.apache.directory.server:apacheds-protocol-shared", - "org.apache.directory.server:apacheds-protocol-ldap", - "org.apache.directory.server:apacheds-server-jndi", - 'org.apache.directory.shared:shared-ldap' - ] - - project.plugins.withType(JavaPlugin) { - project.dependencies { - testImplementation project.testDependencies - } - } - } -} diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.dependency-set.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.dependency-set.properties deleted file mode 100644 index 497ecd5908..0000000000 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.dependency-set.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=io.spring.gradle.convention.DependencySetPlugin \ No newline at end of file diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/DependencySetPluginITest.java b/buildSrc/src/test/java/io/spring/gradle/convention/DependencySetPluginITest.java deleted file mode 100644 index b5d664b6fd..0000000000 --- a/buildSrc/src/test/java/io/spring/gradle/convention/DependencySetPluginITest.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.spring.gradle.convention; - -import io.spring.gradle.TestKit; -import org.gradle.testkit.runner.BuildResult; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; - -import java.nio.file.Path; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.gradle.testkit.runner.TaskOutcome.SUCCESS; - -public class DependencySetPluginITest { - private TestKit testKit; - - @BeforeEach - void setup(@TempDir Path tempDir) { - this.testKit = new TestKit(tempDir.toFile()); - } - - @Test - public void dependencies() throws Exception { - BuildResult result = testKit.withProjectResource("samples/dependencyset") - .withArguments("dependencies") - .build(); - - assertThat(result.task(":dependencies").getOutcome()).isEqualTo(SUCCESS); - assertThat(result.getOutput()).doesNotContain("FAILED"); - } -} diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITest.java b/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITest.java index 01c8fdbffe..469b190ec5 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITest.java +++ b/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITest.java @@ -1,7 +1,6 @@ package io.spring.gradle.convention; import io.spring.gradle.TestKit; -import org.codehaus.groovy.runtime.ResourceGroovyMethods; import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.TaskOutcome; import org.junit.jupiter.api.BeforeEach; diff --git a/buildSrc/src/test/resources/samples/dependencyset/build.gradle b/buildSrc/src/test/resources/samples/dependencyset/build.gradle deleted file mode 100644 index 2ea87e437e..0000000000 --- a/buildSrc/src/test/resources/samples/dependencyset/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -plugins { - id 'io.spring.convention.dependency-set' -} - -apply plugin: 'java' -apply from: "$rootDir/gradle/dependency-management.gradle" - -repositories { - mavenCentral() -} - -dependencies { - testCompile spockDependencies - testCompile gebDependencies - testCompile seleniumDependencies - testCompile slf4jDependencies - testCompile springCoreDependency - testCompile jstlDependencies - testCompile apachedsDependencies -} diff --git a/buildSrc/src/test/resources/samples/dependencyset/gradle/dependency-management.gradle b/buildSrc/src/test/resources/samples/dependencyset/gradle/dependency-management.gradle deleted file mode 100644 index 5649597c09..0000000000 --- a/buildSrc/src/test/resources/samples/dependencyset/gradle/dependency-management.gradle +++ /dev/null @@ -1,722 +0,0 @@ -// we use this to mock dependency management plugin - -def deps = [ - "antlr:antlr" : "2.7.7", - "aopalliance:aopalliance" : "1.0", - "biz.paluch.redis:lettuce" : "5.0.0.Beta1", - "ch.qos.logback:logback-access" : "1.1.9", - "ch.qos.logback:logback-classic" : "1.1.9", - "ch.qos.logback:logback-core" : "1.1.9", - "com.atomikos:transactions-jdbc" : "3.9.3", - "com.atomikos:transactions-jms" : "3.9.3", - "com.atomikos:transactions-jta" : "3.9.3", - "com.caucho:hessian" : "4.0.38", - "com.couchbase.client:couchbase-spring-cache" : "2.1.0", - "com.couchbase.client:java-client" : "2.3.7", - "com.datastax.cassandra:cassandra-driver-core" : "3.1.3", - "com.datastax.cassandra:cassandra-driver-mapping" : "3.1.3", - "com.esotericsoftware:kryo" : "3.0.3", - "com.esotericsoftware:kryo-shaded" : "3.0.3", - "com.fasterxml:classmate" : "1.3.3", - "com.fasterxml.jackson.core:jackson-annotations" : "2.8.0", - "com.fasterxml.jackson.core:jackson-core" : "2.8.6", - "com.fasterxml.jackson.core:jackson-databind" : "2.8.6", - "com.fasterxml.jackson.dataformat:jackson-dataformat-avro" : "2.8.6", - "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor" : "2.8.6", - "com.fasterxml.jackson.dataformat:jackson-dataformat-csv" : "2.8.6", - "com.fasterxml.jackson.dataformat:jackson-dataformat-properties" : "2.8.6", - "com.fasterxml.jackson.dataformat:jackson-dataformat-protobuf" : "2.8.6", - "com.fasterxml.jackson.dataformat:jackson-dataformat-smile" : "2.8.6", - "com.fasterxml.jackson.dataformat:jackson-dataformat-xml" : "2.8.6", - "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-guava" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-hibernate3" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-hibernate4" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-hppc" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-jaxrs" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-jdk8" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-joda" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-json-org" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-jsr353" : "2.8.6", - "com.fasterxml.jackson.datatype:jackson-datatype-pcollections" : "2.8.6", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base" : "2.8.6", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider" : "2.8.6", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider" : "2.8.6", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-smile-provider" : "2.8.6", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider" : "2.8.6", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider" : "2.8.6", - "com.fasterxml.jackson.jr:jackson-jr-all" : "2.8.6", - "com.fasterxml.jackson.jr:jackson-jr-objects" : "2.8.6", - "com.fasterxml.jackson.jr:jackson-jr-retrofit2" : "2.8.6", - "com.fasterxml.jackson.jr:jackson-jr-stree" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-afterburner" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-guice" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-jaxb-annotations" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-jsonSchema" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-kotlin" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-mrbean" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-osgi" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-parameter-names" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-paranamer" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-scala_2.10" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-scala_2.11" : "2.8.6", - "com.fasterxml.jackson.module:jackson-module-scala_2.12" : "2.8.6", - "com.gemstone.gemfire:gemfire" : "8.2.0", - "com.github.ben-manes.caffeine:caffeine" : "2.3.5", - "com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute" : "1.3", - "com.github.spullara.redis:client" : "0.7", - "com.goldmansachs:gs-collections" : "5.1.0", - "com.google.appengine:appengine-api-1.0-sdk" : "1.9.48", - "com.google.code.findbugs:annotations" : "2.0.3", - "com.google.code.findbugs:jsr305" : "3.0.1", - "com.google.code.gson:gson" : "2.8.0", - "com.google.code.typica:typica" : "1.3", - "com.google.guava:guava" : "20.0", - "com.google.inject:guice" : "3.0", - "com.google.protobuf:protobuf-java" : "2.6.1", - "com.googlecode.json-simple:json-simple" : "1.1.1", - "com.googlecode.protobuf-java-format:protobuf-java-format" : "1.4", - "com.h2database:h2" : "1.4.193", - "com.hazelcast:hazelcast" : "3.7.5", - "com.hazelcast:hazelcast-client" : "3.7.5", - "com.hazelcast:hazelcast-hibernate4" : "3.7.1", - "com.hazelcast:hazelcast-hibernate5" : "1.1.3", - "com.hazelcast:hazelcast-spring" : "3.7.5", - "com.ibm.jbatch:com.ibm.jbatch-tck-spi" : "1.0", - "com.ibm.websphere:uow" : "6.0.2.17", - "com.jamonapi:jamon" : "2.81", - "com.jayway.jsonpath:json-path" : "2.2.0", - "com.jayway.jsonpath:json-path-assert" : "2.2.0", - "com.jayway.restassured:rest-assured" : "2.9.0", - "com.jcraft:jsch" : "0.1.54", - "com.lowagie:itext" : "2.1.7", - "com.maxmind.geoip2:geoip2" : "2.3.1", - "com.mchange:c3p0" : "0.9.5.2", - "com.microsoft.sqlserver:mssql-jdbc" : "6.1.0.jre7", - "com.querydsl:querydsl-apt" : "4.1.4", - "com.querydsl:querydsl-collections" : "4.1.4", - "com.querydsl:querydsl-core" : "4.1.4", - "com.querydsl:querydsl-jpa" : "4.1.4", - "com.querydsl:querydsl-mongodb" : "4.1.4", - "com.rabbitmq:amqp-client" : "4.0.2", - "com.rabbitmq:http-client" : "1.1.0.RELEASE", - "com.rometools:rome" : "1.6.1", - "com.rometools:rome-fetcher" : "1.6.1", - "com.samskivert:jmustache" : "1.13", - "com.sendgrid:sendgrid-java" : "2.2.2", - "com.splunk:splunk" : "1.3.0", - "com.squareup.okhttp:okhttp" : "2.7.5", - "com.squareup.okhttp3:okhttp" : "3.6.0", - "com.sun:ldapbp" : "1.0", - "com.sun.facelets:jsf-facelets" : "1.1.14", - "com.sun.faces:jsf-api" : "2.2.14", - "com.sun.faces:jsf-impl" : "2.2.14", - "com.sun.mail:imap" : "1.5.6", - "com.sun.mail:javax.mail" : "1.5.6", - "com.sun.xml.messaging.saaj:saaj-impl" : "1.3.28", - "com.sun.xml.wss:xws-security" : "3.0", - "com.thoughtworks.xstream:xstream" : "1.4.9", - "com.timgroup:java-statsd-client" : "3.1.0", - "com.unboundid:unboundid-ldapsdk" : "3.2.0", - "com.zaxxer:HikariCP" : "2.5.1", - "com.zaxxer:HikariCP-java6" : "2.3.13", - "commons-beanutils:commons-beanutils" : "1.9.3", - "commons-cli:commons-cli" : "1.3.1", - "commons-codec:commons-codec" : "1.10", - "commons-collections:commons-collections" : "3.2.2", - "commons-dbcp:commons-dbcp" : "1.4", - "commons-digester:commons-digester" : "2.1", - "commons-fileupload:commons-fileupload" : "1.3.2", - "commons-httpclient:commons-httpclient" : "3.1", - "commons-io:commons-io" : "2.5", - "commons-lang:commons-lang" : "2.6", - "commons-logging:commons-logging" : "1.2", - "commons-net:commons-net" : "3.5", - "commons-pool:commons-pool" : "1.6", - "de.flapdoodle.embed:de.flapdoodle.embed.mongo" : "1.50.5", - "dom4j:dom4j" : "1.6.1", - "edu.umd.cs.mtc:multithreadedtc" : "1.01", - "io.dropwizard.metrics:metrics-core" : "3.1.2", - "io.dropwizard.metrics:metrics-ganglia" : "3.1.2", - "io.dropwizard.metrics:metrics-graphite" : "3.1.2", - "io.dropwizard.metrics:metrics-servlets" : "3.1.2", - "io.fastjson:boon" : "0.34", - "io.javaslang:javaslang" : "2.0.5", - "io.javaslang:javaslang-match" : "2.0.5", - "io.netty:netty-all" : "4.0.44.Final", - "io.projectreactor:reactor-bus" : "2.0.8.RELEASE", - "io.projectreactor:reactor-core" : "2.0.8.RELEASE", - "io.projectreactor:reactor-groovy" : "2.0.8.RELEASE", - "io.projectreactor:reactor-groovy-extensions" : "2.0.8.RELEASE", - "io.projectreactor:reactor-logback" : "2.0.8.RELEASE", - "io.projectreactor:reactor-net" : "2.0.8.RELEASE", - "io.projectreactor:reactor-stream" : "2.0.8.RELEASE", - "io.projectreactor.spring:reactor-spring-context" : "2.0.7.RELEASE", - "io.projectreactor.spring:reactor-spring-core" : "2.0.7.RELEASE", - "io.projectreactor.spring:reactor-spring-messaging" : "2.0.7.RELEASE", - "io.projectreactor.spring:reactor-spring-webmvc" : "2.0.7.RELEASE", - "io.searchbox:jest" : "2.0.4", - "io.undertow:undertow-core" : "1.4.8.Final", - "io.undertow:undertow-servlet" : "1.4.8.Final", - "io.undertow:undertow-websockets-jsr" : "1.4.8.Final", - "javax.activation:activation" : "1.1.1", - "javax.annotation:jsr250-api" : "1.0", - "javax.batch:javax.batch-api" : "1.0.1", - "javax.cache:cache-api" : "1.0.0", - "javax.ejb:javax.ejb-api" : "3.2", - "javax.el:javax.el-api" : "2.2.5", - "javax.enterprise:cdi-api" : "1.2", - "javax.enterprise.concurrent:javax.enterprise.concurrent-api" : "1.0", - "javax.faces:javax.faces-api" : "2.2", - "javax.inject:javax.inject" : "1", - "javax.interceptor:javax.interceptor-api" : "1.2", - "javax.jdo:jdo-api" : "3.0.1", - "javax.jms:jms-api" : "1.1-rev-1", - "javax.mail:javax.mail-api" : "1.5.6", - "javax.money:money-api" : "1.0.1", - "javax.portlet:portlet-api" : "2.0", - "javax.resource:connector-api" : "1.5", - "javax.servlet:javax.servlet-api" : "3.1.0", - "javax.servlet:jstl" : "1.2", - "javax.servlet.jsp:javax.servlet.jsp-api" : "2.3.1", - "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" : "1.2.1", - "javax.transaction:javax.transaction-api" : "1.2", - "javax.validation:validation-api" : "1.1.0.Final", - "javax.websocket:javax.websocket-api" : "1.1", - "javax.ws.rs:javax.ws.rs-api" : "2.0.1", - "jaxen:jaxen" : "1.1.6", - "jline:jline" : "2.14.3", - "joda-time:joda-time" : "2.9.7", - "junit:junit" : "4.12", - "ldapsdk:ldapsdk" : "4.1", - "log4j:log4j" : "1.2.17", - "mysql:mysql-connector-java" : "5.1.40", - "net.java.dev.jna:jna" : "4.2.2", - "net.openhft:chronicle" : "3.4.4", - "net.openhft:lang" : "6.6.16", - "net.sf.ehcache:ehcache" : "2.10.3", - "net.sf.jasperreports:jasperreports" : "6.4.0", - "net.sf.jopt-simple:jopt-simple" : "5.0.3", - "net.sourceforge.htmlunit:htmlunit" : "2.21", - "net.sourceforge.jexcelapi:jxl" : "2.6.12", - "net.sourceforge.jtds:jtds" : "1.3.1", - "net.sourceforge.nekohtml:nekohtml" : "1.9.22", - "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" : "1.4.0", - "opensymphony:ognl" : "2.6.11", - "org.apache.activemq:activemq-amqp" : "5.14.3", - "org.apache.activemq:activemq-blueprint" : "5.14.3", - "org.apache.activemq:activemq-broker" : "5.14.3", - "org.apache.activemq:activemq-camel" : "5.14.3", - "org.apache.activemq:activemq-client" : "5.14.3", - "org.apache.activemq:activemq-console" : "5.14.3", - "org.apache.activemq:activemq-http" : "5.14.3", - "org.apache.activemq:activemq-jaas" : "5.14.3", - "org.apache.activemq:activemq-jdbc-store" : "5.14.3", - "org.apache.activemq:activemq-jms-pool" : "5.14.3", - "org.apache.activemq:activemq-kahadb-store" : "5.14.3", - "org.apache.activemq:activemq-karaf" : "5.14.3", - "org.apache.activemq:activemq-leveldb-store" : "5.14.3", - "org.apache.activemq:activemq-log4j-appender" : "5.14.3", - "org.apache.activemq:activemq-mqtt" : "5.14.3", - "org.apache.activemq:activemq-openwire-generator" : "5.14.3", - "org.apache.activemq:activemq-openwire-legacy" : "5.14.3", - "org.apache.activemq:activemq-osgi" : "5.14.3", - "org.apache.activemq:activemq-partition" : "5.14.3", - "org.apache.activemq:activemq-pool" : "5.14.3", - "org.apache.activemq:activemq-ra" : "5.14.3", - "org.apache.activemq:activemq-run" : "5.14.3", - "org.apache.activemq:activemq-runtime-config" : "5.14.3", - "org.apache.activemq:activemq-shiro" : "5.14.3", - "org.apache.activemq:activemq-spring" : "5.14.3", - "org.apache.activemq:activemq-stomp" : "5.14.3", - "org.apache.activemq:activemq-web" : "5.14.3", - "org.apache.activemq:artemis-amqp-protocol" : "1.5.2", - "org.apache.activemq:artemis-commons" : "1.5.2", - "org.apache.activemq:artemis-core-client" : "1.5.2", - "org.apache.activemq:artemis-jms-client" : "1.5.2", - "org.apache.activemq:artemis-jms-server" : "1.5.2", - "org.apache.activemq:artemis-journal" : "1.5.2", - "org.apache.activemq:artemis-native" : "1.5.2", - "org.apache.activemq:artemis-selector" : "1.5.2", - "org.apache.activemq:artemis-server" : "1.5.2", - "org.apache.activemq:artemis-service-extensions" : "1.5.2", - "org.apache.commons:commons-dbcp2" : "2.1.1", - "org.apache.commons:commons-lang3" : "3.5", - "org.apache.commons:commons-pool2" : "2.4.2", - "org.apache.curator:curator-recipes" : "2.11.1", - "org.apache.derby:derby" : "10.13.1.1", - "org.apache.derby:derbyclient" : "10.13.1.1", - "org.apache.directory.server:apacheds-core" : "1.5.5", - "org.apache.directory.server:apacheds-core-entry" : "1.5.5", - "org.apache.directory.server:apacheds-protocol-ldap" : "1.5.5", - "org.apache.directory.server:apacheds-protocol-shared" : "1.5.5", - "org.apache.directory.server:apacheds-server-jndi" : "1.5.5", - "org.apache.directory.shared:shared-ldap" : "0.9.15", - "org.apache.httpcomponents:httpasyncclient" : "4.1.2", - "org.apache.httpcomponents:httpclient" : "4.5.2", - "org.apache.httpcomponents:httpcore" : "4.4.6", - "org.apache.httpcomponents:httpmime" : "4.5.2", - "org.apache.ibatis:ibatis-sqlmap" : "2.3.4.726", - "org.apache.kafka:kafka-clients" : "0.10.1.1", - "org.apache.kafka:kafka_2.11" : "0.10.1.1", - "org.apache.logging.log4j:log4j-1.2-api" : "2.7", - "org.apache.logging.log4j:log4j-api" : "2.7", - "org.apache.logging.log4j:log4j-api-scala_2.10" : "2.7", - "org.apache.logging.log4j:log4j-api-scala_2.11" : "2.7", - "org.apache.logging.log4j:log4j-core" : "2.7", - "org.apache.logging.log4j:log4j-flume-ng" : "2.7", - "org.apache.logging.log4j:log4j-iostreams" : "2.7", - "org.apache.logging.log4j:log4j-jcl" : "2.7", - "org.apache.logging.log4j:log4j-jmx-gui" : "2.7", - "org.apache.logging.log4j:log4j-jul" : "2.7", - "org.apache.logging.log4j:log4j-liquibase" : "2.7", - "org.apache.logging.log4j:log4j-nosql" : "2.7", - "org.apache.logging.log4j:log4j-slf4j-impl" : "2.7", - "org.apache.logging.log4j:log4j-taglib" : "2.7", - "org.apache.logging.log4j:log4j-web" : "2.7", - "org.apache.myfaces.core:myfaces-impl" : "2.2.11", - "org.apache.openjpa:openjpa" : "2.4.2", - "org.apache.openjpa:openjpa-persistence-jdbc" : "2.4.2", - "org.apache.poi:poi" : "3.15", - "org.apache.poi:poi-ooxml" : "3.15", - "org.apache.poi:poi-scratchpad" : "3.15", - "org.apache.solr:solr-core" : "5.5.3", - "org.apache.solr:solr-solrj" : "5.5.3", - "org.apache.taglibs:taglibs-standard-impl" : "1.2.5", - "org.apache.taglibs:taglibs-standard-jstlel" : "1.2.5", - "org.apache.taglibs:taglibs-standard-spec" : "1.2.5", - "org.apache.tiles:tiles-api" : "3.0.7", - "org.apache.tiles:tiles-core" : "3.0.7", - "org.apache.tiles:tiles-el" : "3.0.7", - "org.apache.tiles:tiles-extras" : "3.0.7", - "org.apache.tiles:tiles-jsp" : "3.0.7", - "org.apache.tiles:tiles-request-api" : "1.0.6", - "org.apache.tiles:tiles-servlet" : "3.0.7", - "org.apache.tomcat:tomcat-catalina" : "8.5.11", - "org.apache.tomcat:tomcat-dbcp" : "8.5.11", - "org.apache.tomcat:tomcat-jdbc" : "8.5.11", - "org.apache.tomcat:tomcat-jsp-api" : "8.5.11", - "org.apache.tomcat:tomcat-websocket" : "8.5.11", - "org.apache.tomcat.embed:tomcat-embed-core" : "8.5.11", - "org.apache.tomcat.embed:tomcat-embed-el" : "8.5.11", - "org.apache.tomcat.embed:tomcat-embed-jasper" : "8.5.11", - "org.apache.tomcat.embed:tomcat-embed-websocket" : "8.5.11", - "org.apache.velocity:velocity" : "1.7", - "org.apache.ws.commons.axiom:axiom-api" : "1.2.20", - "org.apache.ws.commons.axiom:axiom-impl" : "1.2.20", - "org.apache.ws.security:wss4j" : "1.6.19", - "org.apache.ws.xmlschema:xmlschema-core" : "2.2.1", - "org.apache.wss4j:wss4j-ws-security-common" : "2.1.8", - "org.apache.wss4j:wss4j-ws-security-dom" : "2.1.8", - "org.apache.xmlbeans:xmlbeans" : "2.6.0", - "org.aspectj:aspectjrt" : "1.8.9", - "org.aspectj:aspectjtools" : "1.8.9", - "org.aspectj:aspectjweaver" : "1.8.9", - "org.assertj:assertj-core" : "2.6.0", - "org.atteo:evo-inflector" : "1.2.2", - "org.beanshell:bsh" : "2.0b4", - "org.bouncycastle:bcpkix-jdk15on" : "1.56", - "org.codehaus.btm:btm" : "2.1.4", - "org.codehaus.castor:castor-xml" : "1.4.1", - "org.codehaus.fabric3.api:commonj" : "1.1.1", - "org.codehaus.groovy:groovy" : "2.4.7", - "org.codehaus.groovy:groovy-all" : "2.4.7", - "org.codehaus.groovy:groovy-ant" : "2.4.7", - "org.codehaus.groovy:groovy-bsf" : "2.4.7", - "org.codehaus.groovy:groovy-console" : "2.4.7", - "org.codehaus.groovy:groovy-docgenerator" : "2.4.7", - "org.codehaus.groovy:groovy-groovydoc" : "2.4.7", - "org.codehaus.groovy:groovy-groovysh" : "2.4.7", - "org.codehaus.groovy:groovy-jmx" : "2.4.7", - "org.codehaus.groovy:groovy-json" : "2.4.7", - "org.codehaus.groovy:groovy-jsr223" : "2.4.7", - "org.codehaus.groovy:groovy-nio" : "2.4.7", - "org.codehaus.groovy:groovy-servlet" : "2.4.7", - "org.codehaus.groovy:groovy-sql" : "2.4.7", - "org.codehaus.groovy:groovy-swing" : "2.4.7", - "org.codehaus.groovy:groovy-templates" : "2.4.7", - "org.codehaus.groovy:groovy-test" : "2.4.7", - "org.codehaus.groovy:groovy-testng" : "2.4.7", - "org.codehaus.groovy:groovy-xml" : "2.4.7", - "org.codehaus.jackson:jackson-core-asl" : "1.9.13", - "org.codehaus.jackson:jackson-mapper-asl" : "1.9.13", - "org.codehaus.janino:janino" : "2.7.8", - "org.codehaus.jettison:jettison" : "1.2", - "org.codehaus.woodstox:woodstox-core-asl" : "4.4.1", - "org.crashub:crash.cli" : "1.3.2", - "org.crashub:crash.connectors.ssh" : "1.3.2", - "org.crashub:crash.connectors.telnet" : "1.3.2", - "org.crashub:crash.embed.spring" : "1.3.2", - "org.crashub:crash.plugins.cron" : "1.3.2", - "org.crashub:crash.plugins.mail" : "1.3.2", - "org.crashub:crash.shell" : "1.3.2", - "org.eclipse.jetty:apache-jsp" : "9.4.1.v20170120", - "org.eclipse.jetty:apache-jstl" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-annotations" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-client" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-continuation" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-deploy" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-http" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-io" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-jmx" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-plus" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-proxy" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-security" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-server" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-servlet" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-servlets" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-util" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-webapp" : "9.4.1.v20170120", - "org.eclipse.jetty:jetty-xml" : "9.4.1.v20170120", - "org.eclipse.jetty.orbit:javax.servlet.jsp" : "2.2.0.v201112011158", - "org.eclipse.jetty.websocket:javax-websocket-server-impl" : "9.4.1.v20170120", - "org.eclipse.jetty.websocket:websocket-client" : "9.4.1.v20170120", - "org.eclipse.jetty.websocket:websocket-server" : "9.4.1.v20170120", - "org.eclipse.paho:org.eclipse.paho.client.mqttv3" : "1.1.0", - "org.eclipse.persistence:javax.persistence" : "2.1.1", - "org.eclipse.persistence:org.eclipse.persistence.core" : "2.6.4", - "org.eclipse.persistence:org.eclipse.persistence.jpa" : "2.6.4", - "org.ehcache:ehcache" : "3.2.0", - "org.ehcache:ehcache-clustered" : "3.2.0", - "org.ehcache:ehcache-transactions" : "3.2.0", - "org.elasticsearch:elasticsearch" : "2.4.4", - "org.firebirdsql.jdbc:jaybird-jdk16" : "2.2.12", - "org.firebirdsql.jdbc:jaybird-jdk17" : "2.2.12", - "org.firebirdsql.jdbc:jaybird-jdk18" : "2.2.12", - "org.flywaydb:flyway-core" : "3.2.1", - "org.freemarker:freemarker" : "2.3.25-incubating", - "org.glassfish:javax.el" : "3.0.0", - "org.glassfish.jersey.containers:jersey-container-servlet" : "2.25.1", - "org.glassfish.jersey.containers:jersey-container-servlet-core" : "2.25.1", - "org.glassfish.jersey.core:jersey-server" : "2.25.1", - "org.glassfish.jersey.ext:jersey-bean-validation" : "2.25.1", - "org.glassfish.jersey.ext:jersey-spring3" : "2.25.1", - "org.glassfish.jersey.media:jersey-media-json-jackson" : "2.25.1", - "org.glassfish.tyrus:tyrus-container-servlet" : "1.3.5", - "org.glassfish.tyrus:tyrus-core" : "1.3.5", - "org.glassfish.tyrus:tyrus-server" : "1.3.5", - "org.glassfish.tyrus:tyrus-spi" : "1.3.5", - "org.hamcrest:hamcrest-all" : "1.3", - "org.hamcrest:hamcrest-core" : "1.3", - "org.hamcrest:hamcrest-library" : "1.3", - "org.hibernate:hibernate-core" : "5.0.11.Final", - "org.hibernate:hibernate-ehcache" : "5.0.11.Final", - "org.hibernate:hibernate-entitymanager" : "5.0.11.Final", - "org.hibernate:hibernate-envers" : "5.0.11.Final", - "org.hibernate:hibernate-java8" : "5.0.11.Final", - "org.hibernate:hibernate-jpamodelgen" : "5.0.11.Final", - "org.hibernate:hibernate-validator" : "5.3.4.Final", - "org.hibernate:hibernate-validator-annotation-processor" : "5.3.4.Final", - "org.hsqldb:hsqldb" : "2.3.3", - "org.igniterealtime.smack:smack-extensions" : "4.1.9", - "org.igniterealtime.smack:smack-java7" : "4.1.9", - "org.igniterealtime.smack:smack-resolver-javax" : "4.1.9", - "org.igniterealtime.smack:smack-tcp" : "4.1.9", - "org.infinispan:infinispan-jcache" : "8.2.5.Final", - "org.infinispan:infinispan-spring4-common" : "8.2.5.Final", - "org.infinispan:infinispan-spring4-embedded" : "8.2.5.Final", - "org.jasig.cas.client:cas-client-core" : "3.4.1", - "org.javassist:javassist" : "3.21.0-GA", - "org.jboss:jboss-transaction-spi" : "7.5.0.Final", - "org.jboss.logging:jboss-logging" : "3.3.0.Final", - "org.jboss.narayana.jta:jdbc" : "5.5.1.Final", - "org.jboss.narayana.jta:jms" : "5.5.1.Final", - "org.jboss.narayana.jta:jta" : "5.5.1.Final", - "org.jboss.narayana.jts:narayana-jts-integration" : "5.5.1.Final", - "org.jdom:jdom2" : "2.0.6", - "org.jibx:jibx-run" : "1.3.1", - "org.jolokia:jolokia-core" : "1.3.5", - "org.jooq:jooq" : "3.9.1", - "org.jooq:jooq-codegen" : "3.9.1", - "org.jooq:jooq-meta" : "3.9.1", - "org.jredis:jredis-core-api" : "06052013", - "org.jredis:jredis-core-ri" : "06052013", - "org.jruby:jruby" : "1.7.26", - "org.json:json" : "20140107", - "org.liquibase:liquibase-core" : "3.5.3", - "org.mariadb.jdbc:mariadb-java-client" : "1.5.7", - "org.mockito:mockito-core" : "1.10.19", - "org.mongodb:mongo-java-driver" : "3.4.1", - "org.mongodb:mongodb-driver" : "3.4.1", - "org.mortbay.jasper:apache-el" : "8.0.33", - "org.neo4j:neo4j-ogm-api" : "2.1.1", - "org.neo4j:neo4j-ogm-compiler" : "2.1.1", - "org.neo4j:neo4j-ogm-core" : "2.1.1", - "org.neo4j:neo4j-ogm-http-driver" : "2.1.1", - "org.objenesis:objenesis" : "2.5.1", - "org.openid4java:openid4java-nodeps" : "0.9.6", - "org.postgresql:postgresql" : "9.4.1212.jre7", - "org.projectlombok:lombok" : "1.16.12", - "org.quartz-scheduler:quartz" : "2.2.3", - "org.reactivestreams:reactive-streams" : "1.0.0", - "org.seleniumhq.selenium:htmlunit-driver" : "2.21", - "org.seleniumhq.selenium:selenium-api" : "2.53.1", - "org.seleniumhq.selenium:selenium-chrome-driver" : "2.53.1", - "org.seleniumhq.selenium:selenium-firefox-driver" : "2.53.1", - "org.seleniumhq.selenium:selenium-ie-driver" : "2.53.1", - "org.seleniumhq.selenium:selenium-java" : "2.53.1", - "org.seleniumhq.selenium:selenium-remote-driver" : "2.53.1", - "org.seleniumhq.selenium:selenium-safari-driver" : "2.53.1", - "org.seleniumhq.selenium:selenium-support" : "2.53.1", - "org.skyscreamer:jsonassert" : "1.4.0", - "org.slf4j:jcl-over-slf4j" : "1.7.22", - "org.slf4j:jul-to-slf4j" : "1.7.22", - "org.slf4j:log4j-over-slf4j" : "1.7.22", - "org.slf4j:slf4j-api" : "1.7.22", - "org.slf4j:slf4j-jdk14" : "1.7.22", - "org.slf4j:slf4j-log4j12" : "1.7.22", - "org.slf4j:slf4j-simple" : "1.7.22", - "org.spockframework:spock-core" : "1.0-groovy-2.4", - "org.spockframework:spock-spring" : "1.0-groovy-2.4", - "org.springframework:spring-aop" : "4.3.6.RELEASE", - "org.springframework:spring-aspects" : "4.3.6.RELEASE", - "org.springframework:spring-beans" : "4.3.6.RELEASE", - "org.springframework:spring-context" : "4.3.6.RELEASE", - "org.springframework:spring-context-support" : "4.3.6.RELEASE", - "org.springframework:spring-core" : "4.3.6.RELEASE", - "org.springframework:spring-expression" : "4.3.6.RELEASE", - "org.springframework:spring-instrument" : "4.3.6.RELEASE", - "org.springframework:spring-instrument-tomcat" : "4.3.6.RELEASE", - "org.springframework:spring-jdbc" : "4.3.6.RELEASE", - "org.springframework:spring-jms" : "4.3.6.RELEASE", - "org.springframework:spring-messaging" : "4.3.6.RELEASE", - "org.springframework:spring-orm" : "4.3.6.RELEASE", - "org.springframework:spring-oxm" : "4.3.6.RELEASE", - "org.springframework:spring-test" : "4.3.6.RELEASE", - "org.springframework:spring-tx" : "4.3.6.RELEASE", - "org.springframework:spring-web" : "4.3.6.RELEASE", - "org.springframework:spring-webmvc" : "4.3.6.RELEASE", - "org.springframework:spring-webmvc-portlet" : "4.3.6.RELEASE", - "org.springframework:spring-websocket" : "4.3.6.RELEASE", - "org.springframework:springloaded" : "1.2.6.RELEASE", - "org.springframework.amqp:spring-amqp" : "1.7.0.RELEASE", - "org.springframework.amqp:spring-rabbit" : "1.7.0.RELEASE", - "org.springframework.batch:spring-batch-core" : "3.0.7.RELEASE", - "org.springframework.batch:spring-batch-infrastructure" : "3.0.7.RELEASE", - "org.springframework.batch:spring-batch-integration" : "3.0.7.RELEASE", - "org.springframework.batch:spring-batch-test" : "3.0.7.RELEASE", - "org.springframework.boot:spring-boot" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-actuator" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-actuator-docs" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-autoconfigure" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-autoconfigure-processor" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-configuration-metadata" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-configuration-processor" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-devtools" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-loader" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-loader-tools" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-activemq" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-actuator" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-amqp" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-aop" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-artemis" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-batch" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-cache" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-cloud-connectors" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-cassandra" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-couchbase" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-elasticsearch" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-gemfire" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-jpa" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-ldap" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-mongodb" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-neo4j" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-redis" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-rest" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-data-solr" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-freemarker" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-groovy-templates" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-hateoas" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-integration" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-jdbc" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-jersey" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-jetty" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-jooq" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-jta-atomikos" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-jta-bitronix" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-jta-narayana" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-log4j2" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-logging" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-mail" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-mobile" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-mustache" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-remote-shell" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-security" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-social-facebook" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-social-linkedin" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-social-twitter" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-test" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-thymeleaf" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-tomcat" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-undertow" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-validation" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-web" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-web-services" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-starter-websocket" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-test" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-test-autoconfigure" : "1.5.1.RELEASE", - "org.springframework.boot:spring-boot-test-support" : "1.5.1.RELEASE", - "org.springframework.cloud:spring-cloud-cloudfoundry-connector" : "1.2.3.RELEASE", - "org.springframework.cloud:spring-cloud-core" : "1.2.3.RELEASE", - "org.springframework.cloud:spring-cloud-heroku-connector" : "1.2.3.RELEASE", - "org.springframework.cloud:spring-cloud-localconfig-connector" : "1.2.3.RELEASE", - "org.springframework.cloud:spring-cloud-spring-service-connector" : "1.2.3.RELEASE", - "org.springframework.data:spring-cql" : "1.5.0.RELEASE", - "org.springframework.data:spring-data-cassandra" : "1.5.0.RELEASE", - "org.springframework.data:spring-data-commons" : "1.13.0.RELEASE", - "org.springframework.data:spring-data-couchbase" : "2.2.0.RELEASE", - "org.springframework.data:spring-data-elasticsearch" : "2.1.0.RELEASE", - "org.springframework.data:spring-data-envers" : "1.1.0.RELEASE", - "org.springframework.data:spring-data-gemfire" : "1.9.0.RELEASE", - "org.springframework.data:spring-data-jpa" : "1.11.0.RELEASE", - "org.springframework.data:spring-data-keyvalue" : "1.2.0.RELEASE", - "org.springframework.data:spring-data-ldap" : "1.0.0.RELEASE", - "org.springframework.data:spring-data-mongodb" : "1.10.0.RELEASE", - "org.springframework.data:spring-data-mongodb-cross-store" : "1.10.0.RELEASE", - "org.springframework.data:spring-data-mongodb-log4j" : "1.10.0.RELEASE", - "org.springframework.data:spring-data-neo4j" : "4.2.0.RELEASE", - "org.springframework.data:spring-data-redis" : "1.8.0.RELEASE", - "org.springframework.data:spring-data-rest-core" : "2.6.0.RELEASE", - "org.springframework.data:spring-data-rest-hal-browser" : "2.6.0.RELEASE", - "org.springframework.data:spring-data-rest-webmvc" : "2.6.0.RELEASE", - "org.springframework.data:spring-data-solr" : "2.1.0.RELEASE", - "org.springframework.hateoas:spring-hateoas" : "0.23.0.RELEASE", - "org.springframework.integration:spring-integration-amqp" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-core" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-event" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-feed" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-file" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-flow" : "1.0.0.RELEASE", - "org.springframework.integration:spring-integration-ftp" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-gemfire" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-groovy" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-http" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-ip" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-java-dsl" : "1.2.1.RELEASE", - "org.springframework.integration:spring-integration-jdbc" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-jms" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-jmx" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-jpa" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-kafka" : "2.1.0.RELEASE", - "org.springframework.integration:spring-integration-mail" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-mongodb" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-mqtt" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-redis" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-rmi" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-scripting" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-security" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-sftp" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-splunk" : "1.1.0.RELEASE", - "org.springframework.integration:spring-integration-stomp" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-stream" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-syslog" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-test" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-twitter" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-websocket" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-ws" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-xml" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-xmpp" : "4.3.7.RELEASE", - "org.springframework.integration:spring-integration-zookeeper" : "4.3.7.RELEASE", - "org.springframework.kafka:spring-kafka" : "1.1.2.RELEASE", - "org.springframework.kafka:spring-kafka-test" : "1.1.2.RELEASE", - "org.springframework.ldap:spring-ldap-core" : "2.3.1.RELEASE", - "org.springframework.ldap:spring-ldap-core-tiger" : "2.3.1.RELEASE", - "org.springframework.ldap:spring-ldap-ldif-batch" : "2.3.1.RELEASE", - "org.springframework.ldap:spring-ldap-ldif-core" : "2.3.1.RELEASE", - "org.springframework.ldap:spring-ldap-odm" : "2.3.1.RELEASE", - "org.springframework.ldap:spring-ldap-test" : "2.3.1.RELEASE", - "org.springframework.mobile:spring-mobile-device" : "1.1.5.RELEASE", - "org.springframework.plugin:spring-plugin-core" : "1.2.0.RELEASE", - "org.springframework.plugin:spring-plugin-metadata" : "1.2.0.RELEASE", - "org.springframework.restdocs:spring-restdocs-core" : "1.1.2.RELEASE", - "org.springframework.restdocs:spring-restdocs-mockmvc" : "1.1.2.RELEASE", - "org.springframework.restdocs:spring-restdocs-restassured" : "1.1.2.RELEASE", - "org.springframework.retry:spring-retry" : "1.2.0.RELEASE", - "org.springframework.security:spring-security-acl" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-aspects" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-cas" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-config" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-core" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-crypto" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-data" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-jwt" : "1.0.7.RELEASE", - "org.springframework.security:spring-security-ldap" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-messaging" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-openid" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-remoting" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-taglibs" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-test" : "4.2.1.RELEASE", - "org.springframework.security:spring-security-web" : "4.2.1.RELEASE", - "org.springframework.security.oauth:spring-security-oauth" : "2.0.12.RELEASE", - "org.springframework.security.oauth:spring-security-oauth2" : "2.0.12.RELEASE", - "org.springframework.session:spring-session" : "1.3.0.RELEASE", - "org.springframework.session:spring-session-data-gemfire" : "1.3.0.RELEASE", - "org.springframework.session:spring-session-data-mongo" : "1.3.0.RELEASE", - "org.springframework.session:spring-session-data-redis" : "1.3.0.RELEASE", - "org.springframework.session:spring-session-hazelcast" : "1.3.0.RELEASE", - "org.springframework.session:spring-session-jdbc" : "1.3.0.RELEASE", - "org.springframework.shell:spring-shell" : "1.1.0.RELEASE", - "org.springframework.social:spring-social-config" : "1.1.4.RELEASE", - "org.springframework.social:spring-social-core" : "1.1.4.RELEASE", - "org.springframework.social:spring-social-facebook" : "2.0.3.RELEASE", - "org.springframework.social:spring-social-facebook-web" : "2.0.3.RELEASE", - "org.springframework.social:spring-social-linkedin" : "1.0.2.RELEASE", - "org.springframework.social:spring-social-security" : "1.1.4.RELEASE", - "org.springframework.social:spring-social-twitter" : "1.1.2.RELEASE", - "org.springframework.social:spring-social-web" : "1.1.4.RELEASE", - "org.springframework.webflow:spring-binding" : "2.4.4.RELEASE", - "org.springframework.webflow:spring-faces" : "2.4.4.RELEASE", - "org.springframework.webflow:spring-js" : "2.4.4.RELEASE", - "org.springframework.webflow:spring-js-resources" : "2.4.4.RELEASE", - "org.springframework.webflow:spring-webflow" : "2.4.4.RELEASE", - "org.springframework.ws:spring-ws-core" : "2.4.0.RELEASE", - "org.springframework.ws:spring-ws-security" : "2.4.0.RELEASE", - "org.springframework.ws:spring-ws-support" : "2.4.0.RELEASE", - "org.springframework.ws:spring-ws-test" : "2.4.0.RELEASE", - "org.springframework.ws:spring-xml" : "2.4.0.RELEASE", - "org.testng:testng" : "6.10", - "org.threeten:threetenbp" : "1.3.3", - "org.thymeleaf:thymeleaf" : "2.1.5.RELEASE", - "org.thymeleaf:thymeleaf-spring4" : "2.1.5.RELEASE", - "org.thymeleaf.extras:thymeleaf-extras-conditionalcomments" : "2.1.2.RELEASE", - "org.thymeleaf.extras:thymeleaf-extras-java8time" : "2.1.0.RELEASE", - "org.thymeleaf.extras:thymeleaf-extras-springsecurity4" : "2.1.3.RELEASE", - "org.webjars:bootstrap" : "2.3.2", - "org.webjars:hal-browser" : "9f96c74", - "org.webjars:html5shiv" : "3.7.3", - "org.webjars:json-editor" : "0.7.21", - "org.webjars:knockout" : "2.3.0", - "org.webjars:sockjs-client" : "0.3.4", - "org.webjars:stomp-websocket" : "2.3.0", - "org.webjars:webjars-locator" : "0.32", - "org.webjars:webjars-taglib" : "0.3", - "org.xerial:sqlite-jdbc" : "3.15.1", - "org.xerial.snappy:snappy-java" : "1.1.2.6", - "org.xmlbeam:xmlprojector" : "1.4.9", - "org.yaml:snakeyaml" : "1.17", - "org.zeromq:jeromq" : "0.3.4", - "redis.clients:jedis" : "2.9.0", - "velocity-tools:velocity-tools-view" : "1.4", - "wsdl4j:wsdl4j" : "1.6.3", - "xml-apis:xml-apis" : "1.4.01", - "xmlunit:xmlunit" : "1.6", - "xom:xom" : "1.2.5", - "org.gebish:geb-spock" : "1.1.1", - "org.junit.jupiter:junit-jupiter-api" : "5.7.2", - "org.junit.jupiter:junit-jupiter-params" : "5.7.2", - "org.junit.jupiter:junit-jupiter-engine" : "5.7.2", - "org.mockito:mockito-junit-jupiter" : "3.11.2" -] - -configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - def id = "${details.requested.group}:${details.requested.name}" - - if(deps[id]) { - details.useVersion deps[id] - } - } -} diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle b/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle index cf238daa48..3958647235 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle +++ b/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle @@ -4,6 +4,7 @@ dependencies { management platform('org.springframework.boot:spring-boot-dependencies:2.5.2') compile 'org.springframework:spring-web' compile 'org.springframework:spring-core' - testCompile 'junit:junit' + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-engine" } diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTest.java b/buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTest.java index e1ede21b2c..b6c952f9c9 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTest.java +++ b/buildSrc/src/test/resources/samples/showcase/sgbcs-api/src/test/java/api/ApiTest.java @@ -1,6 +1,6 @@ package api; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ApiTest { diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle index d63cbc881b..5e165e7bc0 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle +++ b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle @@ -3,5 +3,6 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { management platform('org.springframework.boot:spring-boot-dependencies:2.5.2') optional 'ch.qos.logback:logback-classic' - testCompile 'junit:junit' + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-engine" } diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTest.java b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTest.java index 3ec9b922d7..629721cc4c 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTest.java +++ b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/CoreClassTest.java @@ -1,6 +1,6 @@ package core; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CoreClassTest { diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTest.java b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTest.java index bded2c97af..ce8dcc1711 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTest.java +++ b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/src/test/java/core/HasOptionalTest.java @@ -1,6 +1,6 @@ package core; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HasOptionalTest { diff --git a/cas/spring-security-cas.gradle b/cas/spring-security-cas.gradle index 68e8838994..8b3d4630f7 100644 --- a/cas/spring-security-cas.gradle +++ b/cas/spring-security-cas.gradle @@ -15,5 +15,12 @@ dependencies { provided 'javax.servlet:javax.servlet-api' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" testImplementation 'org.skyscreamer:jsonassert' } diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index f52b4c0908..1263fbda82 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -51,7 +51,13 @@ dependencies { testImplementation project(path : ':spring-security-saml2-service-provider', configuration : 'tests') testImplementation project(path: ':spring-security-saml2-service-provider', configuration: 'opensaml4MainCompile') testImplementation project(path : ':spring-security-web', configuration : 'tests') - testImplementation apachedsDependencies + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" testImplementation 'com.squareup.okhttp3:mockwebserver' testImplementation 'ch.qos.logback:logback-classic' testImplementation 'io.projectreactor.netty:reactor-netty' @@ -62,6 +68,12 @@ dependencies { testImplementation('net.sourceforge.htmlunit:htmlunit') { exclude group: 'commons-logging', module: 'commons-logging' } + testImplementation "org.apache.directory.server:apacheds-core" + testImplementation "org.apache.directory.server:apacheds-core-entry" + testImplementation "org.apache.directory.server:apacheds-protocol-shared" + testImplementation "org.apache.directory.server:apacheds-protocol-ldap" + testImplementation "org.apache.directory.server:apacheds-server-jndi" + testImplementation 'org.apache.directory.shared:shared-ldap' testImplementation 'org.eclipse.persistence:javax.persistence' testImplementation 'org.hibernate:hibernate-entitymanager' testImplementation 'org.hsqldb:hsqldb' diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle index c2e3e92acf..213f24f92c 100644 --- a/core/spring-security-core.gradle +++ b/core/spring-security-core.gradle @@ -22,8 +22,14 @@ dependencies { testImplementation 'commons-collections:commons-collections' testImplementation 'io.projectreactor:reactor-test' - testImplementation 'org.mockito:mockito-core' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" testImplementation 'org.mockito:mockito-inline' + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" testImplementation 'org.skyscreamer:jsonassert' testImplementation 'org.slf4j:jcl-over-slf4j' testImplementation 'org.springframework:spring-test' diff --git a/crypto/spring-security-crypto.gradle b/crypto/spring-security-crypto.gradle index d69e1570c4..b45a20b0d8 100644 --- a/crypto/spring-security-crypto.gradle +++ b/crypto/spring-security-crypto.gradle @@ -4,4 +4,12 @@ dependencies { management platform(project(":spring-security-dependencies")) optional 'org.springframework:spring-jcl' optional 'org.bouncycastle:bcpkix-jdk15on' + + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/data/spring-security-data.gradle b/data/spring-security-data.gradle index b86af30805..e0c9f14dab 100644 --- a/data/spring-security-data.gradle +++ b/data/spring-security-data.gradle @@ -6,5 +6,13 @@ dependencies { api 'javax.xml.bind:jaxb-api' api 'org.springframework.data:spring-data-commons' api 'org.springframework:spring-core' + + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/docs/manual/spring-security-docs-manual.gradle b/docs/manual/spring-security-docs-manual.gradle index 8baa629ae2..6b0647cb9c 100644 --- a/docs/manual/spring-security-docs-manual.gradle +++ b/docs/manual/spring-security-docs-manual.gradle @@ -1,6 +1,5 @@ apply plugin: 'io.spring.convention.docs' apply plugin: 'io.spring.convention.management-configuration' -apply plugin: 'io.spring.convention.dependency-set' apply plugin: 'io.spring.convention.repository' apply plugin: 'java' diff --git a/itest/context/spring-security-itest-context.gradle b/itest/context/spring-security-itest-context.gradle index 4d48604b8d..4613738b7a 100644 --- a/itest/context/spring-security-itest-context.gradle +++ b/itest/context/spring-security-itest-context.gradle @@ -12,6 +12,13 @@ dependencies { testImplementation project(':spring-security-web') testImplementation 'javax.servlet:javax.servlet-api' testImplementation 'org.springframework:spring-web' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" testRuntimeOnly project(':spring-security-config') testRuntimeOnly 'org.aspectj:aspectjweaver' diff --git a/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle b/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle index 1d69e8d1b7..8c921d2db1 100644 --- a/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle +++ b/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle @@ -10,7 +10,19 @@ dependencies { implementation project(':spring-security-config') implementation project(':spring-security-ldap') - runtimeOnly apachedsDependencies + runtimeOnly "org.apache.directory.server:apacheds-core" + runtimeOnly "org.apache.directory.server:apacheds-core-entry" + runtimeOnly "org.apache.directory.server:apacheds-protocol-shared" + runtimeOnly "org.apache.directory.server:apacheds-protocol-ldap" + runtimeOnly "org.apache.directory.server:apacheds-server-jndi" + runtimeOnly 'org.apache.directory.shared:shared-ldap' testImplementation project(path : ':spring-security-ldap', configuration : 'tests') + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle b/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle index 1d69e8d1b7..8c921d2db1 100644 --- a/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle +++ b/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle @@ -10,7 +10,19 @@ dependencies { implementation project(':spring-security-config') implementation project(':spring-security-ldap') - runtimeOnly apachedsDependencies + runtimeOnly "org.apache.directory.server:apacheds-core" + runtimeOnly "org.apache.directory.server:apacheds-core-entry" + runtimeOnly "org.apache.directory.server:apacheds-protocol-shared" + runtimeOnly "org.apache.directory.server:apacheds-protocol-ldap" + runtimeOnly "org.apache.directory.server:apacheds-server-jndi" + runtimeOnly 'org.apache.directory.shared:shared-ldap' testImplementation project(path : ':spring-security-ldap', configuration : 'tests') + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle b/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle index dfa4a147f3..17854d0241 100644 --- a/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle +++ b/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle @@ -11,4 +11,11 @@ dependencies { implementation project(':spring-security-ldap') testImplementation "com.unboundid:unboundid-ldapsdk" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle b/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle index 973950b47e..bf0e96e87e 100644 --- a/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle +++ b/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle @@ -9,4 +9,12 @@ dependencies { implementation 'org.springframework:spring-tx' implementation project(':spring-security-config') implementation project(':spring-security-ldap') + + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle b/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle index dfa4a147f3..17854d0241 100644 --- a/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle +++ b/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle @@ -11,4 +11,11 @@ dependencies { implementation project(':spring-security-ldap') testImplementation "com.unboundid:unboundid-ldapsdk" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/itest/web/spring-security-itest-web.gradle b/itest/web/spring-security-itest-web.gradle index f5270e9e8c..3ef163839e 100644 --- a/itest/web/spring-security-itest-web.gradle +++ b/itest/web/spring-security-itest-web.gradle @@ -14,6 +14,13 @@ dependencies { testImplementation 'org.springframework:spring-beans' testImplementation 'org.springframework:spring-test' testImplementation 'org.springframework:spring-webmvc' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" testRuntimeOnly project(':spring-security-config') testRuntimeOnly project(':spring-security-ldap') diff --git a/ldap/spring-security-ldap.gradle b/ldap/spring-security-ldap.gradle index c9aafc3f22..e16802ea45 100644 --- a/ldap/spring-security-ldap.gradle +++ b/ldap/spring-security-ldap.gradle @@ -8,11 +8,14 @@ dependencies { api 'org.springframework:spring-core' api 'org.springframework:spring-tx' - optional apachedsDependencies optional 'ldapsdk:ldapsdk' optional "com.unboundid:unboundid-ldapsdk" + optional "org.apache.directory.server:apacheds-core" + optional "org.apache.directory.server:apacheds-core-entry" + optional "org.apache.directory.server:apacheds-protocol-shared" + optional "org.apache.directory.server:apacheds-protocol-ldap" + optional "org.apache.directory.server:apacheds-server-jndi" optional 'org.apache.directory.shared:shared-ldap' - api ('org.springframework.ldap:spring-ldap-core') { exclude(group: 'commons-logging', module: 'commons-logging') exclude(group: 'org.springframework', module: 'spring-beans') @@ -24,6 +27,13 @@ dependencies { testImplementation project(':spring-security-test') testImplementation 'org.slf4j:jcl-over-slf4j' testImplementation 'org.slf4j:slf4j-api' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } integrationTest { diff --git a/messaging/spring-security-messaging.gradle b/messaging/spring-security-messaging.gradle index 4f52968406..6556c0e6b0 100644 --- a/messaging/spring-security-messaging.gradle +++ b/messaging/spring-security-messaging.gradle @@ -16,8 +16,17 @@ dependencies { testImplementation project(path: ':spring-security-core', configuration: 'tests') testImplementation 'commons-codec:commons-codec' - testImplementation 'org.mockito:mockito-core' - testImplementation slf4jDependencies + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" + testImplementation "org.slf4j:slf4j-api" + testImplementation "org.slf4j:jcl-over-slf4j" + testImplementation "org.slf4j:log4j-over-slf4j" + testImplementation "ch.qos.logback:logback-classic" testRuntimeOnly 'org.hsqldb:hsqldb' } diff --git a/oauth2/oauth2-client/spring-security-oauth2-client.gradle b/oauth2/oauth2-client/spring-security-oauth2-client.gradle index 7fce568a95..fd71a9a30f 100644 --- a/oauth2/oauth2-client/spring-security-oauth2-client.gradle +++ b/oauth2/oauth2-client/spring-security-oauth2-client.gradle @@ -5,7 +5,7 @@ dependencies { api project(':spring-security-core') api project(':spring-security-oauth2-core') api project(':spring-security-web') - api springCoreDependency + api 'org.springframework:spring-core' api 'com.nimbusds:oauth2-oidc-sdk' optional project(':spring-security-oauth2-jose') @@ -25,7 +25,13 @@ dependencies { testImplementation 'org.skyscreamer:jsonassert' testImplementation 'io.r2dbc:r2dbc-h2:0.8.4.RELEASE' testImplementation 'io.r2dbc:r2dbc-spi-test:0.8.5.RELEASE' - testImplementation 'org.mockito:mockito-core' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" testRuntimeOnly 'org.hsqldb:hsqldb' diff --git a/oauth2/oauth2-core/spring-security-oauth2-core.gradle b/oauth2/oauth2-core/spring-security-oauth2-core.gradle index 3574925d59..9fb4449b52 100644 --- a/oauth2/oauth2-core/spring-security-oauth2-core.gradle +++ b/oauth2/oauth2-core/spring-security-oauth2-core.gradle @@ -3,12 +3,18 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { management platform(project(":spring-security-dependencies")) api project(':spring-security-core') - api springCoreDependency + api 'org.springframework:spring-core' api 'org.springframework:spring-web' optional 'com.fasterxml.jackson.core:jackson-databind' optional 'com.nimbusds:oauth2-oidc-sdk' optional 'org.springframework:spring-webflux' - testImplementation 'org.mockito:mockito-core' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle index aa63c2562b..8290b8579e 100644 --- a/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle +++ b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle @@ -4,7 +4,7 @@ dependencies { management platform(project(":spring-security-dependencies")) api project(':spring-security-core') api project(':spring-security-oauth2-core') - api springCoreDependency + api 'org.springframework:spring-core' api 'com.nimbusds:nimbus-jose-jwt' optional 'io.projectreactor:reactor-core' @@ -13,5 +13,11 @@ dependencies { testImplementation 'com.squareup.okhttp3:mockwebserver' testImplementation 'io.projectreactor.netty:reactor-netty' testImplementation 'com.fasterxml.jackson.core:jackson-databind' - testImplementation 'org.mockito:mockito-core' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle b/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle index d01583380f..438bbc8b5d 100644 --- a/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle +++ b/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle @@ -5,7 +5,7 @@ dependencies { api project(':spring-security-core') api project(':spring-security-oauth2-core') api project(':spring-security-web') - api springCoreDependency + api 'org.springframework:spring-core' optional project(':spring-security-oauth2-jose') optional 'com.nimbusds:oauth2-oidc-sdk' @@ -19,4 +19,11 @@ dependencies { testImplementation 'com.fasterxml.jackson.core:jackson-databind' testImplementation 'io.projectreactor.netty:reactor-netty' testImplementation 'io.projectreactor:reactor-test' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/openid/spring-security-openid.gradle b/openid/spring-security-openid.gradle index 82dc1ac659..0725b0d0a8 100644 --- a/openid/spring-security-openid.gradle +++ b/openid/spring-security-openid.gradle @@ -27,4 +27,12 @@ dependencies { runtimeOnly 'net.sourceforge.nekohtml:nekohtml' runtimeOnly 'org.apache.httpcomponents:httpclient' + + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/remoting/spring-security-remoting.gradle b/remoting/spring-security-remoting.gradle index 3b62b676fc..adbc8baeb3 100644 --- a/remoting/spring-security-remoting.gradle +++ b/remoting/spring-security-remoting.gradle @@ -10,4 +10,11 @@ dependencies { api 'org.springframework:spring-web' testImplementation project(path: ':spring-security-core', configuration: 'tests') + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } diff --git a/rsocket/spring-security-rsocket.gradle b/rsocket/spring-security-rsocket.gradle index 64ec4dcf87..04950bb290 100644 --- a/rsocket/spring-security-rsocket.gradle +++ b/rsocket/spring-security-rsocket.gradle @@ -7,4 +7,11 @@ dependencies { optional project(':spring-security-oauth2-resource-server') optional 'org.springframework:spring-messaging' testImplementation 'io.projectreactor:reactor-test' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } 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 2027bbd40e..dceb1a355a 100644 --- a/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle +++ b/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle @@ -50,6 +50,13 @@ dependencies { provided 'javax.servlet:javax.servlet-api' testImplementation 'com.squareup.okhttp3:mockwebserver' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } project.tasks.matching { t -> t.name == "jar"}.configureEach { diff --git a/taglibs/spring-security-taglibs.gradle b/taglibs/spring-security-taglibs.gradle index c272ff3c3c..a45ad37f12 100644 --- a/taglibs/spring-security-taglibs.gradle +++ b/taglibs/spring-security-taglibs.gradle @@ -16,6 +16,14 @@ dependencies { provided 'javax.servlet:javax.servlet-api' testRuntimeOnly 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' + + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" } configure(project.tasks.withType(Test)) { diff --git a/test/spring-security-test.gradle b/test/spring-security-test.gradle index 38dafff522..e5b977dda5 100644 --- a/test/spring-security-test.gradle +++ b/test/spring-security-test.gradle @@ -22,8 +22,14 @@ dependencies { testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' testImplementation 'io.projectreactor:reactor-test' testImplementation 'javax.xml.bind:jaxb-api' - testImplementation 'org.mockito:mockito-core' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" testImplementation 'org.mockito:mockito-inline' + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" testImplementation 'org.skyscreamer:jsonassert' testImplementation 'org.springframework:spring-webmvc' testImplementation 'org.springframework:spring-tx' diff --git a/web/spring-security-web.gradle b/web/spring-security-web.gradle index 6e5871a896..ad2279b46e 100644 --- a/web/spring-security-web.gradle +++ b/web/spring-security-web.gradle @@ -3,7 +3,7 @@ apply plugin: 'io.spring.convention.spring-module' dependencies { management platform(project(":spring-security-dependencies")) api project(':spring-security-core') - api springCoreDependency + api 'org.springframework:spring-core' api 'org.springframework:spring-aop' api 'org.springframework:spring-beans' api 'org.springframework:spring-context' @@ -29,6 +29,13 @@ dependencies { testImplementation 'org.skyscreamer:jsonassert' testImplementation 'org.springframework:spring-webflux' testImplementation 'org.synchronoss.cloud:nio-multipart-parser' + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "org.springframework:spring-test" testRuntimeOnly 'org.hsqldb:hsqldb' }