Misc cleanups

Removed hardwired Spring Boot version
Cleaned up gradle.properties and settings.gradle
This commit is contained in:
Chris Richardson
2015-01-01 20:36:18 -08:00
parent da0aaf7d28
commit f7f19765a1
9 changed files with 5 additions and 34 deletions

View File

@@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:1.1.8.RELEASE") classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
} }
} }

View File

@@ -1,9 +1,5 @@
apply plugin: 'java' apply plugin: 'java'
repositories {
mavenCentral()
}
dependencies { dependencies {
compile "net.chrisrichardson.eventstore.client:eventstore-java-client:$eventStoreClientVersion" compile "net.chrisrichardson.eventstore.client:eventstore-java-client:$eventStoreClientVersion"
@@ -11,7 +7,7 @@ dependencies {
compile 'com.fasterxml.jackson.core:jackson-databind:2.4.3' compile 'com.fasterxml.jackson.core:jackson-databind:2.4.3'
compile 'com.fasterxml.jackson.module:jackson-module-scala_2.10:2.4.3' compile 'com.fasterxml.jackson.module:jackson-module-scala_2.10:2.4.3'
testCompile group: 'junit', name: 'junit', version:'4.11' testCompile "junit:junit:4.11"
testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
testCompile "net.chrisrichardson.eventstore.client:eventstore-jdbc:$eventStoreClientVersion" testCompile "net.chrisrichardson.eventstore.client:eventstore-jdbc:$eventStoreClientVersion"

View File

@@ -1,9 +1,5 @@
apply plugin: 'java' apply plugin: 'java'
repositories {
mavenCentral()
}
dependencies { dependencies {
compile project(":eventstore-examples-java-testutil") compile project(":eventstore-examples-java-testutil")
@@ -13,7 +9,7 @@ dependencies {
compile 'com.fasterxml.jackson.core:jackson-core:2.4.3' compile 'com.fasterxml.jackson.core:jackson-core:2.4.3'
compile 'com.fasterxml.jackson.core:jackson-databind:2.4.3' compile 'com.fasterxml.jackson.core:jackson-databind:2.4.3'
compile 'com.fasterxml.jackson.module:jackson-module-scala_2.10:2.4.3' compile 'com.fasterxml.jackson.module:jackson-module-scala_2.10:2.4.3'
testCompile group: 'junit', name: 'junit', version:'4.11' testCompile "junit:junit:4.11"
testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
testCompile "net.chrisrichardson.eventstore.client:eventstore-jdbc:$eventStoreClientVersion" testCompile "net.chrisrichardson.eventstore.client:eventstore-jdbc:$eventStoreClientVersion"

View File

@@ -1,16 +1,9 @@
org.gradle.jvmargs=-XX:MaxPermSize=512m org.gradle.jvmargs=-XX:MaxPermSize=512m
# Was 3.2.4.RELEASE
springFrameworkVersion=4.0.3.RELEASE
#rxJavaVersion=0.13.2
rxJavaVersion=0.20.4 rxJavaVersion=0.20.4
scalaTestDependency=org.scalatest:scalatest_2.10:2.0 scalaTestDependency=org.scalatest:scalatest_2.10:2.0
akkaDependency=com.typesafe.akka:akka-actor_2.10:2.3.4
akkaTestDependency=com.typesafe.akka:akka-actor-tests_2.10:2.3.4
akkaSlf4jDependency=com.typesafe.akka:akka-slf4j_2.10:2.3.4
springBootVersion=1.1.10.RELEASE springBootVersion=1.1.10.RELEASE
eventStoreCommonVersion=0.2 eventStoreCommonVersion=0.2

View File

@@ -1,5 +1,3 @@
include 'eventstore-examples'
include 'eventstore-examples-main'
include 'eventstore-examples-java' include 'eventstore-examples-java'
include 'eventstore-examples-java-web' include 'eventstore-examples-java-web'
include 'eventstore-examples-java-testutil' include 'eventstore-examples-java-testutil'

View File

@@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:1.1.8.RELEASE") classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
} }
} }

View File

@@ -9,10 +9,8 @@ dependencies {
testCompile scalaTestDependency testCompile scalaTestDependency
testCompile group: 'junit', name: 'junit', version:'4.11' testCompile "junit:junit:4.11"
// testCompile project(":testutil")
testCompile "net.chrisrichardson.eventstore.client:eventstore-jdbc:$eventStoreClientVersion" testCompile "net.chrisrichardson.eventstore.client:eventstore-jdbc:$eventStoreClientVersion"
//testCompile project(path: ':eventstore-dynamodb', configuration: 'tests')
} }

View File

@@ -1,16 +1,9 @@
org.gradle.jvmargs=-XX:MaxPermSize=512m org.gradle.jvmargs=-XX:MaxPermSize=512m
# Was 3.2.4.RELEASE
springFrameworkVersion=4.0.3.RELEASE
#rxJavaVersion=0.13.2
rxJavaVersion=0.20.4 rxJavaVersion=0.20.4
scalaTestDependency=org.scalatest:scalatest_2.10:2.0 scalaTestDependency=org.scalatest:scalatest_2.10:2.0
akkaDependency=com.typesafe.akka:akka-actor_2.10:2.3.4
akkaTestDependency=com.typesafe.akka:akka-actor-tests_2.10:2.3.4
akkaSlf4jDependency=com.typesafe.akka:akka-slf4j_2.10:2.3.4
springBootVersion=1.1.10.RELEASE springBootVersion=1.1.10.RELEASE
eventStoreCommonVersion=0.2 eventStoreCommonVersion=0.2

View File

@@ -1,5 +1,2 @@
include 'eventstore-examples' include 'eventstore-examples'
include 'eventstore-examples-main' include 'eventstore-examples-main'
include 'eventstore-examples-java'
include 'eventstore-examples-java-web'
include 'eventstore-examples-java-testutil'