Merge branch 'Java17LTS'

KodeMunkie · May 11, 2024 · 31e86c2 · 31e86c2
2 parents a925e5e + c11e67f
commit 31e86c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,24 +11,24 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/junit/junit -->
+        <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
+
         <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.13</version>
-            <!--<scope>test</scope>-->
+            <version>1.17.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
         <dependency>

diff --git a/src/test/java/uk/co/silentsoftware/codec/tile/TileCodecTest.java b/src/test/java/uk/co/silentsoftware/codec/tile/TileCodecTest.java
@@ -1,8 +1,8 @@
 package uk.co.silentsoftware.codec.tile;
 
 import org.apache.commons.codec.binary.Hex;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import uk.co.silentsoftware.codec.Codec;
 import uk.co.silentsoftware.codec.constants.IndexedPalette;
 
@@ -17,13 +17,13 @@ public class TileCodecTest {
     public void testSimpleTile1() throws Exception {
         Codec codec = new TileCodec(new IndexedPalette());
         BufferedImage image = codec.decode(Hex.decodeHex(TEST_TILE_DATA_1));
-        Assert.assertEquals(TEST_TILE_DATA_1, Hex.encodeHexString(codec.encode(image),false));
+        Assertions.assertEquals(TEST_TILE_DATA_1, Hex.encodeHexString(codec.encode(image),false));
     }
 
     @Test
     public void testSimpleTile2() throws Exception {
         Codec codec = new TileCodec(new IndexedPalette());
         BufferedImage image = codec.decode(Hex.decodeHex(TEST_TILE_DATA_2));
-        Assert.assertEquals(TEST_TILE_DATA_2, Hex.encodeHexString(codec.encode(image),false));
+        Assertions.assertEquals(TEST_TILE_DATA_2, Hex.encodeHexString(codec.encode(image),false));
     }
 }