Skip to content

Commit

Permalink
Compatibility with Java 11 and upgrade of another dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Felipe444 committed Jul 13, 2020
1 parent 31fbe9c commit 86a8932
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 21 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
language: java
sudo: true
jdk:
- openjdk8
- openjdk11
# todo: JDK 11.0.5 fixed a bug in SSL implementation, when Travis updates its openjdk for default arch, below line can be removed
arch: arm64

cache:
directories:
Expand Down
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ buildscript {
mavenLocal()
mavenCentral()
}
groovyAllVersion = '2.4.13'
lombokVersion = '1.18.8'
spockVersion = '1.1-groovy-2.4'
spockReportsVersion = '1.4.0'
groovyAllVersion = '2.5.10'
lombokVersion = '1.18.12'
spockVersion = '1.3-groovy-2.5'
spockReportsVersion = '1.7.1'
coverallsVersion = '2.8.2'
disruptorVersion = '3.4.0'
reflectionsVersion = '0.9.11'
feignVersion = '2.0.1.RELEASE'
jacksonVersion = '2.9.6'
podamVersion = '7.2.0.RELEASE'
feignVersion = '2.2.3.RELEASE'
jacksonVersion = '2.11.1'
podamVersion = '7.2.3.RELEASE'
cglibNodepVersion = '3.2.5'
axionReleasePluginVersion = '1.10.0'
nexusStagingPluginVersion = '0.20.0'
Expand Down Expand Up @@ -57,8 +57,8 @@ scmVersion {
project.version = scmVersion.version

jar.archiveBaseName = 'pact-gen'
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11

dependencies {
compile "com.lmax:disruptor:$disruptorVersion"
Expand Down
4 changes: 2 additions & 2 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</module>

<module name="SuppressionFilter">
<property name="file" value="config/suppressions.xml"/>
<property name="file" value="${config_loc}/suppressions.xml"/>
</module>

<module name="RegexpMultiline">
Expand Down Expand Up @@ -210,4 +210,4 @@
<property name="message" value="More than one empty line!"/>
</module>
</module>
</module>
</module>
File renamed without changes.
4 changes: 2 additions & 2 deletions gradle/codequality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ apply plugin: 'checkstyle'
apply plugin: 'com.github.kt3k.coveralls'

jacoco {
toolVersion = "0.8.1"
toolVersion = "0.8.5"
}

checkstyle {
toolVersion "8.1"
toolVersion "8.14"
}

jacocoTestReport {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import lombok.extern.slf4j.Slf4j;
import uk.co.jemos.podam.api.PodamFactory;

import java.io.IOException;
import java.util.Optional;

@Slf4j
Expand All @@ -30,10 +29,6 @@ static JsonNode serializeBody(Body body, ObjectMapper objectMapper, PodamFactory
log.error("Unable to write {} to json. Original error message '{}'",
body, ex.getMessage());
throw new PactGenerationException("Unable to serialize body", ex);
} catch (IOException ex) {
log.error("Unable to convert {} to json node. Original error message '{}'",
serializedBody, ex.getMessage());
throw new PactGenerationException("Unable to convert serialized body to json node", ex);
}

return bodyJsonNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class PactFactoryUT extends Specification {
@Subject
private PactFactory pactFactory = new PactFactory()

final ObjectMapper objectMapper = new ObjectMapper()
def objectMapper = new ObjectMapper()

def "should get http method from feign client"() {
when:
Expand Down Expand Up @@ -44,7 +44,7 @@ class PactFactoryUT extends Specification {
consumer.name == 'SpecConsumer'
provider.name == 'SpecProvider'
interactions.size() == 2
verifyDescription(interactions, 'getTestObject request; 200 response')
verifyDescription(interactions, 'getTestObject request; 200 OK response')
verifyDescription(interactions, 'Update test object in the test service')
}
}
Expand Down

0 comments on commit 86a8932

Please sign in to comment.