From efd63c1909042502c52e921bce4a313b21722bfd Mon Sep 17 00:00:00 2001 From: Evelyn Date: Sun, 31 May 2026 18:37:00 -0700 Subject: [PATCH 1/3] (#55) upgraded to Spring Boot 4.0.6, JDK 17, and zonky 2.8.0 --- .../java/at/drm/processor/RelationProcessor.java | 2 +- .../at/drm/processor/RelationProcessorTest.java | 2 +- .../at/drm/util/DynamicRelationsUtilsTest.java | 6 +++--- pom.xml | 16 ++++++++-------- .../resources/application-integration.properties | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dynamic-relations/src/main/java/at/drm/processor/RelationProcessor.java b/dynamic-relations/src/main/java/at/drm/processor/RelationProcessor.java index 6dd39f3..3e23f99 100644 --- a/dynamic-relations/src/main/java/at/drm/processor/RelationProcessor.java +++ b/dynamic-relations/src/main/java/at/drm/processor/RelationProcessor.java @@ -70,7 +70,7 @@ public Set getSupportedAnnotationTypes() { @Override public SourceVersion getSupportedSourceVersion() { processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "getSupportedSourceVersion"); - return SourceVersion.RELEASE_21; + return SourceVersion.RELEASE_17; } @Override diff --git a/dynamic-relations/src/test/java/at/drm/processor/RelationProcessorTest.java b/dynamic-relations/src/test/java/at/drm/processor/RelationProcessorTest.java index 9134002..b390fa3 100644 --- a/dynamic-relations/src/test/java/at/drm/processor/RelationProcessorTest.java +++ b/dynamic-relations/src/test/java/at/drm/processor/RelationProcessorTest.java @@ -52,7 +52,7 @@ void getSupportedSourceVersion() { Mockito.when(processingEnvironment.getMessager()).thenReturn(messager); relationProcessorUnderTest.init(processingEnvironment); SourceVersion supportedSourceVersion = relationProcessorUnderTest.getSupportedSourceVersion(); - assertThat(supportedSourceVersion).isEqualTo(SourceVersion.RELEASE_21); + assertThat(supportedSourceVersion).isEqualTo(SourceVersion.RELEASE_17); } @Test diff --git a/dynamic-relations/src/test/java/at/drm/util/DynamicRelationsUtilsTest.java b/dynamic-relations/src/test/java/at/drm/util/DynamicRelationsUtilsTest.java index a3902a2..01ac25f 100644 --- a/dynamic-relations/src/test/java/at/drm/util/DynamicRelationsUtilsTest.java +++ b/dynamic-relations/src/test/java/at/drm/util/DynamicRelationsUtilsTest.java @@ -58,7 +58,7 @@ void testListRegisteredEntities_WithDuplicateEntityTypes_ShouldReturnDistinctCla assertNotNull(result); assertEquals(1, result.size()); - assertEquals(SomeTestEntity.class, result.getFirst()); + assertEquals(SomeTestEntity.class, result.get(0)); verify(relationDaoFactory, times(1)).getAllDaos(); } @@ -82,7 +82,7 @@ void testExtractEntityClassFromDao_WithValidDao_ShouldReturnCorrectEntityClass() assertNotNull(result); assertEquals(1, result.size()); - assertEquals(SomeTestEntity.class, result.getFirst()); + assertEquals(SomeTestEntity.class, result.get(0)); } @Test @@ -106,7 +106,7 @@ void testListRegisteredEntities_WithSingleDao_ShouldReturnSingleEntity() { assertNotNull(result); assertEquals(1, result.size()); - assertEquals(SomeTestEntity.class, result.getFirst()); + assertEquals(SomeTestEntity.class, result.get(0)); verify(relationDaoFactory, times(1)).getAllDaos(); } diff --git a/pom.xml b/pom.xml index cd07639..b11d3cf 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.4 + 4.0.6 @@ -133,7 +133,7 @@ - 21 + 17 1.0.7 1.2.7 3.14.0 @@ -141,8 +141,8 @@ 3.2.8 3.2.0 3.2.1 - 21 - 21 + 17 + 17 1.6.13 1.18.38 42.7.7 @@ -150,13 +150,13 @@ 0.21.0 1.13.0 - 3.5.4 + 4.0.6 UTF-8 - 2.6.0 + 2.8.0 2.1.0 17.5.0 - 3.5.4 - 6.2.9 + 4.0.6 + 7.0.7 11.10.5 diff --git a/testing/src/test/resources/application-integration.properties b/testing/src/test/resources/application-integration.properties index 50899ba..93a4201 100644 --- a/testing/src/test/resources/application-integration.properties +++ b/testing/src/test/resources/application-integration.properties @@ -1,5 +1,5 @@ spring.datasource.driver-class-name=org.postgresql.Driver -spring.jpa.hibernate.ddl-auto=validate +spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect spring.jpa.show-sql=false spring.flyway.enabled=true \ No newline at end of file From a309536345068d939af8a9ee1a5f5fe6e67b49c2 Mon Sep 17 00:00:00 2001 From: Evelyn Date: Mon, 1 Jun 2026 13:38:22 -0700 Subject: [PATCH 2/3] fixed pom.xml and dependencies for JDK 25 compatability --- .../at/drm/processor/RelationProcessor.java | 2 +- .../drm/processor/RelationProcessorTest.java | 2 +- .../drm/util/DynamicRelationsUtilsTest.java | 6 ++--- pom.xml | 26 ++++++++++++++----- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dynamic-relations/src/main/java/at/drm/processor/RelationProcessor.java b/dynamic-relations/src/main/java/at/drm/processor/RelationProcessor.java index 3e23f99..e959d30 100644 --- a/dynamic-relations/src/main/java/at/drm/processor/RelationProcessor.java +++ b/dynamic-relations/src/main/java/at/drm/processor/RelationProcessor.java @@ -70,7 +70,7 @@ public Set getSupportedAnnotationTypes() { @Override public SourceVersion getSupportedSourceVersion() { processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "getSupportedSourceVersion"); - return SourceVersion.RELEASE_17; + return SourceVersion.RELEASE_25; } @Override diff --git a/dynamic-relations/src/test/java/at/drm/processor/RelationProcessorTest.java b/dynamic-relations/src/test/java/at/drm/processor/RelationProcessorTest.java index b390fa3..96cee6f 100644 --- a/dynamic-relations/src/test/java/at/drm/processor/RelationProcessorTest.java +++ b/dynamic-relations/src/test/java/at/drm/processor/RelationProcessorTest.java @@ -52,7 +52,7 @@ void getSupportedSourceVersion() { Mockito.when(processingEnvironment.getMessager()).thenReturn(messager); relationProcessorUnderTest.init(processingEnvironment); SourceVersion supportedSourceVersion = relationProcessorUnderTest.getSupportedSourceVersion(); - assertThat(supportedSourceVersion).isEqualTo(SourceVersion.RELEASE_17); + assertThat(supportedSourceVersion).isEqualTo(SourceVersion.RELEASE_25); } @Test diff --git a/dynamic-relations/src/test/java/at/drm/util/DynamicRelationsUtilsTest.java b/dynamic-relations/src/test/java/at/drm/util/DynamicRelationsUtilsTest.java index 01ac25f..a3902a2 100644 --- a/dynamic-relations/src/test/java/at/drm/util/DynamicRelationsUtilsTest.java +++ b/dynamic-relations/src/test/java/at/drm/util/DynamicRelationsUtilsTest.java @@ -58,7 +58,7 @@ void testListRegisteredEntities_WithDuplicateEntityTypes_ShouldReturnDistinctCla assertNotNull(result); assertEquals(1, result.size()); - assertEquals(SomeTestEntity.class, result.get(0)); + assertEquals(SomeTestEntity.class, result.getFirst()); verify(relationDaoFactory, times(1)).getAllDaos(); } @@ -82,7 +82,7 @@ void testExtractEntityClassFromDao_WithValidDao_ShouldReturnCorrectEntityClass() assertNotNull(result); assertEquals(1, result.size()); - assertEquals(SomeTestEntity.class, result.get(0)); + assertEquals(SomeTestEntity.class, result.getFirst()); } @Test @@ -106,7 +106,7 @@ void testListRegisteredEntities_WithSingleDao_ShouldReturnSingleEntity() { assertNotNull(result); assertEquals(1, result.size()); - assertEquals(SomeTestEntity.class, result.get(0)); + assertEquals(SomeTestEntity.class, result.getFirst()); verify(relationDaoFactory, times(1)).getAllDaos(); } diff --git a/pom.xml b/pom.xml index b11d3cf..c8de221 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ - 17 + 25 1.0.7 1.2.7 3.14.0 @@ -141,10 +141,10 @@ 3.2.8 3.2.0 3.2.1 - 17 - 17 + 25 + 25 1.6.13 - 1.18.38 + 1.18.46 42.7.7 1.1.1 0.21.0 @@ -261,14 +261,26 @@ - + org.apache.maven.plugins maven-compiler-plugin ${maven-compiler-plugin.version} true - 1.21 - 1.21 + ${maven.compiler.source} + ${maven.compiler.target} + + + org.projectlombok + lombok + ${lombok.version} + + + io.github.mom0aut + dynamic-relations + ${revision} + + From 478326918c4cf55be326e37d9c3583f9b71c510c Mon Sep 17 00:00:00 2001 From: Evelyn Date: Tue, 2 Jun 2026 19:28:16 -0700 Subject: [PATCH 3/3] updated yml files to include jdk 25 --- .github/workflows/maven-pr.yml | 4 ++-- .github/workflows/maven.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-pr.yml b/.github/workflows/maven-pr.yml index 69e3e72..9a19337 100644 --- a/.github/workflows/maven-pr.yml +++ b/.github/workflows/maven-pr.yml @@ -16,10 +16,10 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN || secrets.TOKEN}} fetch-depth: 0 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v3 with: - java-version: '21' + java-version: '25' distribution: 'temurin' cache: maven - name: Build with Maven diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cc3c187..58b144a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -18,10 +18,10 @@ jobs: with: token: ${{ secrets.TOKEN}} fetch-depth: 0 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v3 with: - java-version: '21' + java-version: '25' distribution: 'temurin' cache: maven - name: Build with Maven