Skip to content

Commit

Permalink
Upgraded to Spring IO Brussels SR-3, Gradle 4.0 and some dependencies…
Browse files Browse the repository at this point in the history
…. Also changed to 'java-library' Gradle pluginP
  • Loading branch information
polysantiago authored and Pablo Santiago committed Jun 21, 2017
1 parent 4fd1ff9 commit cf4fa66
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
38 changes: 19 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
plugins {
id 'java'
id 'java-library'
id 'idea'
id 'jacoco'
id "io.spring.dependency-management" version "1.0.2.RELEASE"
id "io.spring.dependency-management" version "1.0.3.RELEASE"
id 'maven-publish'
id 'signing'
id 'nebula.optional-base' version '3.0.3'
id 'nebula.provided-base' version '3.0.3'
id "io.codearte.nexus-staging" version "0.8.0"
id 'nebula.optional-base' version '3.2.0'
id "io.codearte.nexus-staging" version "0.9.0"
}

ext {
Expand Down Expand Up @@ -44,29 +43,30 @@ repositories {

dependencyManagement {
imports {
mavenBom 'io.spring.platform:platform-bom:Brussels-SR2'
mavenBom 'io.spring.platform:platform-bom:Brussels-SR3'
}
}

dependencies {
compile("org.springframework.boot:spring-boot-autoconfigure")
compile("org.springframework.boot:spring-boot-starter-logging")
implementation("org.springframework.boot:spring-boot-autoconfigure")
implementation("org.springframework.boot:spring-boot-starter-logging")
compileOnly('org.springframework.boot:spring-boot-configuration-processor')
compile("org.springframework:spring-webmvc")
compile('org.springframework:spring-aop')
compile('org.aspectj:aspectjweaver')
implementation("org.springframework:spring-webmvc")
implementation('org.springframework:spring-aop')
implementation('org.aspectj:aspectjweaver')

compile 'org.springframework.retry:spring-retry', optional

provided 'org.projectlombok:lombok'
compile 'org.apache.commons:commons-lang3:3.5'
compile 'net.javacrumbs.future-converter:future-converter-spring-java8:1.1.0'
compileOnly 'org.projectlombok:lombok'
implementation 'org.apache.commons:commons-lang3:3.5'
implementation 'net.javacrumbs.future-converter:future-converter-spring-java8:1.1.0'

testCompile("org.springframework.boot:spring-boot-starter-test")
testCompile('org.springframework.boot:spring-boot-starter-hateoas')
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
testCompile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
testCompile('org.assertj:assertj-core:3.6.2')
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation('org.springframework.boot:spring-boot-starter-hateoas')
testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
testImplementation('org.assertj:assertj-core:3.8.0')
testCompileOnly('org.projectlombok:lombok')
}

tasks.withType(Jar) {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat May 13 02:41:46 CEST 2017
#Wed Jun 21 14:37:47 EEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down

0 comments on commit cf4fa66

Please sign in to comment.