Skip to content

Commit ed1d5b7

Browse files
authored
update build and CI for jdk11 (Netflix#454)
Bump versions and update the travis build to test on jdk11.
1 parent 72c68e9 commit ed1d5b7

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: java
22
matrix:
33
include:
4-
- jdk: oraclejdk8
4+
- jdk: openjdk8
55
env: GRADLE_PUBLISH=true
6-
- jdk: oraclejdk9
6+
- jdk: openjdk11
77
env: GRADLE_PUBLISH=false
88
sudo: false
99
install: ./installViaTravis.sh

build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ buildscript {
1919
jcenter()
2020
}
2121
dependencies {
22-
classpath 'com.netflix.nebula:nebula-dependency-recommender:5.0.0'
22+
classpath 'com.netflix.nebula:nebula-dependency-recommender:6.1.1'
2323
}
2424
}
2525

2626
plugins {
27-
id 'nebula.netflixoss' version '5.0.0'
28-
id 'me.champeau.gradle.jmh' version '0.4.4'
27+
id 'nebula.netflixoss' version '6.0.1'
28+
id 'me.champeau.gradle.jmh' version '0.4.5'
29+
id "com.github.spotbugs" version "1.6.5" apply false
2930
}
3031

3132
ext {
@@ -41,7 +42,7 @@ subprojects {
4142
apply plugin: 'nebula.netflixoss'
4243
apply plugin: 'java'
4344
apply plugin: 'checkstyle'
44-
apply plugin: 'findbugs'
45+
apply plugin: 'com.github.spotbugs'
4546
apply plugin: 'pmd'
4647

4748
group = "com.netflix.${githubProjectName}"
@@ -76,7 +77,7 @@ subprojects {
7677
dependencies {
7778
compile 'org.slf4j:slf4j-api'
7879
compile 'com.google.guava:guava'
79-
compile 'com.netflix.spectator:spectator-api:0.67.0'
80+
compile 'com.netflix.spectator:spectator-api:0.78.0'
8081
testCompile 'org.testng:testng:6.1.1'
8182
testRuntime 'org.slf4j:slf4j-log4j12'
8283
testRuntime 'log4j:log4j:1.2.17'
@@ -93,18 +94,17 @@ subprojects {
9394

9495
checkstyle {
9596
ignoreFailures = false
96-
toolVersion = '6.0'
97+
toolVersion = '6.7'
9798
configFile = rootProject.file('codequality/checkstyle.xml')
9899
sourceSets = [sourceSets.main]
99100
}
100101

101-
findbugs {
102-
ignoreFailures = false
102+
spotbugs {
103+
toolVersion = '3.1.8'
104+
ignoreFailures = false
103105
sourceSets = [sourceSets.main]
104106
}
105-
106-
tasks.withType(FindBugs) {
107-
findbugs.toolVersion "3.0.1"
107+
tasks.withType(com.github.spotbugs.SpotBugsTask) {
108108
reports {
109109
xml.enabled = false
110110
html.enabled = true

dependencies.properties

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Auto generated by insight-recommendations build
2-
com.amazonaws:aws-java-sdk-autoscaling = 1.11.264
3-
com.amazonaws:aws-java-sdk-cloudwatch = 1.11.264
4-
com.amazonaws:aws-java-sdk-core = 1.11.264
5-
com.fasterxml.jackson.core:jackson-annotations = 2.9.1
6-
com.fasterxml.jackson.core:jackson-core = 2.9.1
7-
com.fasterxml.jackson.core:jackson-databind = 2.9.1
8-
com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.9.1
2+
com.amazonaws:aws-java-sdk-autoscaling = 1.11.409
3+
com.amazonaws:aws-java-sdk-cloudwatch = 1.11.409
4+
com.amazonaws:aws-java-sdk-core = 1.11.409
5+
com.fasterxml.jackson.core:jackson-annotations = 2.9.7
6+
com.fasterxml.jackson.core:jackson-core = 2.9.7
7+
com.fasterxml.jackson.core:jackson-databind = 2.9.7
8+
com.fasterxml.jackson.dataformat:jackson-dataformat-smile = 2.9.7
99
com.google.guava:guava = 19.0
10-
com.netflix.archaius:archaius2-api = 2.2.13
11-
com.netflix.archaius:archaius2-core = 2.2.13
12-
com.netflix.awsobjectmapper:awsobjectmapper = 1.11.264
13-
com.netflix.eureka:eureka-client = 1.8.6
10+
com.netflix.archaius:archaius2-api = 2.3.13
11+
com.netflix.archaius:archaius2-core = 2.3.13
12+
com.netflix.awsobjectmapper:awsobjectmapper = 1.11.409
13+
com.netflix.eureka:eureka-client = 1.9.5
1414
com.netflix.frigga:frigga = 0.18.0
1515
com.netflix.iep-shadow:iepshadow-iep-module-rxnetty = 0.4.18.29
1616
com.netflix.iep-shadow:iepshadow-iep-rxhttp = 0.4.18.29
1717
com.netflix.iep-shadow:iepshadow-rxnetty = 0.4.20.29
1818
com.netflix.iep-shadow:iepshadow-rxnetty-contexts = 0.4.20.29
1919
com.netflix.iep-shadow:iepshadow-rxnetty-spectator = 0.4.20.29
20-
com.netflix.spectator:spectator-api = 0.60.0
20+
com.netflix.spectator:spectator-api = 0.78.0
2121
io.netty:netty-buffer = 4.1.8.Final
2222
io.netty:netty-codec = 4.1.8.Final
2323
io.netty:netty-codec-http = 4.1.8.Final

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

0 commit comments

Comments
 (0)