diff --git a/build.gradle b/build.gradle index c5695a9bb..eb48b4c09 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ ext { logbackVersion = "1.0.9" // Spring - springVersion = "3.1.3.RELEASE" + springVersion = "3.1.4.RELEASE" spring32Version = "3.2.1.RELEASE" hateoasVersion = "0.4.0.RELEASE" springPluginVersion = "0.8.0.RELEASE" @@ -18,7 +18,7 @@ ext { sdJpaVersion = "1.3.0.RELEASE" sdMongoVersion = "1.2.0.RELEASE" sdGemfireVersion = "1.3.0.M1" - sdNeo4jVersion = "2.2.0.RELEASE" + sdNeo4jVersion = "2.3.0.BUILD-SNAPSHOT" // Libraries guavaVersion = "13.0.1" @@ -75,6 +75,7 @@ configure(allprojects) { //maven { url "http://repo.springsource.org/libs-snapshot" } maven { url "http://oss.sonatype.org/content/repositories/releases" } maven { url "http://m2.neo4j.org/releases" } + mavenLocal() } dependencies { @@ -82,15 +83,6 @@ configure(allprojects) { compile "org.slf4j:slf4j-api:$slf4jVersion" runtime "org.slf4j:jcl-over-slf4j:$slf4jVersion" - // Spring - compile("org.springframework:spring-aop:$springVersion") { force = true } - compile("org.springframework:spring-beans:$springVersion") { force = true } - compile("org.springframework:spring-context:$springVersion") { force = true } - compile("org.springframework:spring-core:$springVersion") { force = true } - compile("org.springframework:spring-expression:$springVersion") { force = true } - compile("org.springframework:spring-web:$springVersion") { force = true } - runtime "cglib:cglib-nodep:$cglibVersion" - // Testing testCompile "junit:junit-dep:$junitVersion" testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion" @@ -140,6 +132,13 @@ project("spring-data-rest-core") { // Google Guava compile "com.google.guava:guava:$guavaVersion" + // Spring + compile("org.springframework:spring-aop:$springVersion") { force = true } + compile("org.springframework:spring-core:$springVersion") { force = true } + compile("org.springframework:spring-beans:$springVersion") { force = true } + compile("org.springframework:spring-web:$springVersion") { force = true } + runtime "cglib:cglib-nodep:$cglibVersion" + // Spring HATEOAS compile("org.springframework.hateoas:spring-hateoas:$hateoasVersion") { exclude module: "spring-webmvc" @@ -175,9 +174,6 @@ project("spring-data-rest-repository") { // ROME //compile "rome:rome:1.0" - // Spring - compile("org.springframework:spring-tx:$springVersion") { force = true } - // JPA compile("org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final", optional) @@ -217,13 +213,14 @@ project("spring-data-rest-webmvc") { testCompile "org.eclipse.jetty:jetty-webapp:$jettyVersion" testCompile "org.mozilla:rhino:1.7R4" // Spring Data + testCompile("org.springframework:spring-core:$springVersion") { force = true } + testCompile("org.springframework:spring-tx:$springVersion") { force = true } testCompile "org.springframework.data:spring-data-jpa:$sdJpaVersion" testCompile "org.springframework.data:spring-data-mongodb:$sdMongoVersion" testCompile("org.springframework.data:spring-data-gemfire:$sdGemfireVersion") { exclude group: "junit" exclude group: "org.jmock" exclude group: "org.hamcrest" - exclude group: "junit" exclude module: "spring-test" } // JODA @@ -264,8 +261,8 @@ project("spring-data-rest-example") { } // Spring Security - compile "org.springframework.security:spring-security-config:$springSecurityVersion" - compile "org.springframework.security:spring-security-web:$springSecurityVersion" + //compile "org.springframework.security:spring-security-config:$springSecurityVersion" + //compile "org.springframework.security:spring-security-web:$springSecurityVersion" // JODA compile "joda-time:joda-time:$jodaVersion"