diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 9ce87fbaf..000000000 --- a/build.gradle +++ /dev/null @@ -1,336 +0,0 @@ -buildscript { - repositories { - maven { url 'http://repo.spring.io/plugins-release' } - jcenter() - } - dependencies { - classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.2' - classpath 'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE' - classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1' - classpath 'io.spring.gradle:docbook-reference-plugin:0.3.0' - classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0' - classpath('org.asciidoctor:asciidoctorj:1.5.0') - } -} - -description = 'Spring Data Redis' -group = 'org.springframework.data' - -repositories { - maven { url "https://repo.spring.io/libs-snapshot" } - maven { url "https://repo.spring.io/plugins-release" } - maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } - mavenCentral() - jcenter() -} - -configurations { - sharedResources -} - -apply plugin: "java" -apply plugin: 'eclipse' -apply plugin: 'idea' -apply from: "$rootDir/maven.gradle" -apply plugin: 'bundlor' -apply plugin: 'javadocHotfix' -apply plugin: 'org.asciidoctor.gradle.asciidoctor' -apply plugin: 'docbook-reference' - -if (project.hasProperty('platformVersion')) { - apply plugin: 'spring-io' - - repositories { - maven { url "https://repo.spring.io/libs-snapshot" } - } - - dependencyManagement { - springIoTestRuntime { - imports { - mavenBom "io.spring.platform:platform-bom:${platformVersion}" - } - } - } -} - -[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial"] -[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial", "-Xlint:deprecation"] - -configurations.all { - - resolutionStrategy { - force 'org.apache.commons:commons-pool2:2.2' - } -} - -// Common dependencies -dependencies { - // Logging - compile "org.slf4j:slf4j-api:$slf4jVersion" - testRuntime "log4j:log4j:$log4jVersion" - testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion" - - // Spring Framework - compile("org.springframework:spring-core:$springVersion") { - exclude group: "commons-logging", module: "commons-logging" - } - compile "org.springframework:spring-context-support:$springVersion" - compile "org.springframework:spring-context:$springVersion" - compile "org.springframework:spring-tx:$springVersion" - compile("org.springframework:spring-oxm:$springVersion", optional) - compile "org.springframework:spring-aop:$springVersion" - - // Redis Drivers - compile("redis.clients:jedis:$jedisVersion", optional) - compile("com.github.spullara.redis:client:$srpVersion", optional) - compile("org.jredis:jredis-core-api:$jredisVersion", optional) - compile("org.jredis:jredis-core-ri:$jredisVersion", optional) - compile("biz.paluch.redis:lettuce:$lettuceVersion", optional) - - // Mappers - compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional) - compile("commons-beanutils:commons-beanutils:1.9.2", optional) - compile("com.fasterxml.jackson.core:jackson-core:$fasterXmlJacksonVersion", optional) - compile("com.fasterxml.jackson.core:jackson-databind:$fasterXmlJacksonDatabindVersion", optional) - - // Pool - compile("org.apache.commons:commons-pool2:2.2", optional) - - // Testing - testCompile "junit:junit:$junitVersion" - testCompile "org.springframework:spring-test:$springVersion" - testCompile "org.springframework:spring-jdbc:$springVersion" - testCompile 'org.testinfected.hamcrest-matchers:hamcrest-matchers:1.8' - testCompile "org.mockito:mockito-core:$mockitoVersion" - testCompile("javax.annotation:jsr250-api:1.0", optional) - testCompile("com.thoughtworks.xstream:xstream:1.4.8", optional) - testCompile("javax.transaction:jta:1.1") - - sharedResources "org.springframework.data.build:spring-data-build-resources:$springDataBuildVersion@zip" -} - -sourceCompatibility = 1.6 -targetCompatibility = 1.6 - -if (JavaVersion.current().isJava8Compatible()) { - allprojects { - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - } - } - } - -javadoc { - dependsOn = [ 'extractSharedResources' ] - - ext.srcDir = file("${projectDir}/docs/src/api") - destinationDir = file("${buildDir}/api") - ext.tmpDir = file("${buildDir}/api-work") - - configure(options) { - stylesheetFile = file("$buildDir/shared-resources/javadoc/spring-javadoc.css") - overview = "${srcDir}/overview.html" - docFilesSubDirs = true - outputLevel = org.gradle.external.javadoc.JavadocOutputLevel.QUIET - breakIterator = true - showFromProtected() - groups = [ - 'Spring Data Redis Support' : ['org.springframework.data.redis*'], - ] - - links = [ - "http://static.springframework.org/spring/docs/3.1.x/javadoc-api", - "http://download.oracle.com/javase/6/docs/api", - "http://jackson.codehaus.org/1.8.2/javadoc" - ] - - exclude "org/springframework/data/redis/config/**" - } - - title = "${rootProject.description} ${version} API" -} - -reference { - // Avoid copy with expansions - expandPlaceholders = ''; -} - -referencePdf { - dependsOn = [ 'asciidoctor' ] - sourceDir = asciidoctor.outputDir -} - -asciidoctor { - dependsOn = [ 'extractSharedResources' ] - backends = [ 'html5', 'docbook' ] - options = [ - doctype: 'book', - eruby: 'erubis', - attributes: [ - linkcss: true, - copycss : "$buildDir/shared-resources/asciidoc/spring.css", - icons : 'font', - 'source-highlighter': 'prettify', - sectanchors : true, - toclevels: '3', - sectids: false, - numbered: true, - version: project.version, - stylesheet: "spring.css", - ] - ] -} - -bundlor { - manifestTemplate = file("${projectDir}/template.mf").text -} - - -jar { - manifest.attributes["Created-By"] = "${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})" - manifest.attributes['Implementation-Title'] = 'spring-data-redis' - manifest.attributes['Implementation-Version'] = project.version - manifest.attributes['Implementation-URL'] = "http://projects.spring.io/spring-data-redis" - manifest.attributes['Implementation-Vendor'] = "Pivotal Software, Inc." - manifest.attributes['Implementation-Vendor-Id'] = "org.springframework" - - from("$rootDir/docs/src/info") { - include "license.txt" - include "notice.txt" - include "readme.txt" - include "changelog.txt" - into "META-INF" - expand(copyright: new Date().format('2011-yyyy'), version: project.version) - } -} - -task sourcesJar(type: Jar, dependsOn:classes) { - classifier = 'sources' - from sourceSets.main.allJava -} - -task javadocJar(type: Jar) { - classifier = 'javadoc' - from javadoc -} - -task docsZip(type: Zip, dependsOn:['asciidoctor', 'referencePdf' ]) { - - group = 'Distribution' - classifier = 'docs' - description = "Builds -${classifier} archive containing api and reference for deployment" - - from('docs/src/info') { - include 'changelog.txt' - } - - from (javadoc) { - into 'api' - } - - from (asciidoctor.outputDir) { - include "index.html" - include "spring.css" - into 'reference/html' - } - - from ("$buildDir/reference/pdf") { - into 'reference/pdf' - } -} - -task schemaZip(type: Zip) { - group = 'Distribution' - classifier = 'schema' - description = "Builds -${classifier} archive containing all XSDs for deployment" - - def Properties schemas = new Properties(); - - sourceSets.main.resources.find { - it.path.endsWith('META-INF' + File.separator + 'spring.schemas') - }?.withInputStream { schemas.load(it) } - - for (def key : schemas.keySet()) { - def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1') - def alias = key.replaceAll(/http.*schema.(.*).(spring-.*)/, '$2') - assert shortName != key - File xsdFile = sourceSets.main.resources.find { - it.path.replace('\\', '/').endsWith(schemas.get(key)) - } - assert xsdFile != null - - into (shortName) { - from xsdFile.path - rename { String fileName -> alias } - } - } -} - -task distZip(type: Zip, dependsOn: [jar, docsZip, schemaZip, sourcesJar, javadocJar]) { - group = 'Distribution' - classifier = 'dist' - description = "Builds -${classifier} archive, containing all jars and docs, " + - "suitable for community download page." - - ext.zipRootDir = "${project.name}-${project.version}" - - into (zipRootDir) { - from('docs/src/info') { - include 'readme.txt' - include 'license.txt' - include 'notice.txt' - expand(copyright: new Date().format('yyyy'), version: project.version) - } - - from(zipTree(docsZip.archivePath)) { - into "docs" - } - - from(zipTree(schemaZip.archivePath)) { - into "schema" - } - into ("dist") { - from rootProject.collect { project -> project.libsDir } - } - } -} - -tasks.withType(Test) { - systemProperty 'runLongTests', System.getProperty('runLongTests') - - testLogging { - exceptionFormat = 'full' - - afterSuite { desc, result -> - if (!desc.parent) { // will match the outermost suite - println "Test Summary: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)" - } - } - } -} - -artifacts { - archives sourcesJar - archives javadocJar - - archives docsZip - archives schemaZip - archives distZip -} - -task wrapper(type: Wrapper) { - description = 'Generates gradlew[.bat] scripts' - gradleVersion = '1.11' -} - -task extractSharedResources(type: Copy) { - - from { // use of closure defers evaluation until execution time - configurations.sharedResources.collect { zipTree(it)} //.matching { include 'asciidoc/*.css'}.files } - } - - into "$buildDir/shared-resources" -} - -assemble.dependsOn = ['jar', 'sourcesJar'] -defaultTasks 'build' diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index cf0d668be..000000000 --- a/gradle.properties +++ /dev/null @@ -1,14 +0,0 @@ -slf4jVersion=1.7.12 -junitVersion=4.12 -jredisVersion=06052013 -jedisVersion=2.7.3 -springVersion=4.1.9.RELEASE -springDataBuildVersion=1.7.4.BUILD-SNAPSHOT -log4jVersion=1.2.17 -version=1.6.4.BUILD-SNAPSHOT -srpVersion=0.7 -jacksonVersion=1.8.8 -fasterXmlJacksonVersion=2.6.4 -fasterXmlJacksonDatabindVersion=2.6.4 -lettuceVersion=3.3.Final -mockitoVersion=1.10.19 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a7634b071..000000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index f1facdf50..000000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Feb 12 10:01:55 CET 2014 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip diff --git a/gradlew b/gradlew deleted file mode 100755 index 91a7e269e..000000000 --- a/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# 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 -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -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" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - 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 -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "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, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # 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=$((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 -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index aec99730b..000000000 --- a/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/maven.gradle b/maven.gradle deleted file mode 100644 index 7e66ab706..000000000 --- a/maven.gradle +++ /dev/null @@ -1,84 +0,0 @@ -apply plugin: 'maven' - -ext.optionalDeps = [] -ext.providedDeps = [] - -ext.optional = { optionalDeps << it } -ext.provided = { providedDeps << it } - -install { - repositories.mavenInstaller { - customizePom(pom, project) - } -} - -def customizePom(pom, gradleProject) { - pom.whenConfigured { generatedPom -> - // respect 'optional' and 'provided' dependencies - gradleProject.optionalDeps.each { dep -> - generatedPom.dependencies.find { it.artifactId == dep.name }?.optional = true - } - gradleProject.providedDeps.each { dep -> - generatedPom.dependencies.find { it.artifactId == dep.name }?.scope = 'provided' - } - - // eliminate test-scoped dependencies (no need in maven central poms) - generatedPom.dependencies.removeAll { dep -> - dep.scope == 'test' - } - - // add all items necessary for maven central publication - generatedPom.project { - name = gradleProject.description - description = gradleProject.description - url = 'http://github.com/spring-projects/spring-data-redis' - organization { - name = 'Pivotal Software, Inc.' - url = 'http://projects.spring.io/spring-data-redis' - } - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - scm { - url = 'http://github.com/spring-projects/spring-data-redis' - connection = 'scm:git:git://github.com/spring-projects/spring-data-redis' - developerConnection = 'scm:git:git://github.com/spring-projects/spring-data-redis' - } - developers { - developer { - id = 'costin' - name = 'Costin Leau' - email = 'cleau@vmware.com' - properties { - twitter = 'costinl' - } - } - developer { - id = 'jencompgeek' - name = 'Jennifer Hickey' - properties { - twitter = 'jencompgeek' - } - } - developer { - id = 'christophstrobl' - name = 'Christoph Strobl' - properties { - twitter = 'stroblchristoph' - } - } - developer { - id = 'thomasdarimont' - name = 'Thomas Darimont' - properties { - twitter = 'thomasdarimont' - } - } - } - } - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index abbba828b..000000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'spring-data-redis' \ No newline at end of file