diff --git a/build.gradle b/build.gradle index ec4dd0830..0a9b111fa 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,7 @@ subprojects { mavenRepo name: "mavenLocal", urls: new File(System.getProperty("user.home"), ".m2/repository").toURL().toString() // Public Spring artefacts mavenRepo name: "spring-release", urls: "http://maven.springframework.org/release" + mavenRepo name: "springsource-org-release", urls: "http://repository.springsource.com/maven/bundles/release" mavenRepo name: "spring-milestone", urls: "http://maven.springframework.org/milestone" mavenRepo name: "spring-snapshot", urls: "http://maven.springframework.org/snapshot" // Additional community artefacts @@ -58,6 +59,9 @@ subprojects { testCompile "org.mockito:mockito-all:$mockitoVersion" } + test { + testReport = false + } } configurations { @@ -75,5 +79,4 @@ ideaProject { withXml { provider -> provider.node.component.find { it.@name == 'VcsDirectoryMappings' }.mapping.@vcs = 'Git' } -} - +} \ No newline at end of file diff --git a/gradle/bundlor.gradle b/gradle/bundlor.gradle index 870159da0..08a37410d 100644 --- a/gradle/bundlor.gradle +++ b/gradle/bundlor.gradle @@ -81,7 +81,9 @@ task bundlor(dependsOn: compileJava) { ant.bundlor(inputPath: sourceSets.main.classesDir, outputPath: bundlorDir, manifestTemplatePath: template) { property(name: 'version', value: project.version) - property(name: 'spring.version', value: project.springVersion) + //property(name: 'spring.range', value: project.springRange) + //property(name: 'jedis.range', value: project.jedisRange) + //property(name: 'jackson.range', value: project.jacksonRange) } } } diff --git a/spring-data-redis/gradle.properties b/spring-data-redis/gradle.properties new file mode 100644 index 000000000..58cacf49d --- /dev/null +++ b/spring-data-redis/gradle.properties @@ -0,0 +1,3 @@ +springRange = "[3.0.0, 4.0.0)" +jedisRange = "[1.0.0,2.0.0)" +jacksonRange = "[1.6, 2.0.0)" diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/config/NamespaceTest.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/config/NamespaceTest.java index 4da4165a8..46b9016f3 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/config/NamespaceTest.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/config/NamespaceTest.java @@ -59,7 +59,6 @@ public class NamespaceTest { //Thread.sleep(TimeUnit.SECONDS.toMillis(5)); } - @Test public void testErrorHandler() throws Exception { StubErrorHandler handler = ctx.getBean(StubErrorHandler.class); diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerTest.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerTest.java index 05c46bbec..b7e8a5906 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerTest.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerTest.java @@ -80,7 +80,7 @@ public class MessageListenerTest { verify(mock).onMessage(STRING_MSG, null); } - @Test + public void testRawMessage() throws Exception { MessageListenerAdapter adapter = new MessageListenerAdapter(target); adapter.onMessage(STRING_MSG, null); @@ -88,7 +88,7 @@ public class MessageListenerTest { verify(target).handleMessage(PAYLOAD); } - @Test + public void testCustomMethod() throws Exception { MessageListenerAdapter adapter = new MessageListenerAdapter(target); adapter.setDefaultListenerMethod("customMethod");