diff --git a/.gitignore b/.gitignore index 8f5b82e..6ae0f97 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ .settings .metadata target +build Servers +.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a3c2a5c --- /dev/null +++ b/build.gradle @@ -0,0 +1,66 @@ +buildscript { + repositories { + maven { url 'http://repo.springsource.org/plugins-release' } + } + dependencies { + classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.5' + } +} + +ext { + springVersion = "3.0.7.RELEASE" + tomcatVersion = "7.0.42" + + springAmqpVersion = "1.0.0.RELEASE" + springDataRedisVersion = "1.0.0.RELEASE" + springDataMongoVersion = "1.0.1.RELEASE" + + commonDbcpVersion = "1.3" + + mysqlDriverVersion = "5.0.5" + mariadbDriverVersion = "1.1.3" + postgresDriverVersion = "9.0-801.jdbc4" + javaxMailVersion = "1.4.7" + cglibVersion = "2.2.2" + + jacksonVersion = "2.2.2" + + log4jVersion = "1.2.14" + + junitVersion = "4.11" + mockitoVersion = "1.9.5" +} + +subprojects { + apply plugin: 'java' + apply plugin: 'maven' + apply plugin: 'propdeps' + apply plugin: 'propdeps-maven' + apply plugin: 'propdeps-idea' + apply plugin: 'propdeps-eclipse' + + sourceCompatibility = 1.6 + targetCompatibility = 1.6 + + task packageSources(type: Jar) { + classifier = 'sources' + from sourceSets.main.allSource + } + + artifacts.archives packageSources + + dependencies { + testCompile("junit:junit:$junitVersion") + testCompile("org.mockito:mockito-core:$mockitoVersion") + } + + repositories { + mavenLocal() + + maven { url "http://repo.spring.io/snapshot" } + maven { url "http://repo.spring.io/milestone" } + maven { url "http://repo.spring.io/libs-milestone" } + maven { url "http://repo.maven.apache.org/maven2" } + } +} + diff --git a/cloudfoundry-connector/.gitignore b/cloudfoundry-connector/.gitignore index 916e17c..bd39306 100644 --- a/cloudfoundry-connector/.gitignore +++ b/cloudfoundry-connector/.gitignore @@ -1 +1,2 @@ dependency-reduced-pom.xml +/bin diff --git a/cloudfoundry-connector/build.gradle b/cloudfoundry-connector/build.gradle new file mode 100644 index 0000000..99698f8 --- /dev/null +++ b/cloudfoundry-connector/build.gradle @@ -0,0 +1,36 @@ +description = 'Spring-Cloud CloudFoundry Connector' + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.github.jengelman.gradle.plugins:shadow:0.8' + } +} + +apply plugin: 'shadow' + +dependencies { + compile project(':core') + compile("com.fasterxml.jackson.core:jackson-core:$jacksonVersion") + compile("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") +} + +shadow { + relocation { + pattern = 'com.fasterxml.jackson' + shadedPattern = 'org.springframework.cloud.cloudfoundry.com.fasterxml.jackson' + } +} + +task moveShadowJar(type: Copy) { + from "$buildDir/distributions/${archivesBaseName}-${version}-shadow.jar" + into "$buildDir/libs" + rename { String fileName -> + fileName.replace('-shadow', '') + } +} + +moveShadowJar.dependsOn shadowJar +assemble.dependsOn moveShadowJar \ No newline at end of file diff --git a/cloudfoundry-connector/pom.xml b/cloudfoundry-connector/pom.xml deleted file mode 100644 index 73850a9..0000000 --- a/cloudfoundry-connector/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - cloudfoundry-connector - jar - Spring-Cloud CloudFoundry Connector - http://www.springframework.org - - - org.springframework.cloud - parent - 0.9.6.BUILD-SNAPSHOT - ../parent/pom.xml - - - 2.2.2 - - - - - org.springframework.cloud - core - ${project.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-all - ${mockito.version} - test - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - package - - shade - - - - - com.fasterxml.jackson.core:* - - - - - com.fasterxml.jackson - org.springframework.cloud.cloudfoundry.com.fasterxml.jackson - - - - - - - - - diff --git a/core/.gitignore b/core/.gitignore new file mode 100644 index 0000000..5e56e04 --- /dev/null +++ b/core/.gitignore @@ -0,0 +1 @@ +/bin diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 0000000..24edb3d --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,16 @@ +description = 'Spring-Cloud Core' + +configurations { + tests +} + +task testJar(type: Jar) { + classifier = 'tests' + from sourceSets.test.output.classesDir +} + +build.dependsOn testJar + +artifacts { + tests testJar +} \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml deleted file mode 100644 index f6e1abb..0000000 --- a/core/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - core - jar - Cloud Core - http://www.springframework.org - - - - - org.springframework.cloud - parent - 0.9.6.BUILD-SNAPSHOT - ../parent/pom.xml - - - - - junit - junit - ${junit.version} - provided - - - diff --git a/core/src/test/java/org/springframework/cloud/CloudFactoryTest.java b/core/src/test/java/org/springframework/cloud/CloudFactoryTest.java index 2c96d8e..16f2a25 100644 --- a/core/src/test/java/org/springframework/cloud/CloudFactoryTest.java +++ b/core/src/test/java/org/springframework/cloud/CloudFactoryTest.java @@ -6,9 +6,9 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; +import org.springframework.cloud.CloudTestUtil.StubCloudConnector; import org.springframework.cloud.service.ServiceConnectorCreator; import org.springframework.cloud.service.ServiceInfo; -import org.springframework.cloud.test.CloudTestUtil.StubCloudConnector; /** * diff --git a/core/src/test/java/org/springframework/cloud/CloudTest.java b/core/src/test/java/org/springframework/cloud/CloudTest.java index 925272a..496a12a 100644 --- a/core/src/test/java/org/springframework/cloud/CloudTest.java +++ b/core/src/test/java/org/springframework/cloud/CloudTest.java @@ -12,14 +12,13 @@ import java.util.Properties; import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.CloudTestUtil.StubApplicationInstanceInfo; +import org.springframework.cloud.CloudTestUtil.StubCloudConnector; +import org.springframework.cloud.CloudTestUtil.StubServiceInfo; import org.springframework.cloud.service.BaseServiceInfo; import org.springframework.cloud.service.ServiceConnectorConfig; import org.springframework.cloud.service.ServiceConnectorCreator; import org.springframework.cloud.service.ServiceInfo; -import org.springframework.cloud.test.CloudTestUtil; -import org.springframework.cloud.test.CloudTestUtil.StubApplicationInstanceInfo; -import org.springframework.cloud.test.CloudTestUtil.StubCloudConnector; -import org.springframework.cloud.test.CloudTestUtil.StubServiceInfo; /** * diff --git a/core/src/main/java/org/springframework/cloud/test/CloudTestUtil.java b/core/src/test/java/org/springframework/cloud/CloudTestUtil.java similarity index 98% rename from core/src/main/java/org/springframework/cloud/test/CloudTestUtil.java rename to core/src/test/java/org/springframework/cloud/CloudTestUtil.java index 9becfb7..029be7d 100644 --- a/core/src/main/java/org/springframework/cloud/test/CloudTestUtil.java +++ b/core/src/test/java/org/springframework/cloud/CloudTestUtil.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.test; +package org.springframework.cloud; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java b/core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java index 4c92532..f7156c0 100644 --- a/core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java +++ b/core/src/test/java/org/springframework/cloud/StubServiceConnectorCreator.java @@ -1,8 +1,8 @@ package org.springframework.cloud; +import org.springframework.cloud.CloudTestUtil.StubServiceInfo; import org.springframework.cloud.service.AbstractServiceConnectorCreator; import org.springframework.cloud.service.ServiceConnectorConfig; -import org.springframework.cloud.test.CloudTestUtil.StubServiceInfo; /** * diff --git a/core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector b/core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector index 108925f..7de4128 100644 --- a/core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector +++ b/core/src/test/resources/META-INF/services/org.springframework.cloud.CloudConnector @@ -1 +1 @@ -org.springframework.cloud.test.CloudTestUtil$StubCloudConnector # for testing purpose only \ No newline at end of file +org.springframework.cloud.CloudTestUtil$StubCloudConnector # for testing purpose only \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..42a7e5d --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +group = org.springframework.cloud +version = 0.9.6.BUILD-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5838598 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d49b5b7 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Feb 10 11:26:10 PST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/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 new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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/heroku-connector/.gitignore b/heroku-connector/.gitignore new file mode 100644 index 0000000..5e56e04 --- /dev/null +++ b/heroku-connector/.gitignore @@ -0,0 +1 @@ +/bin diff --git a/heroku-connector/build.gradle b/heroku-connector/build.gradle new file mode 100644 index 0000000..62eceac --- /dev/null +++ b/heroku-connector/build.gradle @@ -0,0 +1,5 @@ +description = 'Spring-Cloud Heroku Connector' + +dependencies { + compile project(':core') +} diff --git a/heroku-connector/pom.xml b/heroku-connector/pom.xml deleted file mode 100644 index ccb19b8..0000000 --- a/heroku-connector/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - heroku-connector - jar - Spring-Cloud Heroku Connector - http://www.springframework.org - - - - - org.springframework.cloud - parent - 0.9.6.BUILD-SNAPSHOT - ../parent/pom.xml - - - - org.springframework.cloud - spring-service-connector - ${project.version} - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-all - ${mockito.version} - test - - - log4j - log4j - 1.2.14 - - - diff --git a/parent/pom.xml b/parent/pom.xml deleted file mode 100644 index 97a5d39..0000000 --- a/parent/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - 4.0.0 - org.springframework.cloud - parent - pom - Spring Cloud Parent - 0.9.6.BUILD-SNAPSHOT - - - 4.11 - 1.9.5 - - - - - - org.springframework.build - aws-maven - 4.4.0.RELEASE - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - - - - - spring-snapshot - Spring Maven Snapshot Repository - http://repo.spring.io/snapshot - - false - - - true - - - - - spring-milestone - Spring Maven Milestone Repository - http://repo.spring.io/milestone - - false - - - - spring-lib-milestone - Spring Maven Milestone Repository - http://repo.spring.io/libs-milestone - - false - - - - - - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - - diff --git a/pom.xml b/pom.xml deleted file mode 100644 index ce3c81e..0000000 --- a/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - cloud - pom - Spring Cloud (Aggregate) - - org.springframework.cloud - parent - 0.9.6.BUILD-SNAPSHOT - parent/pom.xml - - - - parent - core - spring-service-connector - cloudfoundry-connector - heroku-connector - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5ac8f78 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,6 @@ +rootProject.name = "spring-cloud" + +include 'core' +include 'cloudfoundry-connector' +include 'spring-service-connector' +include 'heroku-connector' \ No newline at end of file diff --git a/spring-service-connector/.gitignore b/spring-service-connector/.gitignore new file mode 100644 index 0000000..5e56e04 --- /dev/null +++ b/spring-service-connector/.gitignore @@ -0,0 +1 @@ +/bin diff --git a/spring-service-connector/build.gradle b/spring-service-connector/build.gradle new file mode 100644 index 0000000..77e4ad3 --- /dev/null +++ b/spring-service-connector/build.gradle @@ -0,0 +1,35 @@ +description = 'Service Connectors' + +dependencies { + testCompile project(path: ':core', configuration: 'tests') + compile project(':core') + + compile("org.springframework:spring-context:$springVersion") + compile("log4j:log4j:$log4jVersion") + testCompile("org.springframework:spring-test:$springVersion") + testCompile("mysql:mysql-connector-java:$mysqlDriverVersion") + testCompile("org.mariadb.jdbc:mariadb-java-client:$mariadbDriverVersion") + testCompile("postgresql:postgresql:$postgresDriverVersion") + testCompile("javax.mail:mail:$javaxMailVersion") + testCompile("cglib:cglib:$cglibVersion") + optional("org.springframework:spring-jdbc:$springVersion") + optional("org.springframework:spring-context-support:$springVersion") + optional("org.apache.tomcat:tomcat-jdbc:$tomcatVersion") + optional("org.apache.tomcat:tomcat-dbcp:$tomcatVersion") + optional("commons-dbcp:commons-dbcp:$commonDbcpVersion") { + exclude(module: 'commons-logging') + exclude(module: 'commons-pool') + exclude(module: 'xerces') + exclude(module: 'xercesImpl') + exclude(module: 'xml-apis') + } + optional("org.springframework.amqp:spring-rabbit:$springAmqpVersion") + optional("org.springframework.data:spring-data-redis:$springDataRedisVersion") { + exclude(module: 'spring-context-support') + } + optional("org.springframework.data:spring-data-mongodb:$springDataMongoVersion") { + exclude(module: 'spring-beans') + exclude(module: 'spring-expression') + exclude(module: 'spring-tx') + } +} diff --git a/spring-service-connector/pom.xml b/spring-service-connector/pom.xml deleted file mode 100644 index 8f7ecd8..0000000 --- a/spring-service-connector/pom.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - 4.0.0 - spring-service-connector - jar - Service Connectors - http://www.springframework.org - - - - - org.springframework.cloud - parent - 0.9.6.BUILD-SNAPSHOT - ../parent/pom.xml - - - - 3.0.7.RELEASE - - 7.0.42 - - 1.0.0.RELEASE - 1.0.0.RELEASE - 1.0.1.RELEASE - - 1.3 - - 5.0.5 - 1.1.3 - 9.0-801.jdbc4 - 1.4.7 - 2.2.2 - - - - - org.springframework.cloud - core - ${project.version} - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-test - ${spring.framework.version} - test - - - org.springframework - spring-context - ${spring.framework.version} - - - log4j - log4j - 1.2.14 - - - - org.springframework - spring-jdbc - ${spring.framework.version} - provided - - - org.springframework - spring-context-support - ${spring.framework.version} - provided - - - - org.apache.tomcat - tomcat-jdbc - ${tomcat.version} - provided - - - org.apache.tomcat - tomcat-dbcp - ${tomcat.version} - provided - - - - commons-dbcp - commons-dbcp - ${common-dbcp.version} - provided - - - commons-logging - commons-logging - - - commons-pool - commons-pool - - - xerces - xerces - - - xerces - xercesImpl - - - xml-apis - xml-apis - - - - - - org.springframework.amqp - spring-rabbit - ${spring.amqp.version} - provided - - - - org.springframework.data - spring-data-redis - ${spring-data-redis.version} - - - - org.springframework - spring-context-support - - - provided - - - - org.springframework.data - spring-data-mongodb - ${spring-data-mongo.version} - - - - org.springframework - spring-beans - - - org.springframework - spring-expression - - - org.springframework - spring-tx - - - provided - - - - org.mockito - mockito-all - ${mockito.version} - test - - - mysql - mysql-connector-java - ${mysql-driver.version} - test - - - org.mariadb.jdbc - mariadb-java-client - ${mariadb-driver.version} - test - - - postgresql - postgresql - ${postgres-driver.version} - test - - - javax.mail - mail - ${javax-mail.version} - test - - - - cglib - cglib - ${cglib.version} - test - - - - diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java index 67eea6e..420d246 100644 --- a/spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java +++ b/spring-service-connector/src/test/java/org/springframework/cloud/CloudTest.java @@ -3,7 +3,7 @@ package org.springframework.cloud; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.springframework.cloud.test.CloudTestUtil.getTestCloudConnector; +import static org.springframework.cloud.CloudTestUtil.getTestCloudConnector; import java.util.ArrayList; import java.util.List; diff --git a/spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java b/spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java index 7a0ed16..0afe6e3 100644 --- a/spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java +++ b/spring-service-connector/src/test/java/org/springframework/cloud/StubCloudConnectorTest.java @@ -7,7 +7,6 @@ import org.springframework.cloud.service.common.MysqlServiceInfo; import org.springframework.cloud.service.common.PostgresqlServiceInfo; import org.springframework.cloud.service.common.RabbitServiceInfo; import org.springframework.cloud.service.common.RedisServiceInfo; -import org.springframework.cloud.test.CloudTestUtil; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -29,6 +28,7 @@ abstract public class StubCloudConnectorTest { @Override protected void prepareBeanFactory(ConfigurableListableBeanFactory beanFactory) { CloudFactory cloudFactory = new CloudFactory(); + cloudFactory.getCloudConnectors().clear(); cloudFactory.registerCloudConnector(stubCloudConnector); getBeanFactory().registerSingleton(MOCK_CLOUD_BEAN_NAME, cloudFactory); super.prepareBeanFactory(beanFactory); @@ -43,6 +43,7 @@ abstract public class StubCloudConnectorTest { @Override protected void prepareBeanFactory(ConfigurableListableBeanFactory beanFactory) { CloudFactory cloudFactory = new CloudFactory(); + cloudFactory.getCloudConnectors().clear(); cloudFactory.registerCloudConnector(stubCloudConnector); getBeanFactory().registerSingleton(MOCK_CLOUD_BEAN_NAME, cloudFactory); super.prepareBeanFactory(beanFactory);