Skip to content

Commit 7bfccab

Browse files
feat: Update spring-boot and watson-java-sdk
* Update spring boot to: 2.2.5.RELEASE * Update java-sdk to: 8.3.1 * Update gradle to 5.3.1 * Update gradle dependencies and gradle build code
1 parent 2166ff4 commit 7bfccab

File tree

6 files changed

+46
-14
lines changed

6 files changed

+46
-14
lines changed

build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414

1515
buildscript {
1616
repositories {
17-
maven { url 'http://repo.spring.io/plugins-release' }
17+
maven { url 'https://repo.spring.io/plugins-release' }
1818
}
1919
dependencies {
2020
classpath 'io.spring.gradle:propdeps-plugin:0.0.9.RELEASE'
2121
}
2222
}
2323

2424
plugins {
25-
id 'com.github.johnrengelman.shadow' version '1.2.4'
26-
id 'io.codearte.nexus-staging' version '0.11.0'
25+
id 'com.github.johnrengelman.shadow' version '5.2.0'
26+
id 'io.codearte.nexus-staging' version '0.21.2'
2727
}
2828

2929
apply plugin: 'java'
@@ -82,7 +82,7 @@ targetCompatibility = 1.8
8282

8383
repositories {
8484
mavenCentral()
85-
maven { url 'http://repo.spring.io/libs-release' }
85+
maven { url 'https://repo.spring.io/libs-release' }
8686
maven { url 'https://dl.bintray.com/ibm-cloud-sdks/ibm-cloud-sdk-repo' }
8787

8888
}
@@ -108,7 +108,7 @@ dependencies {
108108

109109
// testing
110110
testCompile group: 'junit', name: 'junit', version: '4.12'
111-
testCompile 'com.github.stefanbirkner:system-rules:1.16.0'
111+
testCompile 'com.github.stefanbirkner:system-rules:1.19.0'
112112
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
113113
}
114114

@@ -124,13 +124,13 @@ test {
124124
apply plugin: 'jacoco'
125125

126126
task codeCoverageReport(type: JacocoReport, dependsOn: test) {
127-
executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
128-
sourceDirectories = files(sourceSets.main.allSource.srcDirs)
129-
classDirectories = files(sourceSets.main.output)
127+
getExecutionData().setFrom(fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec"))
128+
getSourceDirectories().setFrom(files(sourceSets.main.allSource.srcDirs))
129+
getClassDirectories().setFrom(files(sourceSets.main.output))
130130

131131
reports {
132132
xml.enabled true
133-
xml.destination "${buildDir}/reports/jacoco/report.xml"
133+
xml.destination file("${buildDir}/reports/jacoco/report.xml")
134134
csv.enabled false
135135
html.destination file("${buildDir}/reports/jacoco-html")
136136
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version=1.1.0
22
group = com.ibm.watson.developer_cloud
3-
watsonVersion = 8.0.0
3+
watsonVersion = 8.3.1
44
springVersion = 4.3.12.RELEASE
5-
springBootVersion = 1.5.9.RELEASE
5+
springBootVersion = 2.2.5.RELEASE

gradle/wrapper/gradle-wrapper.jar

1.17 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"

gradlew.bat

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem http://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

0 commit comments

Comments
 (0)