Skip to content

Commit

Permalink
RESTEASY-2352 - Upgrade Jackson2 to 2.9.10 (#33) (#34)
Browse files Browse the repository at this point in the history 
* RESTEASY-2352 - Upgrade Jackson2 to 2.9.10 (#33)

* fix coverage rate
  • Loading branch information
@liweinan
liweinan authored Sep 26, 2019
1 parent ad7f920 commit 406360b
Showing 1 changed file with 103 additions and 60 deletions.
163 changes: 103 additions & 60 deletions resteasy-spring-boot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<springboot.version>2.1.6.RELEASE</springboot.version>
<resteasy.version>3.9.0.Final</resteasy.version>
<resteasy.jackson.version>2.9.10</resteasy.jackson.version>
<coverage.line>80</coverage.line>
<coverage.branch>80</coverage.branch>
<coverage.lineRate>80</coverage.lineRate>
<coverage.branchRate>80</coverage.branchRate>
<modular.jdk.args/>
<modular.jdk.props/>
</properties>
Expand Down Expand Up @@ -99,6 +102,18 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-parameter-names</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down Expand Up @@ -157,11 +172,15 @@
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -189,7 +208,7 @@
<artifactId>javax.json</artifactId>
<version>1.1.2</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -305,7 +324,7 @@
</exclusions>
</dependency>

<!-- uniformed dependency-->
<!-- Shared Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand All @@ -319,7 +338,32 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.9</version>
<version>${resteasy.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${resteasy.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${resteasy.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-parameter-names</artifactId>
<version>${resteasy.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${resteasy.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${resteasy.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand All @@ -329,22 +373,22 @@
</dependencies>

<profiles>
<profile>
<id>JDK9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<modular.jdk.args>
--add-modules=java.se
</modular.jdk.args>
<modular.jdk.props>
--add-opens java.xml/jdk.xml.internal=ALL-UNNAMED
</modular.jdk.props>
<!--modular.jdk.props>-Dsun.util.logging.disableCallerCheck=true -Dsun.reflect.debugModuleAccessChecks=true -Djaxb.debug=true</modular.jdk.props-->
</properties>
</profile>
<profile>
<id>JDK9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<modular.jdk.args>
--add-modules=java.se
</modular.jdk.args>
<modular.jdk.props>
--add-opens java.xml/jdk.xml.internal=ALL-UNNAMED
</modular.jdk.props>
<!--modular.jdk.props>-Dsun.util.logging.disableCallerCheck=true -Dsun.reflect.debugModuleAccessChecks=true -Djaxb.debug=true</modular.jdk.props-->
</properties>
</profile>

<!-- Added for Fortify Support -->
<profile>
<id>fortify</id>
Expand Down Expand Up @@ -415,42 +459,42 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<check>
<lineRate>${coverage.line}</lineRate>
<packageLineRate>${coverage.line}</packageLineRate>
<totalLineRate>${coverage.line}</totalLineRate>
<branchRate>${coverage.branch}</branchRate>
<packageBranchRate>${coverage.branch}</packageBranchRate>
<totalBranchRate>${coverage.branch}</totalBranchRate>
<haltOnFailure>true</haltOnFailure>
<regexes>
<regex>
<pattern>org.jboss.resteasy.springboot.JaxrsApplicationScanner</pattern>
<lineRate>80</lineRate>
<branchRate>65</branchRate>
</regex>
</regexes>
</check>
<formats>
<format>html</format>
<format>xml</format>
</formats>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>clean</goal>
<goal>cobertura</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<check>
<lineRate>${coverage.line}</lineRate>
<packageLineRate>${coverage.line}</packageLineRate>
<totalLineRate>${coverage.line}</totalLineRate>
<branchRate>${coverage.branch}</branchRate>
<packageBranchRate>${coverage.branch}</packageBranchRate>
<totalBranchRate>${coverage.branch}</totalBranchRate>
<haltOnFailure>true</haltOnFailure>
<regexes>
<regex>
<pattern>org.jboss.resteasy.springboot.JaxrsApplicationScanner</pattern>
<lineRate>${coverage.lineRate}</lineRate>
<branchRate>${coverage.branchRate}</branchRate>
</regex>
</regexes>
</check>
<formats>
<format>html</format>
<format>xml</format>
</formats>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>clean</goal>
<goal>cobertura</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down Expand Up @@ -487,7 +531,7 @@
</plugins>
</pluginManagement>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -513,9 +557,8 @@
</execution>
</executions>
</plugin>

</plugins>
</build>
</build>

<reporting>
<plugins>
Expand Down

0 comments on commit 406360b

Please sign in to comment.