diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d26f28..2ad1a53 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: ['8', '11', '17', '21'] + java_version: ['8', '11', '17', '21', '25'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" steps: diff --git a/pom.xml b/pom.xml index 42a26a7..af9f04e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.fasterxml oss-parent - 68 + 69 com.fasterxml.uuid java-uuid-generator @@ -15,7 +15,7 @@ --> bundle Java UUID Generator - 5.1.2-SNAPSHOT + 5.2.0-SNAPSHOT Java UUID Generator (JUG) is a Java library for generating Universally Unique IDentifiers, UUIDs (see http://en.wikipedia.org/wiki/UUID). diff --git a/release-notes/VERSION b/release-notes/VERSION index 615fefc..d8773c8 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -4,6 +4,10 @@ Project: java-uuid-generator Releases ============================================================================ +5.2.0 (not yet released) + +- Update to `oss-parent` v69 + 5.1.1 (26-Sep-2025) #122: RFC-4122 Obsoleted by RFC-9562 (document change) diff --git a/src/test/java/com/fasterxml/uuid/JugNamedTest.java b/src/test/java/com/fasterxml/uuid/JugNamedTest.java index 2352a94..33d41db 100644 --- a/src/test/java/com/fasterxml/uuid/JugNamedTest.java +++ b/src/test/java/com/fasterxml/uuid/JugNamedTest.java @@ -14,9 +14,9 @@ import java.util.List; import java.util.UUID; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.StringContains.containsString; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; @RunWith(Parameterized.class) public class JugNamedTest { diff --git a/src/test/java/com/fasterxml/uuid/JugNoArgsTest.java b/src/test/java/com/fasterxml/uuid/JugNoArgsTest.java index d000105..54499cf 100644 --- a/src/test/java/com/fasterxml/uuid/JugNoArgsTest.java +++ b/src/test/java/com/fasterxml/uuid/JugNoArgsTest.java @@ -11,6 +11,7 @@ import java.lang.reflect.Array; import java.util.*; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.StringContains.containsString; import static org.junit.Assert.*;