diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy index 99aac80a..6aa3af8c 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 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 @@ -24,7 +24,7 @@ import org.gradle.jvm.tasks.Jar * Adds the ability to depends on the test jar within other projects using: * * - * testCompile project(path: ':foo', configuration: 'tests') + * testImplementation project(path: ':foo', configuration: 'tests') * * * @author Rob Winch diff --git a/buildSrc/src/test/resources/samples/integrationtest/withgroovy/build.gradle b/buildSrc/src/test/resources/samples/integrationtest/withgroovy/build.gradle index b6f921f7..d37221fc 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withgroovy/build.gradle +++ b/buildSrc/src/test/resources/samples/integrationtest/withgroovy/build.gradle @@ -13,6 +13,6 @@ dependencies { testImplementation platform('org.junit:junit-bom:5.8.1') testImplementation 'org.junit.jupiter:junit-jupiter-api' testImplementation 'org.junit.jupiter:junit-jupiter-engine' - testCompile 'org.spockframework:spock-core:1.0-groovy-2.4' + testImplementation 'org.spockframework:spock-core:1.0-groovy-2.4' integrationTestCompile 'org.springframework:spring-core:4.3.7.RELEASE' } diff --git a/buildSrc/src/test/resources/samples/maven/install-with-springio/build.gradle b/buildSrc/src/test/resources/samples/maven/install-with-springio/build.gradle index a7466a07..306241e1 100644 --- a/buildSrc/src/test/resources/samples/maven/install-with-springio/build.gradle +++ b/buildSrc/src/test/resources/samples/maven/install-with-springio/build.gradle @@ -10,5 +10,5 @@ dependencies { testImplementation platform('org.junit:junit-bom:5.8.1') testImplementation 'org.junit.jupiter:junit-jupiter-api' testImplementation 'org.junit.jupiter:junit-jupiter-engine' - compile 'org.springframework:spring-core' -} \ No newline at end of file + implementation 'org.springframework:spring-core' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..7454180f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 28ff446a..ffed3a25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -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"); # 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 + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit 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. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac 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 [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then 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." fi 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. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - 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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --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 -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +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" "$@" diff --git a/spring-session-core/spring-session-core.gradle b/spring-session-core/spring-session-core.gradle index 13e154b7..4182f8cf 100644 --- a/spring-session-core/spring-session-core.gradle +++ b/spring-session-core/spring-session-core.gradle @@ -3,7 +3,7 @@ apply plugin: 'io.spring.convention.spring-module' description = "Spring Session" dependencies { - compile "org.springframework:spring-jcl" + api "org.springframework:spring-jcl" optional "io.projectreactor:reactor-core" optional "javax.annotation:javax.annotation-api" @@ -17,14 +17,14 @@ dependencies { optional "org.springframework.security:spring-security-core" optional "org.springframework.security:spring-security-web" - testCompile "io.projectreactor:reactor-test" - testCompile "org.mockito:mockito-core" - testCompile "edu.umd.cs.mtc:multithreadedtc" - testCompile "org.springframework:spring-test" - testCompile "org.assertj:assertj-core" - testCompile "org.springframework.security:spring-security-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testCompile "org.junit.jupiter:junit-jupiter-params" - testCompile "org.aspectj:aspectjweaver" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "io.projectreactor:reactor-test" + testImplementation "org.mockito:mockito-core" + testImplementation "edu.umd.cs.mtc:multithreadedtc" + testImplementation "org.springframework:spring-test" + testImplementation "org.assertj:assertj-core" + testImplementation "org.springframework.security:spring-security-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.aspectj:aspectjweaver" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" } diff --git a/spring-session-data-mongodb/spring-session-data-mongodb.gradle b/spring-session-data-mongodb/spring-session-data-mongodb.gradle index a9c6f7b2..8d24631e 100644 --- a/spring-session-data-mongodb/spring-session-data-mongodb.gradle +++ b/spring-session-data-mongodb/spring-session-data-mongodb.gradle @@ -4,11 +4,11 @@ description = "Spring Session and Spring MongoDB integration" dependencies { - compile project(':spring-session-core') + api project(':spring-session-core') // Spring Data MongoDB - compile("org.springframework.data:spring-data-mongodb") { + api("org.springframework.data:spring-data-mongodb") { exclude group: "org.mongodb", module: "mongo-java-driver" exclude group: "org.slf4j", module: "jcl-over-slf4j" } @@ -16,30 +16,30 @@ dependencies { // MongoDB dependencies optional "org.mongodb:mongodb-driver-core" - testCompile "org.mongodb:mongodb-driver-sync" - testCompile "org.mongodb:mongodb-driver-reactivestreams" + testImplementation "org.mongodb:mongodb-driver-sync" + testImplementation "org.mongodb:mongodb-driver-reactivestreams" integrationTestCompile "org.testcontainers:mongodb" // Everything else - compile "com.fasterxml.jackson.core:jackson-databind" - compile "org.springframework.security:spring-security-core" - compile "com.google.code.findbugs:jsr305" + api "com.fasterxml.jackson.core:jackson-databind" + api "org.springframework.security:spring-security-core" + api "com.google.code.findbugs:jsr305" optional "io.projectreactor:reactor-core" - testCompile "org.springframework:spring-web" - testCompile "org.springframework:spring-webflux" - testCompile "org.springframework.security:spring-security-config" - testCompile "org.springframework.security:spring-security-web" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-engine" - testCompile "org.junit.jupiter:junit-jupiter-params" - testCompile "org.springframework:spring-test" - testCompile "org.hamcrest:hamcrest" - testCompile "ch.qos.logback:logback-core" - testCompile "org.mockito:mockito-core" - testCompile "org.mockito:mockito-junit-jupiter" - testCompile "io.projectreactor:reactor-test" - testCompile "javax.servlet:javax.servlet-api" + testImplementation "org.springframework:spring-web" + testImplementation "org.springframework:spring-webflux" + testImplementation "org.springframework.security:spring-security-config" + testImplementation "org.springframework.security:spring-security-web" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.junit.jupiter:junit-jupiter-params" + testImplementation "org.springframework:spring-test" + testImplementation "org.hamcrest:hamcrest" + testImplementation "ch.qos.logback:logback-core" + testImplementation "org.mockito:mockito-core" + testImplementation "org.mockito:mockito-junit-jupiter" + testImplementation "io.projectreactor:reactor-test" + testImplementation "javax.servlet:javax.servlet-api" } diff --git a/spring-session-data-redis/spring-session-data-redis.gradle b/spring-session-data-redis/spring-session-data-redis.gradle index 12249499..e00c7ab4 100644 --- a/spring-session-data-redis/spring-session-data-redis.gradle +++ b/spring-session-data-redis/spring-session-data-redis.gradle @@ -3,23 +3,23 @@ apply plugin: 'io.spring.convention.spring-module' description = "Spring Session Redis implementation" dependencies { - compile project(':spring-session-core') - compile ("org.springframework.data:spring-data-redis") { + api project(':spring-session-core') + api ("org.springframework.data:spring-data-redis") { exclude group: "org.slf4j", module: 'jcl-over-slf4j' } optional "io.projectreactor:reactor-core" optional "org.springframework:spring-web" - testCompile "org.assertj:assertj-core" - testCompile "org.mockito:mockito-core" - testCompile "org.springframework:spring-test" - testCompile "io.projectreactor:reactor-test" - testCompile "javax.servlet:javax.servlet-api" - testCompile "org.springframework:spring-web" - testCompile "org.springframework.security:spring-security-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.assertj:assertj-core" + testImplementation "org.mockito:mockito-core" + testImplementation "org.springframework:spring-test" + testImplementation "io.projectreactor:reactor-test" + testImplementation "javax.servlet:javax.servlet-api" + testImplementation "org.springframework:spring-web" + testImplementation "org.springframework.security:spring-security-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "io.lettuce:lettuce-core" integrationTestCompile "org.testcontainers:testcontainers" diff --git a/spring-session-docs/spring-session-docs.gradle b/spring-session-docs/spring-session-docs.gradle index 1c463991..85dd2658 100644 --- a/spring-session-docs/spring-session-docs.gradle +++ b/spring-session-docs/spring-session-docs.gradle @@ -2,24 +2,24 @@ apply plugin: 'io.spring.convention.docs' apply plugin: 'io.spring.convention.spring-test' dependencies { - testCompile project(':spring-session-core') - testCompile project(':spring-session-data-redis') - testCompile project(':spring-session-hazelcast') - testCompile project(':spring-session-jdbc') - testCompile 'org.springframework:spring-jdbc' - testCompile 'org.springframework:spring-messaging' - testCompile 'org.springframework:spring-webmvc' - testCompile 'org.springframework:spring-websocket' - testCompile 'org.springframework.security:spring-security-config' - testCompile 'org.springframework.security:spring-security-web' - testCompile 'org.springframework.security:spring-security-test' - testCompile 'org.mockito:mockito-core' - testCompile 'org.springframework:spring-test' - testCompile 'org.assertj:assertj-core' - testCompile 'com.hazelcast:hazelcast' - testCompile 'io.lettuce:lettuce-core' - testCompile 'javax.servlet:javax.servlet-api' - testCompile 'org.junit.jupiter:junit-jupiter-api' + testImplementation project(':spring-session-core') + testImplementation project(':spring-session-data-redis') + testImplementation project(':spring-session-hazelcast') + testImplementation project(':spring-session-jdbc') + testImplementation 'org.springframework:spring-jdbc' + testImplementation 'org.springframework:spring-messaging' + testImplementation 'org.springframework:spring-webmvc' + testImplementation 'org.springframework:spring-websocket' + testImplementation 'org.springframework.security:spring-security-config' + testImplementation 'org.springframework.security:spring-security-web' + testImplementation 'org.springframework.security:spring-security-test' + testImplementation 'org.mockito:mockito-core' + testImplementation 'org.springframework:spring-test' + testImplementation 'org.assertj:assertj-core' + testImplementation 'com.hazelcast:hazelcast' + testImplementation 'io.lettuce:lettuce-core' + testImplementation 'javax.servlet:javax.servlet-api' + testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle index 8409c774..eac0d9b4 100644 --- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle +++ b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle @@ -20,19 +20,19 @@ artifacts { } dependencies { - compile project(':spring-session-core') + api project(':spring-session-core') optional "com.hazelcast:hazelcast:4.2.2" - compile "org.springframework:spring-context" - compile "javax.annotation:javax.annotation-api" + api "org.springframework:spring-context" + api "javax.annotation:javax.annotation-api" - testCompile "javax.servlet:javax.servlet-api" - testCompile "org.assertj:assertj-core" - testCompile "org.mockito:mockito-core" - testCompile "org.springframework:spring-test" - testCompile "org.springframework:spring-web" - testCompile "org.junit.jupiter:junit-jupiter-api" - testCompile "org.springframework.security:spring-security-core" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "javax.servlet:javax.servlet-api" + testImplementation "org.assertj:assertj-core" + testImplementation "org.mockito:mockito-core" + testImplementation "org.springframework:spring-test" + testImplementation "org.springframework:spring-web" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.springframework.security:spring-security-core" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.testcontainers:testcontainers" integrationTestCompile "com.hazelcast:hazelcast:4.2" diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle index 133814dd..408664a8 100644 --- a/spring-session-hazelcast/spring-session-hazelcast.gradle +++ b/spring-session-hazelcast/spring-session-hazelcast.gradle @@ -5,23 +5,23 @@ configurations { } dependencies { - compile project(':spring-session-core') - compile "com.hazelcast:hazelcast" - compile "javax.annotation:javax.annotation-api" - compile "org.springframework:spring-context" + api project(':spring-session-core') + api "com.hazelcast:hazelcast" + api "javax.annotation:javax.annotation-api" + api "org.springframework:spring-context" hazelcast4(project(path: ":hazelcast4", configuration: 'classesOnlyElements')) compileOnly(project(":hazelcast4")) - testCompile "javax.servlet:javax.servlet-api" - testCompile "org.assertj:assertj-core" - testCompile "org.mockito:mockito-core" - testCompile "org.springframework:spring-test" - testCompile "org.springframework:spring-web" - testCompile "org.springframework.security:spring-security-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime project(':hazelcast4') - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "javax.servlet:javax.servlet-api" + testImplementation "org.assertj:assertj-core" + testImplementation "org.mockito:mockito-core" + testImplementation "org.springframework:spring-test" + testImplementation "org.springframework:spring-web" + testImplementation "org.springframework.security:spring-security-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly project(':hazelcast4') + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "com.hazelcast:hazelcast-client" integrationTestCompile "org.testcontainers:testcontainers" diff --git a/spring-session-jdbc/spring-session-jdbc.gradle b/spring-session-jdbc/spring-session-jdbc.gradle index 935edd0e..21867b21 100644 --- a/spring-session-jdbc/spring-session-jdbc.gradle +++ b/spring-session-jdbc/spring-session-jdbc.gradle @@ -3,18 +3,18 @@ apply plugin: 'io.spring.convention.spring-module' description = "Spring Session and Spring JDBC integration" dependencies { - compile project(':spring-session-core') - compile "org.springframework:spring-context" - compile "org.springframework:spring-jdbc" + api project(':spring-session-core') + api "org.springframework:spring-context" + api "org.springframework:spring-jdbc" - testCompile "javax.servlet:javax.servlet-api" - testCompile "org.assertj:assertj-core" - testCompile "org.mockito:mockito-core" - testCompile "org.springframework:spring-test" - testCompile "org.springframework:spring-web" - testCompile "org.springframework.security:spring-security-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "javax.servlet:javax.servlet-api" + testImplementation "org.assertj:assertj-core" + testImplementation "org.mockito:mockito-core" + testImplementation "org.springframework:spring-test" + testImplementation "org.springframework:spring-web" + testImplementation "org.springframework.security:spring-security-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "com.h2database:h2" integrationTestCompile "com.ibm.db2:jcc" diff --git a/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle b/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle index e6cbe74a..de80f594 100644 --- a/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle +++ b/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle @@ -1,23 +1,23 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-security" - compile "org.springframework.boot:spring-boot-starter-data-redis" - compile "org.springframework.boot:spring-boot-devtools" - compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" - compile "org.webjars:bootstrap" - compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator-core" - compile "com.maxmind.geoip2:geoip2" - compile "org.apache.httpcomponents:httpclient" + implementation project(':spring-session-data-redis') + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-starter-data-redis" + implementation "org.springframework.boot:spring-boot-devtools" + implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" + implementation "org.webjars:bootstrap" + implementation "org.webjars:html5shiv" + implementation "org.webjars:webjars-locator-core" + implementation "com.maxmind.geoip2:geoip2" + implementation "org.apache.httpcomponents:httpclient" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-boot-hazelcast/spring-session-sample-boot-hazelcast.gradle b/spring-session-samples/spring-session-sample-boot-hazelcast/spring-session-sample-boot-hazelcast.gradle index b997454c..ff266283 100644 --- a/spring-session-samples/spring-session-sample-boot-hazelcast/spring-session-sample-boot-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-boot-hazelcast/spring-session-sample-boot-hazelcast.gradle @@ -1,20 +1,20 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-hazelcast') - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-actuator" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-security" - compile "com.hazelcast:hazelcast" - compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" - compile "org.webjars:bootstrap" - compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator-core" + implementation project(':spring-session-hazelcast') + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-actuator" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "com.hazelcast:hazelcast" + implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" + implementation "org.webjars:bootstrap" + implementation "org.webjars:html5shiv" + implementation "org.webjars:webjars-locator-core" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" } diff --git a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle b/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle index aaca71db..69e068c9 100644 --- a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle +++ b/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle @@ -1,21 +1,21 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-hazelcast') - compile project(':hazelcast4') - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-actuator" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-security" - compile "com.hazelcast:hazelcast:4.2.2" - compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" - compile "org.webjars:bootstrap" - compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator-core" + implementation project(':spring-session-hazelcast') + implementation project(':hazelcast4') + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-actuator" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "com.hazelcast:hazelcast:4.2.2" + implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" + implementation "org.webjars:bootstrap" + implementation "org.webjars:html5shiv" + implementation "org.webjars:webjars-locator-core" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" } diff --git a/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle b/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle index 13c12e46..68d38855 100644 --- a/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle @@ -1,21 +1,21 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-jdbc') - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-security" - compile "org.springframework.boot:spring-boot-devtools" - compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" - compile "org.webjars:bootstrap" - compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator-core" - compile "com.h2database:h2" + implementation project(':spring-session-jdbc') + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-devtools" + implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" + implementation "org.webjars:bootstrap" + implementation "org.webjars:html5shiv" + implementation "org.webjars:webjars-locator-core" + implementation "com.h2database:h2" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-reactive/spring-session-sample-boot-mongodb-reactive.gradle b/spring-session-samples/spring-session-sample-boot-mongodb-reactive/spring-session-sample-boot-mongodb-reactive.gradle index 7e66de61..f4bb6fe6 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-reactive/spring-session-sample-boot-mongodb-reactive.gradle +++ b/spring-session-samples/spring-session-sample-boot-mongodb-reactive/spring-session-sample-boot-mongodb-reactive.gradle @@ -1,13 +1,13 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-mongodb') - compile "org.springframework.boot:spring-boot-starter-webflux" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-data-mongodb-reactive" - compile "de.flapdoodle.embed:de.flapdoodle.embed.mongo" + implementation project(':spring-session-data-mongodb') + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-data-mongodb-reactive" + implementation "de.flapdoodle.embed:de.flapdoodle.embed.mongo" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.seleniumhq.selenium:htmlunit-driver" - testCompile "org.seleniumhq.selenium:selenium-support" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.seleniumhq.selenium:htmlunit-driver" + testImplementation "org.seleniumhq.selenium:selenium-support" } diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/spring-session-sample-boot-mongodb-traditional.gradle b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/spring-session-sample-boot-mongodb-traditional.gradle index 9323d621..79e19b78 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/spring-session-sample-boot-mongodb-traditional.gradle +++ b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/spring-session-sample-boot-mongodb-traditional.gradle @@ -1,17 +1,17 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-mongodb') - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" - compile "org.thymeleaf.extras:thymeleaf-extras-springsecurity5" - compile "org.springframework.boot:spring-boot-starter-data-mongodb" - compile "org.springframework.boot:spring-boot-starter-security" - compile "de.flapdoodle.embed:de.flapdoodle.embed.mongo" + implementation project(':spring-session-data-mongodb') + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" + implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5" + implementation "org.springframework.boot:spring-boot-starter-data-mongodb" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "de.flapdoodle.embed:de.flapdoodle.embed.mongo" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.seleniumhq.selenium:htmlunit-driver" - testCompile "org.seleniumhq.selenium:selenium-support" - testCompile "org.springframework.security:spring-security-test" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.seleniumhq.selenium:htmlunit-driver" + testImplementation "org.seleniumhq.selenium:selenium-support" + testImplementation "org.springframework.security:spring-security-test" } diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle index 1181e072..9e4cb204 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle +++ b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle @@ -1,23 +1,23 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-security" - compile "org.springframework.boot:spring-boot-starter-data-redis" - compile "org.springframework.boot:spring-boot-devtools" - compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" - compile "org.webjars:bootstrap" - compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator-core" - compile "org.apache.httpcomponents:httpclient" + implementation project(':spring-session-data-redis') + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-starter-data-redis" + implementation "org.springframework.boot:spring-boot-devtools" + implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" + implementation "org.webjars:bootstrap" + implementation "org.webjars:html5shiv" + implementation "org.webjars:webjars-locator-core" + implementation "org.apache.httpcomponents:httpclient" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.assertj:assertj-core" - testCompile "org.skyscreamer:jsonassert" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.assertj:assertj-core" + testImplementation "org.skyscreamer:jsonassert" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-boot-redis-simple/spring-session-sample-boot-redis-simple.gradle b/spring-session-samples/spring-session-sample-boot-redis-simple/spring-session-sample-boot-redis-simple.gradle index b919150a..701dec3b 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-simple/spring-session-sample-boot-redis-simple.gradle +++ b/spring-session-samples/spring-session-sample-boot-redis-simple/spring-session-sample-boot-redis-simple.gradle @@ -1,20 +1,20 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-redis') - compile 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect' - compile 'org.springframework.boot:spring-boot-starter-data-redis' - compile 'org.springframework.boot:spring-boot-starter-security' - compile 'org.springframework.boot:spring-boot-starter-thymeleaf' - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-devtools' - compile 'org.webjars:bootstrap' - compile 'org.webjars:html5shiv' - compile 'org.webjars:webjars-locator-core' + implementation project(':spring-session-data-redis') + implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect' + implementation 'org.springframework.boot:spring-boot-starter-data-redis' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-devtools' + implementation 'org.webjars:bootstrap' + implementation 'org.webjars:html5shiv' + implementation 'org.webjars:webjars-locator-core' - testCompile 'org.junit.jupiter:junit-jupiter-api' - testRuntime 'org.junit.jupiter:junit-jupiter-engine' - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testImplementation 'org.springframework.boot:spring-boot-starter-test' integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle b/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle index 88356c5b..c5a24077 100644 --- a/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle +++ b/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle @@ -1,20 +1,20 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-security" - compile "org.springframework.boot:spring-boot-starter-data-redis" - compile "org.springframework.boot:spring-boot-devtools" - compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" - compile "org.webjars:bootstrap" - compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator-core" + implementation project(':spring-session-data-redis') + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-starter-data-redis" + implementation "org.springframework.boot:spring-boot-devtools" + implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" + implementation "org.webjars:bootstrap" + implementation "org.webjars:html5shiv" + implementation "org.webjars:webjars-locator-core" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/spring-session-sample-boot-webflux-custom-cookie.gradle b/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/spring-session-sample-boot-webflux-custom-cookie.gradle index 0adbcea8..adc7d260 100644 --- a/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/spring-session-sample-boot-webflux-custom-cookie.gradle +++ b/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/spring-session-sample-boot-webflux-custom-cookie.gradle @@ -1,16 +1,16 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework.boot:spring-boot-starter-webflux" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-data-redis" - compile "org.springframework.boot:spring-boot-devtools" - compile 'org.webjars:bootstrap' + implementation project(':spring-session-data-redis') + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-data-redis" + implementation "org.springframework.boot:spring-boot-devtools" + implementation 'org.webjars:bootstrap' - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-boot-webflux/spring-session-sample-boot-webflux.gradle b/spring-session-samples/spring-session-sample-boot-webflux/spring-session-sample-boot-webflux.gradle index 0adbcea8..2e1ef1c4 100644 --- a/spring-session-samples/spring-session-sample-boot-webflux/spring-session-sample-boot-webflux.gradle +++ b/spring-session-samples/spring-session-sample-boot-webflux/spring-session-sample-boot-webflux.gradle @@ -1,16 +1,16 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework.boot:spring-boot-starter-webflux" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-data-redis" - compile "org.springframework.boot:spring-boot-devtools" - compile 'org.webjars:bootstrap' + implementation project(':spring-session-data-redis') + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-data-redis" + implementation "org.springframework.boot:spring-boot-devtools" + implementation 'org.webjars:bootstrap' - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle b/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle index c8af6936..1efd7e62 100644 --- a/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle +++ b/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle @@ -1,31 +1,31 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-thymeleaf" - compile "org.springframework.boot:spring-boot-starter-security" - compile "org.springframework.boot:spring-boot-starter-data-jpa" - compile "org.springframework.boot:spring-boot-starter-data-redis" - compile "org.springframework.boot:spring-boot-starter-websocket" - compile "org.springframework.boot:spring-boot-starter-validation" - compile "org.springframework.boot:spring-boot-devtools" - compile "org.springframework:spring-websocket" - compile "org.springframework.security:spring-security-messaging" - compile "org.springframework.security:spring-security-data" - compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" - compile "org.webjars:bootstrap" - compile "org.webjars:html5shiv" - compile "org.webjars:knockout" - compile "org.webjars:sockjs-client" - compile "org.webjars:stomp-websocket" - compile "org.webjars:webjars-locator-core" - compile "com.h2database:h2" + implementation project(':spring-session-data-redis') + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-starter-data-jpa" + implementation "org.springframework.boot:spring-boot-starter-data-redis" + implementation "org.springframework.boot:spring-boot-starter-websocket" + implementation "org.springframework.boot:spring-boot-starter-validation" + implementation "org.springframework.boot:spring-boot-devtools" + implementation "org.springframework:spring-websocket" + implementation "org.springframework.security:spring-security-messaging" + implementation "org.springframework.security:spring-security-data" + implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" + implementation "org.webjars:bootstrap" + implementation "org.webjars:html5shiv" + implementation "org.webjars:knockout" + implementation "org.webjars:sockjs-client" + implementation "org.webjars:stomp-websocket" + implementation "org.webjars:webjars-locator-core" + implementation "com.h2database:h2" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.springframework.security:spring-security-test" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.springframework.security:spring-security-test" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.testcontainers:testcontainers" } diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle index 96d29a8c..533a04bc 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle @@ -4,24 +4,24 @@ plugins { } dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework:spring-web" - compile "io.lettuce:lettuce-core" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" - compile "org.apache.taglibs:taglibs-standard-jstlel" - compile "org.slf4j:slf4j-api" - compile "org.slf4j:jcl-over-slf4j" - compile "org.slf4j:log4j-over-slf4j" - compile "ch.qos.logback:logback-classic" - compile "org.testcontainers:testcontainers" + implementation project(':spring-session-data-redis') + implementation "org.springframework:spring-web" + implementation "io.lettuce:lettuce-core" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" + implementation "org.apache.taglibs:taglibs-standard-jstlel" + implementation "org.slf4j:slf4j-api" + implementation "org.slf4j:jcl-over-slf4j" + implementation "org.slf4j:log4j-over-slf4j" + implementation "ch.qos.logback:logback-classic" + implementation "org.testcontainers:testcontainers" providedCompile "javax.servlet:javax.servlet-api" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle index 051df2c8..a044cdb3 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle @@ -4,27 +4,27 @@ plugins { } dependencies { - compile project(':spring-session-hazelcast') - compile project(':hazelcast4') - compile "org.springframework:spring-web" - compile "org.springframework.security:spring-security-config" - compile "org.springframework.security:spring-security-web" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile "com.hazelcast:hazelcast-client" - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" - compile "org.apache.taglibs:taglibs-standard-jstlel" - compile "org.slf4j:slf4j-api" - compile "org.slf4j:jcl-over-slf4j" - compile "org.slf4j:log4j-over-slf4j" - compile "ch.qos.logback:logback-classic" + implementation project(':spring-session-hazelcast') + implementation project(':hazelcast4') + implementation "org.springframework:spring-web" + implementation "org.springframework.security:spring-security-config" + implementation "org.springframework.security:spring-security-web" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation "com.hazelcast:hazelcast-client" + implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" + implementation "org.apache.taglibs:taglibs-standard-jstlel" + implementation "org.slf4j:slf4j-api" + implementation "org.slf4j:jcl-over-slf4j" + implementation "org.slf4j:log4j-over-slf4j" + implementation "ch.qos.logback:logback-classic" providedCompile "javax.servlet:javax.servlet-api" providedCompile "javax.servlet.jsp:javax.servlet.jsp-api" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle index 38f67e10..7308dd06 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle @@ -4,23 +4,23 @@ plugins { } dependencies { - compile project(':spring-session-jdbc') - compile "org.springframework:spring-web" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile "com.h2database:h2" - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" - compile "org.apache.taglibs:taglibs-standard-jstlel" - compile "org.slf4j:slf4j-api" - compile "org.slf4j:jcl-over-slf4j" - compile "org.slf4j:log4j-over-slf4j" - compile "ch.qos.logback:logback-classic" + implementation project(':spring-session-jdbc') + implementation "org.springframework:spring-web" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation "com.h2database:h2" + implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" + implementation "org.apache.taglibs:taglibs-standard-jstlel" + implementation "org.slf4j:slf4j-api" + implementation "org.slf4j:jcl-over-slf4j" + implementation "org.slf4j:log4j-over-slf4j" + implementation "ch.qos.logback:logback-classic" providedCompile "javax.servlet:javax.servlet-api" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle index 96d29a8c..b1232e23 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle @@ -4,24 +4,24 @@ plugins { } dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework:spring-web" - compile "io.lettuce:lettuce-core" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" - compile "org.apache.taglibs:taglibs-standard-jstlel" - compile "org.slf4j:slf4j-api" - compile "org.slf4j:jcl-over-slf4j" - compile "org.slf4j:log4j-over-slf4j" - compile "ch.qos.logback:logback-classic" - compile "org.testcontainers:testcontainers" + implementation project(':spring-session-data-redis') + implementation "org.springframework:spring-web" + implementation "io.lettuce:lettuce-core" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" + implementation "org.apache.taglibs:taglibs-standard-jstlel" + implementation "org.slf4j:slf4j-api" + implementation "org.slf4j:jcl-over-slf4j" + implementation "org.slf4j:log4j-over-slf4j" + implementation "ch.qos.logback:logback-classic" + implementation "org.testcontainers:testcontainers" providedCompile "javax.servlet:javax.servlet-api" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle index 1a784bc3..7a9bc6e1 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle @@ -4,27 +4,27 @@ plugins { } dependencies { - compile project(':spring-session-data-redis') - compile "io.lettuce:lettuce-core" - compile "org.springframework:spring-webmvc" - compile "org.springframework.security:spring-security-config" - compile "org.springframework.security:spring-security-web" - compile "com.fasterxml.jackson.core:jackson-databind" - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" - compile "org.apache.taglibs:taglibs-standard-jstlel" - compile "org.slf4j:slf4j-api" - compile "org.slf4j:jcl-over-slf4j" - compile "org.slf4j:log4j-over-slf4j" - compile "ch.qos.logback:logback-classic" - compile "org.testcontainers:testcontainers" + implementation project(':spring-session-data-redis') + implementation "io.lettuce:lettuce-core" + implementation "org.springframework:spring-webmvc" + implementation "org.springframework.security:spring-security-config" + implementation "org.springframework.security:spring-security-web" + implementation "com.fasterxml.jackson.core:jackson-databind" + implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" + implementation "org.apache.taglibs:taglibs-standard-jstlel" + implementation "org.slf4j:slf4j-api" + implementation "org.slf4j:jcl-over-slf4j" + implementation "org.slf4j:log4j-over-slf4j" + implementation "ch.qos.logback:logback-classic" + implementation "org.testcontainers:testcontainers" providedCompile "javax.servlet:javax.servlet-api" - testCompile "org.springframework.security:spring-security-test" - testCompile "org.assertj:assertj-core" - testCompile "org.springframework:spring-test" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.springframework.security:spring-security-test" + testImplementation "org.assertj:assertj-core" + testImplementation "org.springframework:spring-test" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" } gretty { diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle index 9b203637..da4e5e34 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle @@ -4,28 +4,28 @@ plugins { } dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework:spring-web" - compile "org.springframework.security:spring-security-config" - compile "org.springframework.security:spring-security-web" - compile "io.lettuce:lettuce-core" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" - compile "org.apache.taglibs:taglibs-standard-jstlel" - compile "org.slf4j:slf4j-api" - compile "org.slf4j:jcl-over-slf4j" - compile "org.slf4j:log4j-over-slf4j" - compile "ch.qos.logback:logback-classic" - compile "org.testcontainers:testcontainers" + implementation project(':spring-session-data-redis') + implementation "org.springframework:spring-web" + implementation "org.springframework.security:spring-security-config" + implementation "org.springframework.security:spring-security-web" + implementation "io.lettuce:lettuce-core" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" + implementation "org.apache.taglibs:taglibs-standard-jstlel" + implementation "org.slf4j:slf4j-api" + implementation "org.slf4j:jcl-over-slf4j" + implementation "org.slf4j:log4j-over-slf4j" + implementation "ch.qos.logback:logback-classic" + implementation "org.testcontainers:testcontainers" providedCompile "javax.servlet:javax.servlet-api" providedCompile "javax.servlet.jsp:javax.servlet.jsp-api" - testCompile "org.assertj:assertj-core" - testCompile "org.springframework:spring-test" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.assertj:assertj-core" + testImplementation "org.springframework:spring-test" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle index d9f4e90e..926c6c0b 100644 --- a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle @@ -4,22 +4,22 @@ plugins { } dependencies { - compile project(':spring-session-core') - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile "com.hazelcast:hazelcast-client" - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" - compile "org.apache.taglibs:taglibs-standard-jstlel" - compile "org.slf4j:slf4j-api" - compile "org.slf4j:jcl-over-slf4j" - compile "org.slf4j:log4j-over-slf4j" - compile "ch.qos.logback:logback-classic" + implementation project(':spring-session-core') + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation "com.hazelcast:hazelcast-client" + implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" + implementation "org.apache.taglibs:taglibs-standard-jstlel" + implementation "org.slf4j:slf4j-api" + implementation "org.slf4j:jcl-over-slf4j" + implementation "org.slf4j:log4j-over-slf4j" + implementation "ch.qos.logback:logback-classic" providedCompile "javax.servlet:javax.servlet-api" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle index 637a1c4b..55fc55c6 100644 --- a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle @@ -4,23 +4,23 @@ plugins { } dependencies { - compile project(':spring-session-jdbc') - compile "org.springframework:spring-web" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile "com.h2database:h2" - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" - compile "org.apache.taglibs:taglibs-standard-jstlel" - compile "org.slf4j:slf4j-api" - compile "org.slf4j:jcl-over-slf4j" - compile "org.slf4j:log4j-over-slf4j" - compile "ch.qos.logback:logback-classic" + implementation project(':spring-session-jdbc') + implementation "org.springframework:spring-web" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation "com.h2database:h2" + implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" + implementation "org.apache.taglibs:taglibs-standard-jstlel" + implementation "org.slf4j:slf4j-api" + implementation "org.slf4j:jcl-over-slf4j" + implementation "org.slf4j:log4j-over-slf4j" + implementation "ch.qos.logback:logback-classic" providedCompile "javax.servlet:javax.servlet-api" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support" diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle index 64185249..b1232e23 100644 --- a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle +++ b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle @@ -4,24 +4,24 @@ plugins { } dependencies { - compile project(':spring-session-data-redis') - compile "org.springframework:spring-web" - compile "io.lettuce:lettuce-core" - compile "org.webjars:bootstrap" - compile "org.webjars:webjars-taglib" - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" - compile "org.apache.taglibs:taglibs-standard-jstlel" - compile "org.slf4j:slf4j-api" - compile "org.slf4j:jcl-over-slf4j" - compile "org.slf4j:log4j-over-slf4j" - compile "ch.qos.logback:logback-classic" - compile "org.testcontainers:testcontainers" + implementation project(':spring-session-data-redis') + implementation "org.springframework:spring-web" + implementation "io.lettuce:lettuce-core" + implementation "org.webjars:bootstrap" + implementation "org.webjars:webjars-taglib" + implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api" + implementation "org.apache.taglibs:taglibs-standard-jstlel" + implementation "org.slf4j:slf4j-api" + implementation "org.slf4j:jcl-over-slf4j" + implementation "org.slf4j:log4j-over-slf4j" + implementation "ch.qos.logback:logback-classic" + implementation "org.testcontainers:testcontainers" providedCompile "javax.servlet:javax.servlet-api" - testCompile "org.assertj:assertj-core" - testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntime "org.junit.jupiter:junit-jupiter-engine" + testImplementation "org.assertj:assertj-core" + testImplementation "org.junit.jupiter:junit-jupiter-api" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver" integrationTestCompile "org.seleniumhq.selenium:selenium-support"