root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Upgrade to Gradle 7.2 

This commit upgrades Gradle to 7.2.
Gradle configuration names are updated accordingly.
This also upgrades Gradle build plugins.

See gh-26870
This commit is contained in:
Brian Clozel 2021-05-21 21:16:30 +02:00
parent 2db1e6daad
commit cecc0849a8
28 changed files with 527 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build.gradle
View File

@ -1,15 +1,15 @@
plugins { plugins {
id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
id 'io.spring.nohttp' version '0.0.5.RELEASE' id 'io.spring.nohttp' version '0.0.5.RELEASE'
id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
id 'org.jetbrains.dokka' version '0.10.1' apply false id 'org.jetbrains.dokka' version '1.5.0' apply false
id 'org.asciidoctor.jvm.convert' version '3.1.0' id 'org.asciidoctor.jvm.convert' version '3.1.0'
id 'org.asciidoctor.jvm.pdf' version '3.1.0' id 'org.asciidoctor.jvm.pdf' version '3.1.0'
id 'de.undercouch.download' version '4.1.1' id 'de.undercouch.download' version '4.1.2'
id "io.freefair.aspectj" version '5.1.1' apply false id "io.freefair.aspectj" version '6.1.0' apply false
id "com.github.ben-manes.versions" version '0.28.0' id "com.github.ben-manes.versions" version '0.39.0'
id "com.github.johnrengelman.shadow" version "6.1.0" apply false id "com.github.johnrengelman.shadow" version '7.0.0' apply false
id "me.champeau.jmh" version "0.6.4" apply false id "me.champeau.jmh" version "0.6.6" apply false
id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30" apply false id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30" apply false
id "org.unbroken-dome.xjc" version '2.0.0' apply false id "org.unbroken-dome.xjc" version '2.0.0' apply false
} }
@ -342,18 +342,18 @@ configure([rootProject] + javaProjects) { project ->
} }
dependencies { dependencies {
testCompile("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-api")
testCompile("org.junit.jupiter:junit-jupiter-params") testImplementation("org.junit.jupiter:junit-jupiter-params")
testCompile("org.mockito:mockito-core") testImplementation("org.mockito:mockito-core")
testCompile("org.mockito:mockito-junit-jupiter") testImplementation("org.mockito:mockito-junit-jupiter")
testCompile("io.mockk:mockk") testImplementation("io.mockk:mockk")
testCompile("org.assertj:assertj-core") testImplementation("org.assertj:assertj-core")
// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs. // Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
testRuntime("org.junit.platform:junit-platform-launcher") testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testRuntime("org.junit.jupiter:junit-jupiter-engine") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntime("org.apache.logging.log4j:log4j-core") testRuntimeOnly("org.apache.logging.log4j:log4j-core")
testRuntime("org.apache.logging.log4j:log4j-slf4j-impl") testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
testRuntime("org.apache.logging.log4j:log4j-jul") testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
// JSR-305 only used for non-required meta-annotations // JSR-305 only used for non-required meta-annotations
compileOnly("com.google.code.findbugs:jsr305") compileOnly("com.google.code.findbugs:jsr305")
testCompileOnly("com.google.code.findbugs:jsr305") testCompileOnly("com.google.code.findbugs:jsr305")
@ -364,7 +364,7 @@ configure([rootProject] + javaProjects) { project ->
"https://docs.oracle.com/javase/8/docs/api/", "https://docs.oracle.com/javase/8/docs/api/",
"https://docs.oracle.com/javaee/7/api/", "https://docs.oracle.com/javaee/7/api/",
"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ "https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ
"https://www.ibm.com/support/knowledgecenter/SS7JFU_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/", "https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
"https://glassfish.java.net/nonav/docs/v3/api/", "https://glassfish.java.net/nonav/docs/v3/api/",
"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/", "https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/", "https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",

79
gradle/docs.gradle
View File

@ -61,58 +61,41 @@ task api(type: Javadoc) {
/** /**
* Produce KDoc for all Spring Framework modules in "build/docs/kdoc" * Produce KDoc for all Spring Framework modules in "build/docs/kdoc"
*/ */
dokka { /*
dependsOn { moduleProjects.each { module ->
tasks.getByName("api") dokkaHtmlPartial {
} dokkaSourceSets {
configureEach {
doFirst { externalDocumentationLink {
configuration { url.set(URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/"))
classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten() packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath }) }
externalDocumentationLink {
moduleProjects.findAll { url.set(URL("https://projectreactor.io/docs/core/release/api/"))
it.pluginManager.hasPlugin("kotlin") }
}.each { project -> externalDocumentationLink {
def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect() url.set(URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/"))
kotlinDirs -= project.sourceSets.main.java.srcDirs }
kotlinDirs.each { dir -> /*
if (dir.exists()) { This link causes errors, removing to fix the build.
sourceRoot { externalDocumentationLink {
path = dir.path url.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/"))
} }
} //
externalDocumentationLink {
url.set(URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/"))
} }
} }
} }
} }
}
outputFormat = "html"
outputDirectory = "$buildDir/docs/kdoc"
configuration {
moduleName = "spring-framework"
externalDocumentationLink {
url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/")
packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
}
externalDocumentationLink {
url = new URL("https://projectreactor.io/docs/core/release/api/")
}
externalDocumentationLink {
url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
}
/*
This link causes errors, removing to fix the build.
externalDocumentationLink {
url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
}
*/ */
externalDocumentationLink { tasks.dokkaHtmlMultiModule.configure {
url = new URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/") dependsOn {
} tasks.getByName("api")
} }
moduleName.set("spring-framework")
outputDirectory.set(project.file("$buildDir/docs/kdoc"))
} }
task downloadResources(type: Download) { task downloadResources(type: Download) {
@ -193,7 +176,7 @@ asciidoctorPdf {
/** /**
* Zip all docs (API and reference) into a single archive * Zip all docs (API and reference) into a single archive
*/ */
task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokka']) { task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokkaHtmlMultiModule']) {
group = "Distribution" group = "Distribution"
description = "Builds -${archiveClassifier} archive containing api and reference " + description = "Builds -${archiveClassifier} archive containing api and reference " +
"for deployment at https://docs.spring.io/spring-framework/docs." "for deployment at https://docs.spring.io/spring-framework/docs."
@ -212,7 +195,7 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dok
from ("$asciidoctorPdf.outputDir") { from ("$asciidoctorPdf.outputDir") {
into "reference/pdf" into "reference/pdf"
} }
from (dokka) { from (dokkaHtmlMultiModule) {
into "kdoc-api" into "kdoc-api"
} }
} }

4
gradle/spring-module.gradle
View File

@ -17,6 +17,10 @@ jmh {
duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
} }
tasks.findByName("processJmhResources").configure {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
jmhJar { jmhJar {
// Uncomment the following for Shadow's Transformer support. // Uncomment the following for Shadow's Transformer support.
// mergeServiceFiles() // mergeServiceFiles()

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

269
gradlew vendored
View File

@ -1,7 +1,7 @@
#!/usr/bin/env sh #!/bin/sh
# #
# Copyright 2015 the original author or authors. # Copyright © 2015-2021 the original authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -17,67 +17,101 @@
# #
############################################################################## ##############################################################################
## #
## Gradle start up script for UN*X # Gradle start up script for POSIX generated by Gradle.
## #
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
############################################################################## ##############################################################################
# Attempt to set APP_HOME # Attempt to set APP_HOME
# Resolve links: $0 may be a link # Resolve links: $0 may be a link
PRG="$0" app_path=$0
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do # Need this for daisy-chained symlinks.
ls=`ls -ld "$PRG"` while
link=`expr "$ls" : '.*-> \(.*\)$'` APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
if expr "$link" : '/.*' > /dev/null; then [ -h "$app_path" ]
PRG="$link" do
else ls=$( ls -ld "$app_path" )
PRG=`dirname "$PRG"`"/$link" link=${ls#*' -> '}
fi case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle" APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD=maximum
warn () { warn () {
echo "$*" echo "$*"
} } >&2
die () { die () {
echo echo
echo "$*" echo "$*"
echo echo
exit 1 exit 1
} } >&2
# OS specific support (must be 'true' or 'false'). # OS specific support (must be 'true' or 'false').
cygwin=false cygwin=false
msys=false msys=false
darwin=false darwin=false
nonstop=false nonstop=false
case "`uname`" in case "$( uname )" in #(
CYGWIN* ) CYGWIN* ) cygwin=true ;; #(
cygwin=true Darwin* ) darwin=true ;; #(
;; MSYS* | MINGW* ) msys=true ;; #(
Darwin* ) NONSTOP* ) nonstop=true ;;
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables # IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java" JAVACMD=$JAVA_HOME/jre/sh/java
else else
JAVACMD="$JAVA_HOME/bin/java" JAVACMD=$JAVA_HOME/bin/java
fi fi
if [ ! -x "$JAVACMD" ] ; then if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi fi
else else
JAVACMD="java" JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
@ -106,80 +140,95 @@ location of your Java installation."
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
MAX_FD_LIMIT=`ulimit -H -n` case $MAX_FD in #(
if [ $? -eq 0 ] ; then max*)
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then MAX_FD=$( ulimit -H -n ) ||
MAX_FD="$MAX_FD_LIMIT" warn "Could not query maximum file descriptor limit"
fi esac
ulimit -n $MAX_FD case $MAX_FD in #(
if [ $? -ne 0 ] ; then '' | soft) :;; #(
warn "Could not set maximum file descriptor limit: $MAX_FD" *)
fi ulimit -n "$MAX_FD" ||
else warn "Could not set maximum file descriptor limit to $MAX_FD"
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
# Escape application args # Collect all arguments for the java command, stacking in reverse order:
save () { # * args from the command line
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done # * the main class name
echo " " # * -classpath
} # * -D...appname settings
APP_ARGS=`save "$@"` # * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# Collect all arguments for the java command, following the shell quoting and substitution rules # For Cygwin or MSYS, switch paths to Windows format before running java
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"

40
integration-tests/integration-tests.gradle
View File

@ -1,26 +1,26 @@
description = "Spring Integration Tests" description = "Spring Integration Tests"
dependencies { dependencies {
testCompile(project(":spring-aop")) testImplementation(project(":spring-aop"))
testCompile(project(":spring-beans")) testImplementation(project(":spring-beans"))
testCompile(project(":spring-context")) testImplementation(project(":spring-context"))
testCompile(project(":spring-core")) testImplementation(project(":spring-core"))
testCompile(testFixtures(project(":spring-aop"))) testImplementation(testFixtures(project(":spring-aop")))
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile(testFixtures(project(":spring-tx"))) testImplementation(testFixtures(project(":spring-tx")))
testCompile(project(":spring-expression")) testImplementation(project(":spring-expression"))
testCompile(project(":spring-jdbc")) testImplementation(project(":spring-jdbc"))
testCompile(project(":spring-orm")) testImplementation(project(":spring-orm"))
testCompile(project(":spring-test")) testImplementation(project(":spring-test"))
testCompile(project(":spring-tx")) testImplementation(project(":spring-tx"))
testCompile(project(":spring-web")) testImplementation(project(":spring-web"))
testCompile("javax.inject:javax.inject") testImplementation("javax.inject:javax.inject")
testCompile("javax.resource:javax.resource-api") testImplementation("javax.resource:javax.resource-api")
testCompile("javax.servlet:javax.servlet-api") testImplementation("javax.servlet:javax.servlet-api")
testCompile("org.aspectj:aspectjweaver") testImplementation("org.aspectj:aspectjweaver")
testCompile("org.hsqldb:hsqldb") testImplementation("org.hsqldb:hsqldb")
testCompile("org.hibernate:hibernate-core") testImplementation("org.hibernate:hibernate-core")
} }
normalization { normalization {

9
spring-aop/spring-aop.gradle
View File

@ -1,12 +1,13 @@
description = "Spring AOP" description = "Spring AOP"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
optional("org.aspectj:aspectjweaver") optional("org.aspectj:aspectjweaver")
optional("org.apache.commons:commons-pool2") optional("org.apache.commons:commons-pool2")
optional("com.jamonapi:jamon") optional("com.jamonapi:jamon")
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testFixturesImplementation(testFixtures(project(":spring-beans")))
testFixturesImplementation(testFixtures(project(":spring-core"))) testFixturesImplementation(testFixtures(project(":spring-core")))
} }

16
spring-aspects/spring-aspects.gradle
View File

@ -11,7 +11,7 @@ sourceSets.test.java.srcDirs = files()
aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver'] aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver']
dependencies { dependencies {
compile("org.aspectj:aspectjweaver") api("org.aspectj:aspectjweaver")
compileOnly("org.aspectj:aspectjrt") compileOnly("org.aspectj:aspectjrt")
optional(project(":spring-aop")) // for @Async support optional(project(":spring-aop")) // for @Async support
optional(project(":spring-beans")) // for @Configurable support optional(project(":spring-beans")) // for @Configurable support
@ -21,13 +21,13 @@ dependencies {
optional(project(":spring-tx")) // for JPA, @Transactional support optional(project(":spring-tx")) // for JPA, @Transactional support
optional("javax.cache:cache-api") // for JCache aspect optional("javax.cache:cache-api") // for JCache aspect
optional("javax.transaction:javax.transaction-api") // for @javax.transaction.Transactional support optional("javax.transaction:javax.transaction-api") // for @javax.transaction.Transactional support
testCompile(project(":spring-core")) // for CodeStyleAspect testImplementation(project(":spring-core")) // for CodeStyleAspect
testCompile(project(":spring-test")) testImplementation(project(":spring-test"))
testCompile(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-context")))
testCompile(testFixtures(project(":spring-context-support"))) testImplementation(testFixtures(project(":spring-context-support")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile(testFixtures(project(":spring-tx"))) testImplementation(testFixtures(project(":spring-tx")))
testCompile("javax.mail:javax.mail-api") testImplementation("javax.mail:javax.mail-api")
testCompileOnly("org.aspectj:aspectjrt") testCompileOnly("org.aspectj:aspectjrt")
} }

6
spring-beans/spring-beans.gradle
View File

@ -4,14 +4,14 @@ apply plugin: "groovy"
apply plugin: "kotlin" apply plugin: "kotlin"
dependencies { dependencies {
compile(project(":spring-core")) api(project(":spring-core"))
optional("javax.inject:javax.inject") optional("javax.inject:javax.inject")
optional("org.yaml:snakeyaml") optional("org.yaml:snakeyaml")
optional("org.codehaus.groovy:groovy-xml") optional("org.codehaus.groovy:groovy-xml")
optional("org.jetbrains.kotlin:kotlin-reflect") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlin:kotlin-stdlib")
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile("javax.annotation:javax.annotation-api") testImplementation("javax.annotation:javax.annotation-api")
testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesApi("org.junit.jupiter:junit-jupiter-api")
testFixturesImplementation("org.assertj:assertj-core") testFixturesImplementation("org.assertj:assertj-core")
} }

10
spring-context-indexer/spring-context-indexer.gradle
View File

@ -1,9 +1,9 @@
description = "Spring Context Indexer" description = "Spring Context Indexer"
dependencies { dependencies {
testCompile(project(":spring-context")) testImplementation(project(":spring-context"))
testCompile("javax.inject:javax.inject") testImplementation("javax.inject:javax.inject")
testCompile("javax.annotation:javax.annotation-api") testImplementation("javax.annotation:javax.annotation-api")
testCompile("javax.transaction:javax.transaction-api") testImplementation("javax.transaction:javax.transaction-api")
testCompile("org.eclipse.persistence:javax.persistence") testImplementation("org.eclipse.persistence:javax.persistence")
} }

30
spring-context-support/spring-context-support.gradle
View File

@ -1,9 +1,9 @@
description = "Spring Context Support" description = "Spring Context Support"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-context")) api(project(":spring-context"))
compile(project(":spring-core")) api(project(":spring-core"))
optional(project(":spring-jdbc")) // for Quartz support optional(project(":spring-jdbc")) // for Quartz support
optional(project(":spring-tx")) // for Quartz support optional(project(":spring-tx")) // for Quartz support
optional("javax.activation:javax.activation-api") optional("javax.activation:javax.activation-api")
@ -14,18 +14,18 @@ dependencies {
optional("org.quartz-scheduler:quartz") optional("org.quartz-scheduler:quartz")
optional("org.codehaus.fabric3.api:commonj") optional("org.codehaus.fabric3.api:commonj")
optional("org.freemarker:freemarker") optional("org.freemarker:freemarker")
testCompile(project(":spring-context")) testImplementation(project(":spring-context"))
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-context")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile(testFixtures(project(":spring-tx"))) testImplementation(testFixtures(project(":spring-tx")))
testCompile("org.hsqldb:hsqldb") testImplementation("org.hsqldb:hsqldb")
testCompile("org.hibernate:hibernate-validator") testImplementation("org.hibernate:hibernate-validator")
testCompile("javax.annotation:javax.annotation-api") testImplementation("javax.annotation:javax.annotation-api")
testRuntime("org.ehcache:jcache") testRuntimeOnly("org.ehcache:jcache")
testRuntime("org.ehcache:ehcache") testRuntimeOnly("org.ehcache:ehcache")
testRuntime("org.glassfish:javax.el") testRuntimeOnly("org.glassfish:javax.el")
testRuntime("com.sun.mail:javax.mail") testRuntimeOnly("com.sun.mail:javax.mail")
testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesApi("org.junit.jupiter:junit-jupiter-api")
testFixturesImplementation("org.assertj:assertj-core") testFixturesImplementation("org.assertj:assertj-core")
testFixturesImplementation("org.mockito:mockito-core") testFixturesImplementation("org.mockito:mockito-core")

38
spring-context/spring-context.gradle
View File

@ -4,10 +4,10 @@ apply plugin: "groovy"
apply plugin: "kotlin" apply plugin: "kotlin"
dependencies { dependencies {
compile(project(":spring-aop")) api(project(":spring-aop"))
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
compile(project(":spring-expression")) api(project(":spring-expression"))
optional(project(":spring-instrument")) optional(project(":spring-instrument"))
optional("javax.annotation:javax.annotation-api") optional("javax.annotation:javax.annotation-api")
optional("javax.ejb:javax.ejb-api") optional("javax.ejb:javax.ejb-api")
@ -26,22 +26,22 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-reflect") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.reactivestreams:reactive-streams") optional("org.reactivestreams:reactive-streams")
testCompile(testFixtures(project(":spring-aop"))) testImplementation(testFixtures(project(":spring-aop")))
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile("io.projectreactor:reactor-core") testImplementation("io.projectreactor:reactor-core")
testCompile("org.codehaus.groovy:groovy-jsr223") testImplementation("org.codehaus.groovy:groovy-jsr223")
testCompile("org.codehaus.groovy:groovy-test") testImplementation("org.codehaus.groovy:groovy-test")
testCompile("org.codehaus.groovy:groovy-xml") testImplementation("org.codehaus.groovy:groovy-xml")
testCompile("org.apache.commons:commons-pool2") testImplementation("org.apache.commons:commons-pool2")
testCompile("javax.inject:javax.inject-tck") testImplementation("javax.inject:javax.inject-tck")
testCompile("org.awaitility:awaitility") testImplementation("org.awaitility:awaitility")
testRuntime("javax.xml.bind:jaxb-api") testRuntimeOnly("javax.xml.bind:jaxb-api")
testRuntime("org.glassfish:javax.el") testRuntimeOnly("org.glassfish:javax.el")
// Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central) // Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central)
testRuntime("org.glassfish.external:opendmk_jmxremote_optional_jar") testRuntimeOnly("org.glassfish.external:opendmk_jmxremote_optional_jar")
testRuntime("org.javamoney:moneta") testRuntimeOnly("org.javamoney:moneta")
testRuntime("org.junit.vintage:junit-vintage-engine") // for @Inject TCK testRuntimeOnly("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesApi("org.junit.jupiter:junit-jupiter-api")
testFixturesImplementation(testFixtures(project(":spring-beans"))) testFixturesImplementation(testFixtures(project(":spring-beans")))
testFixturesImplementation("com.google.code.findbugs:jsr305") testFixturesImplementation("com.google.code.findbugs:jsr305")

10
spring-core/kotlin-coroutines/kotlin-coroutines.gradle
View File

@ -14,11 +14,11 @@ artifacts {
} }
dependencies { dependencies {
compile("org.jetbrains.kotlin:kotlin-reflect") api("org.jetbrains.kotlin:kotlin-reflect")
compile("org.jetbrains.kotlin:kotlin-stdlib") api("org.jetbrains.kotlin:kotlin-stdlib")
compile("io.projectreactor:reactor-core") api("io.projectreactor:reactor-core")
compile("org.jetbrains.kotlinx:kotlinx-coroutines-core") api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") api("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
} }
eclipse { eclipse {

32
spring-core/spring-core.gradle
View File

@ -17,16 +17,16 @@ configurations {
} }
task cglibRepackJar(type: ShadowJar) { task cglibRepackJar(type: ShadowJar) {
archiveBaseName = 'spring-cglib-repack' archiveBaseName.set('spring-cglib-repack')
archiveVersion = cglibVersion archiveVersion.set(cglibVersion)
configurations = [project.configurations.cglib] configurations = [project.configurations.cglib]
relocate 'net.sf.cglib', 'org.springframework.cglib' relocate 'net.sf.cglib', 'org.springframework.cglib'
relocate 'org.objectweb.asm', 'org.springframework.asm' relocate 'org.objectweb.asm', 'org.springframework.asm'
} }
task objenesisRepackJar(type: ShadowJar) { task objenesisRepackJar(type: ShadowJar) {
archiveBaseName = 'spring-objenesis-repack' archiveBaseName.set('spring-objenesis-repack')
archiveVersion = objenesisVersion archiveVersion.set(objenesisVersion)
configurations = [project.configurations.objenesis] configurations = [project.configurations.objenesis]
relocate 'org.objenesis', 'org.springframework.objenesis' relocate 'org.objenesis', 'org.springframework.objenesis'
} }
@ -35,9 +35,9 @@ dependencies {
cglib("cglib:cglib:${cglibVersion}@jar") cglib("cglib:cglib:${cglibVersion}@jar")
objenesis("org.objenesis:objenesis:${objenesisVersion}@jar") objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
coroutines(project(path: ":kotlin-coroutines", configuration: 'classesOnlyElements')) coroutines(project(path: ":kotlin-coroutines", configuration: 'classesOnlyElements'))
compile(files(cglibRepackJar)) api(files(cglibRepackJar))
compile(files(objenesisRepackJar)) api(files(objenesisRepackJar))
compile(project(":spring-jcl")) api(project(":spring-jcl"))
compileOnly(project(":kotlin-coroutines")) compileOnly(project(":kotlin-coroutines"))
compileOnly("io.projectreactor.tools:blockhound") compileOnly("io.projectreactor.tools:blockhound")
optional("net.sf.jopt-simple:jopt-simple") optional("net.sf.jopt-simple:jopt-simple")
@ -51,15 +51,15 @@ dependencies {
optional("io.reactivex.rxjava3:rxjava") optional("io.reactivex.rxjava3:rxjava")
optional("io.smallrye.reactive:mutiny") optional("io.smallrye.reactive:mutiny")
optional("io.netty:netty-buffer") optional("io.netty:netty-buffer")
testCompile("io.projectreactor:reactor-test") testImplementation("io.projectreactor:reactor-test")
testCompile("com.google.code.findbugs:jsr305") testImplementation("com.google.code.findbugs:jsr305")
testCompile("javax.annotation:javax.annotation-api") testImplementation("javax.annotation:javax.annotation-api")
testCompile("javax.xml.bind:jaxb-api") testImplementation("javax.xml.bind:jaxb-api")
testCompile("com.fasterxml.woodstox:woodstox-core") testImplementation("com.fasterxml.woodstox:woodstox-core")
testCompile("org.xmlunit:xmlunit-assertj") testImplementation("org.xmlunit:xmlunit-assertj")
testCompile("org.xmlunit:xmlunit-matchers") testImplementation("org.xmlunit:xmlunit-matchers")
testCompile(project(":kotlin-coroutines")) testImplementation(project(":kotlin-coroutines"))
testCompile("io.projectreactor.tools:blockhound") testImplementation("io.projectreactor.tools:blockhound")
testFixturesImplementation("io.projectreactor:reactor-test") testFixturesImplementation("io.projectreactor:reactor-test")
testFixturesImplementation("com.google.code.findbugs:jsr305") testFixturesImplementation("com.google.code.findbugs:jsr305")
testFixturesImplementation("org.junit.platform:junit-platform-launcher") testFixturesImplementation("org.junit.platform:junit-platform-launcher")

8
spring-expression/spring-expression.gradle
View File

@ -3,8 +3,8 @@ description = "Spring Expression Language (SpEL)"
apply plugin: "kotlin" apply plugin: "kotlin"
dependencies { dependencies {
compile(project(":spring-core")) api(project(":spring-core"))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile("org.jetbrains.kotlin:kotlin-reflect") testImplementation("org.jetbrains.kotlin:kotlin-reflect")
testCompile("org.jetbrains.kotlin:kotlin-stdlib") testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
} }

10
spring-jdbc/spring-jdbc.gradle
View File

@ -3,9 +3,9 @@ description = "Spring JDBC"
apply plugin: "kotlin" apply plugin: "kotlin"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
compile(project(":spring-tx")) api(project(":spring-tx"))
optional(project(":spring-context")) // for JndiDataSourceLookup optional(project(":spring-context")) // for JndiDataSourceLookup
optional("javax.transaction:javax.transaction-api") optional("javax.transaction:javax.transaction-api")
optional("org.hsqldb:hsqldb") optional("org.hsqldb:hsqldb")
@ -14,6 +14,6 @@ dependencies {
optional("org.apache.derby:derbyclient") optional("org.apache.derby:derbyclient")
optional("org.jetbrains.kotlin:kotlin-reflect") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlin:kotlin-stdlib")
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
} }

14
spring-jms/spring-jms.gradle
View File

@ -1,10 +1,10 @@
description = "Spring JMS" description = "Spring JMS"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
compile(project(":spring-messaging")) api(project(":spring-messaging"))
compile(project(":spring-tx")) api(project(":spring-tx"))
compileOnly("javax.jms:javax.jms-api") compileOnly("javax.jms:javax.jms-api")
optional(project(":spring-aop")) optional(project(":spring-aop"))
optional(project(":spring-context")) optional(project(":spring-context"))
@ -12,8 +12,8 @@ dependencies {
optional("javax.resource:javax.resource-api") optional("javax.resource:javax.resource-api")
optional("javax.transaction:javax.transaction-api") optional("javax.transaction:javax.transaction-api")
optional("com.fasterxml.jackson.core:jackson-databind") optional("com.fasterxml.jackson.core:jackson-databind")
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-tx"))) testImplementation(testFixtures(project(":spring-tx")))
testCompile("org.apache.activemq:activemq-broker") testImplementation("org.apache.activemq:activemq-broker")
testImplementation("javax.jms:javax.jms-api") testImplementation("javax.jms:javax.jms-api")
} }

46
spring-messaging/spring-messaging.gradle
View File

@ -4,8 +4,8 @@ apply plugin: "kotlin"
apply plugin: "kotlinx-serialization" apply plugin: "kotlinx-serialization"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
compileOnly(project(":kotlin-coroutines")) compileOnly(project(":kotlin-coroutines"))
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-oxm")) optional(project(":spring-oxm"))
@ -19,25 +19,25 @@ dependencies {
optional("com.google.protobuf:protobuf-java-util") optional("com.google.protobuf:protobuf-java-util")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
optional("org.jetbrains.kotlinx:kotlinx-serialization-json") optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
testCompile(project(":kotlin-coroutines")) testImplementation(project(":kotlin-coroutines"))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile("javax.inject:javax.inject-tck") testImplementation("javax.inject:javax.inject-tck")
testCompile("javax.servlet:javax.servlet-api") testImplementation("javax.servlet:javax.servlet-api")
testCompile("javax.validation:validation-api") testImplementation("javax.validation:validation-api")
testCompile("com.thoughtworks.xstream:xstream") testImplementation("com.thoughtworks.xstream:xstream")
testCompile("org.apache.activemq:activemq-broker") testImplementation("org.apache.activemq:activemq-broker")
testCompile("org.apache.activemq:activemq-kahadb-store") testImplementation("org.apache.activemq:activemq-kahadb-store")
testCompile("org.apache.activemq:activemq-stomp") testImplementation("org.apache.activemq:activemq-stomp")
testCompile("io.projectreactor:reactor-test") testImplementation("io.projectreactor:reactor-test")
testCompile "io.reactivex.rxjava3:rxjava" testImplementation("io.reactivex.rxjava3:rxjava")
testCompile("org.jetbrains.kotlin:kotlin-reflect") testImplementation("org.jetbrains.kotlin:kotlin-reflect")
testCompile("org.jetbrains.kotlin:kotlin-stdlib") testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
testCompile("org.xmlunit:xmlunit-assertj") testImplementation("org.xmlunit:xmlunit-assertj")
testCompile("org.xmlunit:xmlunit-matchers") testImplementation("org.xmlunit:xmlunit-matchers")
testRuntime("com.sun.activation:javax.activation") testRuntimeOnly("com.sun.activation:javax.activation")
testRuntime("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-core")
testRuntime("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
testRuntime("javax.json:javax.json-api") testRuntimeOnly("javax.json:javax.json-api")
testRuntime("org.apache.johnzon:johnzon-jsonb") testRuntimeOnly("org.apache.johnzon:johnzon-jsonb")
testRuntime(project(":spring-context")) testRuntimeOnly(project(":spring-context"))
} }

22
spring-orm/spring-orm.gradle
View File

@ -1,21 +1,21 @@
description = "Spring Object/Relational Mapping" description = "Spring Object/Relational Mapping"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
compile(project(":spring-jdbc")) api(project(":spring-jdbc"))
compile(project(":spring-tx")) api(project(":spring-tx"))
optional(project(":spring-aop")) optional(project(":spring-aop"))
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-web")) optional(project(":spring-web"))
optional("org.eclipse.persistence:org.eclipse.persistence.jpa") optional("org.eclipse.persistence:org.eclipse.persistence.jpa")
optional("org.hibernate:hibernate-core") optional("org.hibernate:hibernate-core")
optional("javax.servlet:javax.servlet-api") optional("javax.servlet:javax.servlet-api")
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-context")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile(testFixtures(project(":spring-web"))) testImplementation(testFixtures(project(":spring-web")))
testCompile("org.aspectj:aspectjweaver") testImplementation("org.aspectj:aspectjweaver")
testCompile("org.hsqldb:hsqldb") testImplementation("org.hsqldb:hsqldb")
testRuntime("javax.xml.bind:jaxb-api") testRuntimeOnly("javax.xml.bind:jaxb-api")
} }

22
spring-oxm/spring-oxm.gradle
View File

@ -23,23 +23,23 @@ sourceSets {
} }
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
optional("javax.xml.bind:jaxb-api") optional("javax.xml.bind:jaxb-api")
optional("javax.activation:javax.activation-api") optional("javax.activation:javax.activation-api")
optional("com.thoughtworks.xstream:xstream") optional("com.thoughtworks.xstream:xstream")
optional("org.jibx:jibx-run") optional("org.jibx:jibx-run")
testCompile(project(":spring-context")) testImplementation(project(":spring-context"))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile("org.ogce:xpp3") testImplementation("org.ogce:xpp3")
testCompile("org.codehaus.jettison:jettison") { testImplementation("org.codehaus.jettison:jettison") {
exclude group: "stax", module: "stax-api" exclude group: "stax", module: "stax-api"
} }
//testCompile(files(genJaxb.classesDir).builtBy(genJaxb)) //testImplementation(files(genJaxb.classesDir).builtBy(genJaxb))
testCompile("org.xmlunit:xmlunit-assertj") testImplementation("org.xmlunit:xmlunit-assertj")
testCompile("org.xmlunit:xmlunit-matchers") testImplementation("org.xmlunit:xmlunit-matchers")
testRuntime("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-core")
testRuntime("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
} }
// JiBX compiler is currently not compatible with JDK 9+. // JiBX compiler is currently not compatible with JDK 9+.

24
spring-r2dbc/spring-r2dbc.gradle
View File

@ -3,23 +3,23 @@ description = "Spring R2DBC"
apply plugin: "kotlin" apply plugin: "kotlin"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
compile(project(":spring-tx")) api(project(":spring-tx"))
compile("io.r2dbc:r2dbc-spi") api("io.r2dbc:r2dbc-spi")
compile("io.projectreactor:reactor-core") api("io.projectreactor:reactor-core")
compileOnly(project(":kotlin-coroutines")) compileOnly(project(":kotlin-coroutines"))
optional("org.jetbrains.kotlin:kotlin-reflect") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
testCompile(project(":kotlin-coroutines")) testImplementation(project(":kotlin-coroutines"))
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-context")))
testCompile("io.projectreactor:reactor-test") testImplementation("io.projectreactor:reactor-test")
testCompile("io.r2dbc:r2dbc-h2") testImplementation("io.r2dbc:r2dbc-h2")
testCompile("io.r2dbc:r2dbc-spi-test:0.8.1.RELEASE") { testImplementation("io.r2dbc:r2dbc-spi-test:0.8.1.RELEASE") {
exclude group: "org.springframework", module: "spring-jdbc" exclude group: "org.springframework", module: "spring-jdbc"
} }
} }

64
spring-test/spring-test.gradle
View File

@ -3,7 +3,7 @@ description = "Spring TestContext Framework"
apply plugin: "kotlin" apply plugin: "kotlin"
dependencies { dependencies {
compile(project(":spring-core")) api(project(":spring-core"))
optional(project(":spring-aop")) optional(project(":spring-aop"))
optional(project(":spring-beans")) optional(project(":spring-beans"))
optional(project(":spring-context")) optional(project(":spring-context"))
@ -45,41 +45,41 @@ dependencies {
optional("io.projectreactor:reactor-test") optional("io.projectreactor:reactor-test")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
testCompile(project(":spring-context-support")) testImplementation(project(":spring-context-support"))
testCompile(project(":spring-oxm")) testImplementation(project(":spring-oxm"))
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-context")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile(testFixtures(project(":spring-tx"))) testImplementation(testFixtures(project(":spring-tx")))
testCompile(testFixtures(project(":spring-web"))) testImplementation(testFixtures(project(":spring-web")))
testCompile("javax.annotation:javax.annotation-api") testImplementation("javax.annotation:javax.annotation-api")
testCompile("javax.cache:cache-api") testImplementation("javax.cache:cache-api")
testCompile("javax.ejb:javax.ejb-api") testImplementation("javax.ejb:javax.ejb-api")
testCompile("javax.interceptor:javax.interceptor-api") testImplementation("javax.interceptor:javax.interceptor-api")
testCompile("javax.mail:javax.mail-api") testImplementation("javax.mail:javax.mail-api")
testCompile("org.hibernate:hibernate-core") testImplementation("org.hibernate:hibernate-core")
testCompile("org.hibernate:hibernate-validator") testImplementation("org.hibernate:hibernate-validator")
testCompile("javax.validation:validation-api") testImplementation("javax.validation:validation-api")
testCompile("org.junit.platform:junit-platform-runner") { testImplementation("org.junit.platform:junit-platform-runner") {
exclude group: "junit", module: "junit" exclude group: "junit", module: "junit"
} }
testCompile("org.junit.platform:junit-platform-testkit") testImplementation("org.junit.platform:junit-platform-testkit")
testCompile("com.fasterxml.jackson.core:jackson-databind") testImplementation("com.fasterxml.jackson.core:jackson-databind")
testCompile("com.thoughtworks.xstream:xstream") testImplementation("com.thoughtworks.xstream:xstream")
testCompile("com.rometools:rome") testImplementation("com.rometools:rome")
testCompile("org.apache.tiles:tiles-api") testImplementation("org.apache.tiles:tiles-api")
testCompile("org.apache.tiles:tiles-core") testImplementation("org.apache.tiles:tiles-core")
testCompile("org.apache.tiles:tiles-servlet") testImplementation("org.apache.tiles:tiles-servlet")
testCompile("org.hsqldb:hsqldb") testImplementation("org.hsqldb:hsqldb")
testCompile("org.apache.httpcomponents:httpclient") testImplementation("org.apache.httpcomponents:httpclient")
testCompile("io.projectreactor.netty:reactor-netty-http") testImplementation("io.projectreactor.netty:reactor-netty-http")
testCompile("de.bechte.junit:junit-hierarchicalcontextrunner") testImplementation("de.bechte.junit:junit-hierarchicalcontextrunner")
testRuntime("org.junit.vintage:junit-vintage-engine") { testRuntimeOnly("org.junit.vintage:junit-vintage-engine") {
exclude group: "junit", module: "junit" exclude group: "junit", module: "junit"
} }
testRuntime("org.glassfish:javax.el") testRuntimeOnly("org.glassfish:javax.el")
testRuntime("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-core")
testRuntime("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
} }
task junit(type: Test) { task junit(type: Test) {

18
spring-tx/spring-tx.gradle
View File

@ -3,8 +3,8 @@ description = "Spring Transaction"
apply plugin: "kotlin" apply plugin: "kotlin"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
optional(project(":spring-aop")) optional(project(":spring-aop"))
optional(project(":spring-context")) // for JCA, @EnableTransactionManagement optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
optional(project(":kotlin-coroutines")) optional(project(":kotlin-coroutines"))
@ -19,11 +19,11 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-context")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile("org.aspectj:aspectjweaver") testImplementation("org.aspectj:aspectjweaver")
testCompile("org.codehaus.groovy:groovy") testImplementation("org.codehaus.groovy:groovy")
testCompile("org.eclipse.persistence:javax.persistence") testImplementation("org.eclipse.persistence:javax.persistence")
testCompile("io.projectreactor:reactor-test") testImplementation("io.projectreactor:reactor-test")
} }

52
spring-web/spring-web.gradle
View File

@ -4,8 +4,8 @@ apply plugin: "kotlin"
apply plugin: "kotlinx-serialization" apply plugin: "kotlinx-serialization"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
compileOnly(project(":kotlin-coroutines")) compileOnly(project(":kotlin-coroutines"))
compileOnly("io.projectreactor.tools:blockhound") compileOnly("io.projectreactor.tools:blockhound")
optional(project(":spring-aop")) optional(project(":spring-aop"))
@ -58,30 +58,30 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-reflect") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.jetbrains.kotlinx:kotlinx-serialization-json") optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-context")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile("io.projectreactor:reactor-test") testImplementation("io.projectreactor:reactor-test")
testCompile("org.apache.taglibs:taglibs-standard-jstlel") testImplementation("org.apache.taglibs:taglibs-standard-jstlel")
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8") testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda") testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-joda")
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
testCompile("com.fasterxml.jackson.module:jackson-module-kotlin") testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin")
testCompile("org.apache.tomcat:tomcat-util") testImplementation("org.apache.tomcat:tomcat-util")
testCompile("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
testCompile("org.eclipse.jetty:jetty-server") testImplementation("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet") testImplementation("org.eclipse.jetty:jetty-servlet")
testCompile("com.squareup.okhttp3:mockwebserver") testImplementation("com.squareup.okhttp3:mockwebserver")
testCompile("org.jetbrains.kotlin:kotlin-reflect") testImplementation("org.jetbrains.kotlin:kotlin-reflect")
testCompile("org.skyscreamer:jsonassert") testImplementation("org.skyscreamer:jsonassert")
testCompile("org.xmlunit:xmlunit-assertj") testImplementation("org.xmlunit:xmlunit-assertj")
testCompile("org.xmlunit:xmlunit-matchers") testImplementation("org.xmlunit:xmlunit-matchers")
testCompile("io.projectreactor.tools:blockhound") testImplementation("io.projectreactor.tools:blockhound")
testRuntime("com.sun.mail:javax.mail") testRuntimeOnly("com.sun.mail:javax.mail")
testRuntime("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-core")
testRuntime("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
testRuntime("javax.json:javax.json-api") testRuntimeOnly("javax.json:javax.json-api")
testRuntime("org.apache.johnzon:johnzon-jsonb") testRuntimeOnly("org.apache.johnzon:johnzon-jsonb")
testFixturesApi("javax.servlet:javax.servlet-api") testFixturesApi("javax.servlet:javax.servlet-api")
testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesApi("org.junit.jupiter:junit-jupiter-api")
testFixturesApi("org.junit.jupiter:junit-jupiter-params") testFixturesApi("org.junit.jupiter:junit-jupiter-params")

66
spring-webflux/spring-webflux.gradle
View File

@ -3,10 +3,10 @@ description = "Spring WebFlux"
apply plugin: "kotlin" apply plugin: "kotlin"
dependencies { dependencies {
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-core")) api(project(":spring-core"))
compile(project(":spring-web")) api(project(":spring-web"))
compile("io.projectreactor:reactor-core") api("io.projectreactor:reactor-core")
compileOnly(project(":kotlin-coroutines")) compileOnly(project(":kotlin-coroutines"))
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-context-support")) // for FreeMarker support optional(project(":spring-context-support")) // for FreeMarker support
@ -27,35 +27,35 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("com.google.protobuf:protobuf-java-util") optional("com.google.protobuf:protobuf-java-util")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
testCompile(project(":kotlin-coroutines")) testImplementation(project(":kotlin-coroutines"))
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile(testFixtures(project(":spring-web"))) testImplementation(testFixtures(project(":spring-web")))
testCompile("javax.xml.bind:jaxb-api") testImplementation("javax.xml.bind:jaxb-api")
testCompile("com.fasterxml:aalto-xml") testImplementation("com.fasterxml:aalto-xml")
testCompile("org.hibernate:hibernate-validator") testImplementation("org.hibernate:hibernate-validator")
testCompile("javax.validation:validation-api") testImplementation("javax.validation:validation-api")
testCompile("io.reactivex.rxjava3:rxjava") testImplementation("io.reactivex.rxjava3:rxjava")
testCompile("io.projectreactor:reactor-test") testImplementation("io.projectreactor:reactor-test")
testCompile("io.undertow:undertow-core") testImplementation("io.undertow:undertow-core")
testCompile("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
testCompile("org.apache.tomcat:tomcat-util") testImplementation("org.apache.tomcat:tomcat-util")
testCompile("org.eclipse.jetty:jetty-server") testImplementation("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet") testImplementation("org.eclipse.jetty:jetty-servlet")
testCompile("org.eclipse.jetty:jetty-reactive-httpclient") testImplementation("org.eclipse.jetty:jetty-reactive-httpclient")
testCompile('org.apache.httpcomponents.client5:httpclient5') testImplementation('org.apache.httpcomponents.client5:httpclient5')
testCompile('org.apache.httpcomponents.core5:httpcore5-reactive') testImplementation('org.apache.httpcomponents.core5:httpcore5-reactive')
testCompile("com.squareup.okhttp3:mockwebserver") testImplementation("com.squareup.okhttp3:mockwebserver")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime") testImplementation("org.jetbrains.kotlin:kotlin-script-runtime")
testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223") testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223")
testRuntime("org.jruby:jruby") testRuntimeOnly("org.jruby:jruby")
testRuntime("org.python:jython-standalone") testRuntimeOnly("org.python:jython-standalone")
testRuntime("org.synchronoss.cloud:nio-multipart-parser") testRuntimeOnly("org.synchronoss.cloud:nio-multipart-parser")
testRuntime("org.webjars:underscorejs") testRuntimeOnly("org.webjars:underscorejs")
testRuntime("org.glassfish:javax.el") testRuntimeOnly("org.glassfish:javax.el")
testRuntime("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-core")
testRuntime("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
testRuntime("com.sun.activation:javax.activation") testRuntimeOnly("com.sun.activation:javax.activation")
} }
test { test {

72
spring-webmvc/spring-webmvc.gradle
View File

@ -3,12 +3,12 @@ description = "Spring Web MVC"
apply plugin: "kotlin" apply plugin: "kotlin"
dependencies { dependencies {
compile(project(":spring-aop")) api(project(":spring-aop"))
compile(project(":spring-beans")) api(project(":spring-beans"))
compile(project(":spring-context")) api(project(":spring-context"))
compile(project(":spring-core")) api(project(":spring-core"))
compile(project(":spring-expression")) api(project(":spring-expression"))
compile(project(":spring-web")) api(project(":spring-web"))
compileOnly("javax.servlet:javax.servlet-api") compileOnly("javax.servlet:javax.servlet-api")
compileOnly("com.google.code.findbugs:findbugs") // for groovy-templates compileOnly("com.google.code.findbugs:findbugs") // for groovy-templates
optional(project(":spring-context-support")) // for FreeMarker support optional(project(":spring-context-support")) // for FreeMarker support
@ -37,38 +37,38 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.reactivestreams:reactive-streams") optional("org.reactivestreams:reactive-streams")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
testCompile(project(":kotlin-coroutines")) testImplementation(project(":kotlin-coroutines"))
testCompile(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-beans")))
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-context")))
testCompile(testFixtures(project(":spring-web"))) testImplementation(testFixtures(project(":spring-web")))
testCompile("javax.servlet:javax.servlet-api") testImplementation("javax.servlet:javax.servlet-api")
testCompile("org.eclipse.jetty:jetty-servlet") { testImplementation("org.eclipse.jetty:jetty-servlet") {
exclude group: "javax.servlet", module: "javax.servlet" exclude group: "javax.servlet", module: "javax.servlet"
} }
testCompile("org.eclipse.jetty:jetty-server") { testImplementation("org.eclipse.jetty:jetty-server") {
exclude group: "javax.servlet", module: "javax.servlet" exclude group: "javax.servlet", module: "javax.servlet"
} }
testCompile("org.apache.httpcomponents:httpclient") testImplementation("org.apache.httpcomponents:httpclient")
testCompile("commons-fileupload:commons-fileupload") testImplementation("commons-fileupload:commons-fileupload")
testCompile("commons-io:commons-io") testImplementation("commons-io:commons-io")
testCompile("joda-time:joda-time") testImplementation("joda-time:joda-time")
testCompile("org.mozilla:rhino") testImplementation("org.mozilla:rhino")
testCompile("org.dom4j:dom4j") testImplementation("org.dom4j:dom4j")
testCompile("jaxen:jaxen") testImplementation("jaxen:jaxen")
testCompile("org.xmlunit:xmlunit-assertj") testImplementation("org.xmlunit:xmlunit-assertj")
testCompile("org.xmlunit:xmlunit-matchers") testImplementation("org.xmlunit:xmlunit-matchers")
testCompile("org.hibernate:hibernate-validator") testImplementation("org.hibernate:hibernate-validator")
testCompile("javax.validation:validation-api") testImplementation("javax.validation:validation-api")
testCompile("io.projectreactor:reactor-core") testImplementation("io.projectreactor:reactor-core")
testCompile("io.reactivex.rxjava3:rxjava") testImplementation("io.reactivex.rxjava3:rxjava")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime") testImplementation("org.jetbrains.kotlin:kotlin-script-runtime")
testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223") testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223")
testRuntime("org.jruby:jruby") testRuntimeOnly("org.jruby:jruby")
testRuntime("org.python:jython-standalone") testRuntimeOnly("org.python:jython-standalone")
testRuntime("org.webjars:underscorejs") testRuntimeOnly("org.webjars:underscorejs")
testRuntime("org.glassfish:javax.el") testRuntimeOnly("org.glassfish:javax.el")
testRuntime("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-core")
testRuntime("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
testRuntime("com.sun.activation:javax.activation") testRuntimeOnly("com.sun.activation:javax.activation")
} }

16
spring-websocket/spring-websocket.gradle
View File

@ -1,9 +1,9 @@
description = "Spring WebSocket" description = "Spring WebSocket"
dependencies { dependencies {
compile(project(":spring-context")) api(project(":spring-context"))
compile(project(":spring-core")) api(project(":spring-core"))
compile(project(":spring-web")) api(project(":spring-web"))
optional(project(":spring-messaging")) optional(project(":spring-messaging"))
optional(project(":spring-webmvc")) optional(project(":spring-webmvc"))
optional("javax.servlet:javax.servlet-api") optional("javax.servlet:javax.servlet-api")
@ -21,9 +21,9 @@ dependencies {
optional("io.undertow:undertow-servlet") optional("io.undertow:undertow-servlet")
optional("io.undertow:undertow-websockets-jsr") optional("io.undertow:undertow-websockets-jsr")
optional("com.fasterxml.jackson.core:jackson-databind") optional("com.fasterxml.jackson.core:jackson-databind")
testCompile(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-core")))
testCompile(testFixtures(project(":spring-web"))) testImplementation(testFixtures(project(":spring-web")))
testCompile("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket") testImplementation("org.apache.tomcat.embed:tomcat-embed-websocket")
testCompile("io.projectreactor.netty:reactor-netty-http") testImplementation("io.projectreactor.netty:reactor-netty-http")
} }