diff --git a/.gitignore b/.gitignore index 087a183..dab6178 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,9 @@ nb-configuration.xml *.orig *.rej +# Environment +.env + # Maven target/ pom.xml.tag diff --git a/pom.xml b/pom.xml index 3cf5266..e83aa82 100644 --- a/pom.xml +++ b/pom.xml @@ -7,24 +7,23 @@ 1.0.0-SNAPSHOT - 2.1.4.Final + 3.17.6 quarkus-bom - io.quarkus - 2.1.4.Final - uber-jar - 3.8.1 - 3.0.0-M5 + io.quarkus.platform + 3.17.6 + 3.13.0 + 3.5.2 UTF-8 - 11 - 11 + 17 + 17 true - 4.12.0 + 6.13.4 - io.quarkus + io.quarkus.platform quarkus-bom ${quarkus.platform.version} pom @@ -36,7 +35,7 @@ io.quarkus - quarkus-resteasy + quarkus-rest io.quarkus @@ -50,7 +49,7 @@ io.quarkus - quarkus-resteasy-jsonb + quarkus-rest-jsonb io.quarkus @@ -120,11 +119,8 @@ - native-image + build - - true - diff --git a/src/main/java/com/redhat/cloudnative/Inventory.java b/src/main/java/com/redhat/cloudnative/Inventory.java index 3080822..0be5577 100644 --- a/src/main/java/com/redhat/cloudnative/Inventory.java +++ b/src/main/java/com/redhat/cloudnative/Inventory.java @@ -1,11 +1,11 @@ package com.redhat.cloudnative; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import io.quarkus.hibernate.orm.panache.PanacheEntity; -import javax.persistence.Column; +import jakarta.persistence.Column; @Entity @Table(name = "INVENTORY") diff --git a/src/main/java/com/redhat/cloudnative/InventoryResource.java b/src/main/java/com/redhat/cloudnative/InventoryResource.java index ad2f09c..c1bce9c 100644 --- a/src/main/java/com/redhat/cloudnative/InventoryResource.java +++ b/src/main/java/com/redhat/cloudnative/InventoryResource.java @@ -1,11 +1,11 @@ package com.redhat.cloudnative; -import javax.enterprise.context.ApplicationScoped; -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 jakarta.enterprise.context.ApplicationScoped; +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; @Path("/api/inventory") @ApplicationScoped diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index edc16e4..4b7984e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,4 +3,4 @@ quarkus.datasource.db-kind=h2 quarkus.hibernate-orm.database.generation=drop-and-create quarkus.hibernate-orm.log.sql=true quarkus.hibernate-orm.sql-load-script=import.sql -%prod.quarkus.package.uber-jar=true +%prod.quarkus.package.jar.type=uber-jar diff --git a/src/test/java/com/redhat/cloudnative/NativeInventoryResourceIT.java b/src/test/java/com/redhat/cloudnative/NativeInventoryResourceIT.java index 0259ad2..48e49d1 100644 --- a/src/test/java/com/redhat/cloudnative/NativeInventoryResourceIT.java +++ b/src/test/java/com/redhat/cloudnative/NativeInventoryResourceIT.java @@ -1,8 +1,8 @@ package com.redhat.cloudnative; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class NativeInventoryResourceIT extends InventoryResourceTest { // Execute the same tests but in native mode.