From f52762a56d7db2fe655bfe3d39767b882b93bfb6 Mon Sep 17 00:00:00 2001 From: Aleksandr Prigodich Date: Fri, 17 Oct 2025 14:42:34 +0300 Subject: [PATCH 1/3] update dependency from jakarta to javax --- .github/workflows/maven-publish.yml | 4 ++-- pom.xml | 16 ++++++++-------- .../test/fake/CrudRepositoryFake.java | 6 +----- .../org/springframework/test/fake/Message.java | 8 ++++---- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index dab69fe..6e43a15 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -17,10 +17,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '21' distribution: 'temurin' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file diff --git a/pom.xml b/pom.xml index 07aaad6..23f1383 100644 --- a/pom.xml +++ b/pom.xml @@ -6,20 +6,20 @@ org.springframework fake-test - 1.0.3 + 1.0.4 jar - 17 - 17 + 21 + 21 UTF-8 - jakarta.persistence - jakarta.persistence-api - 3.1.0 + javax.persistence + javax.persistence-api + 2.2 org.springframework.data @@ -59,8 +59,8 @@ maven-compiler-plugin 3.8.1 - 17 - 17 + 21 + 21 diff --git a/src/main/java/org/springframework/test/fake/CrudRepositoryFake.java b/src/main/java/org/springframework/test/fake/CrudRepositoryFake.java index 95f4246..a7517ba 100644 --- a/src/main/java/org/springframework/test/fake/CrudRepositoryFake.java +++ b/src/main/java/org/springframework/test/fake/CrudRepositoryFake.java @@ -1,11 +1,7 @@ package org.springframework.test.fake; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; +import javax.persistence.Id; import org.springframework.data.repository.CrudRepository; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/src/test/java/org/springframework/test/fake/Message.java b/src/test/java/org/springframework/test/fake/Message.java index 488aac3..d36d9e6 100644 --- a/src/test/java/org/springframework/test/fake/Message.java +++ b/src/test/java/org/springframework/test/fake/Message.java @@ -2,10 +2,10 @@ import java.util.Objects; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; @Entity public class Message { From 318d076912624ad2d6dfd2bbb2ef5b90549acb6d Mon Sep 17 00:00:00 2001 From: Aleksandr Prigodich Date: Fri, 17 Oct 2025 16:39:07 +0300 Subject: [PATCH 2/3] fix maven CI/CD --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23f1383..e458cff 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ github GitHub OWNER Apache Maven Packages - https://maven.pkg.github.com/peterarsentev/SpringFakeTest + https://maven.pkg.github.com/Olegsander48/SpringFakeTest \ No newline at end of file From 770650e172d1814318f4cf44714c89b0c8173c23 Mon Sep 17 00:00:00 2001 From: Aleksandr Prigodich <64789713+Olegsander48@users.noreply.github.com> Date: Fri, 17 Oct 2025 16:44:59 +0300 Subject: [PATCH 3/3] Revert "fix maven CI/CD" --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e458cff..23f1383 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ github GitHub OWNER Apache Maven Packages - https://maven.pkg.github.com/Olegsander48/SpringFakeTest + https://maven.pkg.github.com/peterarsentev/SpringFakeTest \ No newline at end of file