diff --git a/EpcQrCodeRest/build.gradle b/EpcQrCodeRest/build.gradle index a2ca2ea..bd4f187 100644 --- a/EpcQrCodeRest/build.gradle +++ b/EpcQrCodeRest/build.gradle @@ -47,8 +47,8 @@ dependencies { allOpen { - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } diff --git a/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/EpcQrCodeResource.kt b/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/EpcQrCodeResource.kt index 472a4b4..0121654 100644 --- a/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/EpcQrCodeResource.kt +++ b/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/EpcQrCodeResource.kt @@ -1,5 +1,9 @@ package net.codinux.banking.epcqrcode.rest +import jakarta.inject.Inject +import jakarta.ws.rs.* +import jakarta.ws.rs.core.MediaType +import jakarta.ws.rs.core.Response import net.codinux.banking.epcqrcode.rest.dto.GenerateEpcQrCodeRequest import net.codinux.banking.epcqrcode.rest.dto.GenerateEpcQrCodeResponse import net.codinux.banking.epcqrcode.rest.service.EpcQrCodeService @@ -12,11 +16,6 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponse import org.eclipse.microprofile.openapi.annotations.tags.Tag import org.jboss.resteasy.annotations.GZIP import org.slf4j.LoggerFactory -import java.util.* -import javax.inject.Inject -import javax.ws.rs.* -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.Response @Path("/epcqrcode/v1") diff --git a/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/dto/GenerateEpcQrCodeRequest.kt b/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/dto/GenerateEpcQrCodeRequest.kt index b1b8a08..2413e6a 100644 --- a/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/dto/GenerateEpcQrCodeRequest.kt +++ b/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/dto/GenerateEpcQrCodeRequest.kt @@ -1,12 +1,12 @@ package net.codinux.banking.epcqrcode.rest.dto +import jakarta.ws.rs.DefaultValue +import jakarta.ws.rs.QueryParam import net.codinux.banking.epcqrcode.EpcQrCode import net.codinux.banking.epcqrcode.EpcQrCodeCharacterSet import net.codinux.banking.epcqrcode.ImageFormat import org.eclipse.microprofile.openapi.annotations.media.Schema import org.eclipse.microprofile.openapi.annotations.parameters.Parameter -import javax.ws.rs.DefaultValue -import javax.ws.rs.QueryParam data class GenerateEpcQrCodeRequest( diff --git a/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/service/EpcQrCodeService.kt b/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/service/EpcQrCodeService.kt index 346db7a..a2411f5 100644 --- a/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/service/EpcQrCodeService.kt +++ b/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/service/EpcQrCodeService.kt @@ -1,11 +1,11 @@ package net.codinux.banking.epcqrcode.rest.service +import jakarta.enterprise.context.ApplicationScoped import net.codinux.banking.epcqrcode.EpcQrCode import net.codinux.banking.epcqrcode.EpcQrCodeConfig import net.codinux.banking.epcqrcode.EpcQrCodeGenerator import net.codinux.banking.epcqrcode.rest.dto.GenerateEpcQrCodeRequest import java.util.* -import javax.enterprise.context.ApplicationScoped @ApplicationScoped class EpcQrCodeService { diff --git a/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/service/HtmlService.kt b/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/service/HtmlService.kt index 1e2e97c..3d76a6c 100644 --- a/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/service/HtmlService.kt +++ b/EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/service/HtmlService.kt @@ -1,6 +1,6 @@ package net.codinux.banking.epcqrcode.rest.service -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class HtmlService { diff --git a/gradle.properties b/gradle.properties index bac8f1c..614b380 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ kotlinVersion=1.8.20 coroutinesVersion=1.6.0 -quarkusVersion=2.16.6.Final +quarkusVersion=3.5.0 android.useAndroidX=true