Skip to content

Commit

Permalink
update to latest dependencies and JUnit 5
Browse files Browse the repository at this point in the history
removed unused javakaffee serializers
these can be added as dependencies to to dependents of kryo-tools
  • Loading branch information
abyrd committed Jan 13, 2023
1 parent eb0e68b commit cc3bc17
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 21 deletions.
45 changes: 27 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,28 @@
</distributionManagement>

<build>

<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<!-- use Java 11 -->
<!-- Target Java LTS 11 -->
<release>11</release>
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration>
<archive>
<manifestEntries>
<!-- For Java 11 Modules, specify a module name. Do not create module-info.java until all
<!-- For Java 11+ Modules, specify a module name. Do not create module-info.java until all
our dependencies specify a module name. -->
<Automatic-Module-Name>com.conveyal.kryo_tools</Automatic-Module-Name>
</manifestEntries>
Expand Down Expand Up @@ -159,19 +160,28 @@
</plugins>
</build>

<!-- Dependencies reviewed: as of 2023-01-13 all are at latest versions. -->

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.9.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Kryo serialization, for which we are defining custom serializers. -->
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
<version>5.3.0</version>
</dependency>
<!-- Extra serializers for Kryo -->
<dependency>
<groupId>de.javakaffee</groupId>
<artifactId>kryo-serializers</artifactId>
<version>0.45</version>
<version>5.4.0</version>
</dependency>

<!-- Trove provides optimized map/set collections for primitive types (int, long, etc.) -->
<!-- Many of our custom serializers are for Trove collection classes. -->
<dependency>
Expand All @@ -184,25 +194,24 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
<version>31.1-jre</version>
</dependency>
<!-- Logging API. -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>2.0.6</version>
</dependency>
<!-- Logging API implementation. -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.10</version>
<version>1.4.5</version>
</dependency>
<!-- Junit is for unit testing. -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
import gnu.trove.map.hash.TIntIntHashMap;
import gnu.trove.map.hash.TIntObjectHashMap;
import gnu.trove.map.hash.TLongObjectHashMap;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
import java.util.stream.IntStream;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

/**
* This test verifies that the ObjectDiffer can find differences in nested objects.
Expand Down

0 comments on commit cc3bc17

Please sign in to comment.