Move to Jakarta

radcortez · Jul 24, 2023 · 79b8048 · 79b8048
1 parent 833d66a
commit 79b8048
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,9 +26,9 @@ jobs:
         name: checkout
 
       - uses: actions/setup-java@v1
-        name: set up jdk 11
+        name: set up jdk 17
         with:
-          java-version: 11
+          java-version: 17
 
       - name: build with maven
         run: mvn verify -Pnative
@@ -40,9 +40,9 @@ jobs:
         name: checkout
 
       - uses: actions/setup-java@v1
-        name: set up jdk 11
+        name: set up jdk 17
         with:
-          java-version: 11
+          java-version: 17
 
       - name: build with maven
         # Skip integration tests. TestContainers does not support Windows Server 2019: https://github.com/testcontainers/testcontainers-java/issues/2960

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Add the following dependency to your project:
 <dependency>
   <groupId>com.radcortez.flyway</groupId>
   <artifactId>flyway-junit5-extension</artifactId>
-  <version>1.4.0</version>
+  <version>2.0.0</version>
   <scope>test</scope>
 </dependency>
 ```

diff --git a/examples/quarkus/src/main/java/com/radcortez/flyway/quarkus/User.java b/examples/quarkus/src/main/java/com/radcortez/flyway/quarkus/User.java
@@ -7,11 +7,11 @@
 import lombok.experimental.Accessors;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Data
 @NoArgsConstructor

diff --git a/examples/quarkus/src/main/java/com/radcortez/flyway/quarkus/UserRepository.java b/examples/quarkus/src/main/java/com/radcortez/flyway/quarkus/UserRepository.java
@@ -3,8 +3,8 @@
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
 import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.transaction.Transactional;
 import java.util.Optional;
 
 @ApplicationScoped

diff --git a/examples/quarkus/src/main/java/com/radcortez/flyway/quarkus/UserResource.java b/examples/quarkus/src/main/java/com/radcortez/flyway/quarkus/UserResource.java
@@ -1,14 +1,14 @@
 package com.radcortez.flyway.quarkus;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 
 @Path("/users")
 @Produces(MediaType.APPLICATION_JSON)

diff --git a/...les/quarkus/src/test/java/com/radcortez/flyway/quarkus/UserRepositoryDevServicesTest.java b/...les/quarkus/src/test/java/com/radcortez/flyway/quarkus/UserRepositoryDevServicesTest.java
@@ -15,7 +15,7 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 import static io.restassured.RestAssured.given;
-import static javax.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.OK;
 
 @DisabledOnOs(OS.WINDOWS)
 @QuarkusTest

diff --git a/examples/quarkus/src/test/java/com/radcortez/flyway/quarkus/UserRepositoryTest.java b/examples/quarkus/src/test/java/com/radcortez/flyway/quarkus/UserRepositoryTest.java
@@ -21,10 +21,10 @@
 import java.net.URL;
 
 import static io.restassured.RestAssured.given;
-import static javax.ws.rs.core.HttpHeaders.ACCEPT;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.HttpHeaders.ACCEPT;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @QuarkusTest

diff --git a/examples/spring/src/main/java/com/radcortez/flyway/spring/User.java b/examples/spring/src/main/java/com/radcortez/flyway/spring/User.java
@@ -7,11 +7,11 @@
 import lombok.experimental.Accessors;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Data
 @NoArgsConstructor