Skip to content

Commit 080fe23

Browse files
committed
fix: Restore JDK7 support
* Replace missing SunEC in openJDK7 builds (fixes CI) * Use android flavor of guava for JDK7 support (fixes class loading)
1 parent 1f80b65 commit 080fe23

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,16 @@ jobs:
1414
- stage: test
1515
jdk: openjdk8
1616
script: ./gradlew check :test
17-
# - stage: test # Disabled due to SSL errors on Travis
18-
# jdk: openjdk7 # when downloading gradle
19-
# script: ./gradlew :test
2017
- stage: test
2118
jdk: oraclejdk9
2219
script: ./gradlew check :test
2320
- stage: test
2421
jdk: oraclejdk8
2522
script: ./gradlew check :test
23+
- stage: test
24+
jdk: openjdk7
25+
script: ./gradlew :test
26+
before_install: # Work around missing crypto in openjdk7
27+
- sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-158.jar"
28+
- sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security
29+
- echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repositories {
2626

2727
dependencies {
2828
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.1'
29-
compile 'com.google.guava:guava:23.1-jre'
29+
compile 'com.google.guava:guava:23.1-android'
3030
compile 'org.slf4j:slf4j-api:1.7.25'
3131
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
3232

0 commit comments

Comments
 (0)