Skip to content

Commit

Permalink
feat: upgrade dependencies (#349)
Browse files Browse the repository at this point in the history
* feat: upgrade dependencies
* feat: upgrade THIRD-PARTY list
* feat: upgrade gson to 2.10.1
* clean: remove double definition of jacoco target
  • Loading branch information
kschrab authored Sep 14, 2023
1 parent 0b1074d commit 8ff2ccd
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 59 deletions.
52 changes: 26 additions & 26 deletions NOTICE-THIRD-PARTY.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ Apache Commons IO (2.6)
* Source: https://git-wip-us.apache.org/repos/asf?p=commons-io


Apache Commons Lang (3.9)
Apache Commons Lang (3.13.0)

* License: Apache License, Version 2.0
* Maven artifact: `org.apache.commons:commons-lang3:3.9`
* Project: http://commons.apache.org/proper/commons-lang/
* Source: https://git-wip-us.apache.org/repos/asf?p=commons-lang
* License: Apache-2.0
* Maven artifact: `org.apache.commons:commons-lang3:3.13.0`
* Project: https://commons.apache.org/proper/commons-lang/
* Source: https://gitbox.apache.org/repos/asf?p=commons-lang


Apache Commons Logging (1.2)
Expand Down Expand Up @@ -109,19 +109,19 @@ GraphHopper Core (0.13.0)
* Source: https://github.com/graphhopper/graphhopper/graphhopper-core


Gson (2.8.6)
Gson (2.10.1)

* License: Apache 2.0
* Maven artifact: `com.google.code.gson:gson:2.8.6`
* License: Apache-2.0
* Maven artifact: `com.google.code.gson:gson:2.10.1`
* Project: https://github.com/google/gson/gson
* Source: https://github.com/google/gson/gson/


Guava: Google Core Libraries for Java (28.2-jre)
Guava: Google Core Libraries for Java (32.1.1-jre)

* License: Apache License, Version 2.0
* Maven artifact: `com.google.guava:guava:28.2-jre`
* Project: https://github.com/google/guava/guava
* Maven artifact: `com.google.guava:guava:32.1.1-jre`
* Project: https://github.com/google/guava
* Source: https://github.com/google/guava/guava


Expand Down Expand Up @@ -213,20 +213,20 @@ JSR 374 (JSON Processing) API (1.1.5)
* Source: https://github.com/eclipse-ee4j/jsonp/jakarta.json-api


Logback Classic Module (1.2.3)
Logback Classic Module (1.3.8)

* License: Eclipse Public License - v 1.0, GNU Lesser General Public License
* Maven artifact: `ch.qos.logback:logback-classic:1.2.3`
* Maven artifact: `ch.qos.logback:logback-classic:1.3.8`
* Project: http://logback.qos.ch/logback-classic
* Source: https://github.com/ceki/logback/logback-classic
* Source: https://github.com/qos-ch/logback/logback-classic


Logback Core Module (1.2.3)
Logback Core Module (1.3.8)

* License: Eclipse Public License - v 1.0, GNU Lesser General Public License
* Maven artifact: `ch.qos.logback:logback-core:1.2.3`
* Maven artifact: `ch.qos.logback:logback-core:1.3.8`
* Project: http://logback.qos.ch/logback-core
* Source: https://github.com/ceki/logback/logback-core
* Source: https://github.com/qos-ch/logback/logback-core


org.leadpony.justify (1.1.0)
Expand All @@ -245,27 +245,27 @@ Protocol Buffers [Core] (3.8.0)
* Source: https://github.com/protocolbuffers/protobuf/protobuf-java


SLF4J API Module (1.7.25)
SLF4J API Module (2.0.9)

* License: MIT License
* Maven artifact: `org.slf4j:slf4j-api:1.7.25`
* Maven artifact: `org.slf4j:slf4j-api:2.0.9`
* Project: http://www.slf4j.org
* Source: https://github.com/qos-ch/slf4j/slf4j-api
* Source: https://github.com/qos-ch/slf4j/slf4j-parent/slf4j-api


SQLite JDBC (3.20.0)
SQLite JDBC (3.42.0.0)

* License: The Apache Software License, Version 2.0
* Maven artifact: `org.xerial:sqlite-jdbc:3.20.0`
* Project: http://nexus.sonatype.org/oss-repository-hosting.html/sqlite-jdbc
* Maven artifact: `org.xerial:sqlite-jdbc:3.42.0.0`
* Project: https://github.com/xerial/sqlite-jdbc
* Source: https://github.com/xerial/sqlite-jdbc


Stax2 API (3.1.4)
Stax2 API (4.2.1)

* License: The BSD License
* Maven artifact: `org.codehaus.woodstox:stax2-api:3.1.4`
* Project: http://wiki.fasterxml.com/WoodstoxStax2
* Maven artifact: `org.codehaus.woodstox:stax2-api:4.2.1`
* Project: http://github.com/FasterXML/stax2-api
* Source: https://github.com/FasterXML/stax2-api


Expand Down
47 changes: 14 additions & 33 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,28 +88,28 @@
<version.commons-configuration2>2.5</version.commons-configuration2><!-- 2.5 is approved in CQ21803 -->
<version.commons-io>2.6</version.commons-io><!-- 2.6 is approved in CQ16712 -->
<version.commons-jxpath>1.3</version.commons-jxpath><!-- 1.3 is approved in CQ10790 -->
<version.commons-lang3>3.9</version.commons-lang3><!-- 3.9 is approved in CQ21762 -->
<version.commons-lang3>3.13.0</version.commons-lang3><!-- 3.9 is approved in #9820 -->
<version.commons-logging>1.2</version.commons-logging><!-- 1.2 is approved in CQ10162 -->
<version.commons-math3>3.6.1</version.commons-math3><!-- 3.6.1 is approved in CQ22025 -->
<version.commons-text>1.6</version.commons-text><!-- 1.6 is approved in CQ19028 -->
<version.findbugs-annotations>1.3.9-1</version.findbugs-annotations><!-- 1.3.9-1 is approved in CQ15081 -->
<version.graphhopper>0.13.0</version.graphhopper><!-- 0.13.0 is approved in CQ22337 (api) and CQ22338 (core) -->
<version.gson>2.8.6</version.gson><!-- 2.8.6 is approved in CQ21635 -->
<version.guava>28.2-jre</version.guava><!-- 28.2-jre is approved in CQ21952 -->
<version.gson>2.10.1</version.gson><!-- 2.10.1 is approved in #6159 -->
<version.guava>32.1.1-jre</version.guava><!-- 28.2-jre is approved in #9229 -->
<version.hppc>0.8.1</version.hppc><!-- 0.8.1 is approved in CQ22339 -->
<version.jackson-xml>2.9.9</version.jackson-xml><!-- 2.9.9 is approved in CQ20701 -->
<version.java-websocket>1.3.9</version.java-websocket><!-- 1.3.9 is approved in CQ19134 -->
<version.janino>2.7.5</version.janino><!-- 2.7.5 is approved in CQ10307 -->
<version.johnzon-core>1.1.13</version.johnzon-core><!-- 1.1.13 is approved in CQ22342 -->
<version.jsch>0.1.51</version.jsch><!-- 0.1.51 is approved in CQ8378 -->
<version.junit>4.13</version.junit><!-- 4.13 is approved in CQ21439 -->
<version.junit>4.13.2</version.junit><!-- 4.13 is approved in CQ21439 -->
<version.justify>1.1.0</version.justify><!-- 1.1.0 is approved in CQ22341 -->
<version.logback>1.2.3</version.logback><!-- 1.2.3 is approved in CQ16622 -->
<version.logback>1.3.8</version.logback><!-- 1.3.8 is approved in #9459 -->
<version.mockito>3.12.4</version.mockito><!-- approval not required, we do not ship this library -->
<version.protobuf>3.8.0</version.protobuf><!-- 3.8.0 is approved in CQ20405 -->
<version.slf4j>1.7.30</version.slf4j><!-- 1.7.30 is approved in CQ21339 -->
<version.sqlite-jdbc>3.20.0</version.sqlite-jdbc><!-- 3.20.0 is approved in CQ14652 -->
<version.stax2-api>4.1</version.stax2-api><!-- 4.1 is approved in CQ17826 -->
<version.slf4j>2.0.9</version.slf4j><!-- 2.0.9 is approved #10372 -->
<version.sqlite-jdbc>3.42.0.0</version.sqlite-jdbc><!-- 3.42.0.0 is approved in #9089 -->
<version.stax2-api>4.2.1</version.stax2-api><!-- 4.1 is approved in #2670 -->
<version.woodstox-core>5.1.0</version.woodstox-core><!-- 5.1.0 is approved in CQ17827 -->
<!-- note, when upgrading, the field LibSumoAmbassador#VALID_LIBSUMO_VERSIONS needs to be changed too -->
<version.libsumo>1.17.0</version.libsumo>
Expand Down Expand Up @@ -535,7 +535,10 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
<version>0.8.10</version>
<configuration>
<skip>${skip.coverage}</skip>
</configuration>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -568,28 +571,6 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
<configuration>
<skip>${skip.coverage}</skip>
</configuration>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -669,7 +650,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>1.20</version>
<version>2.1.0</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down Expand Up @@ -706,7 +687,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>1.20</version>
<version>2.1.0</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down

0 comments on commit 8ff2ccd

Please sign in to comment.