Move to Jakarta

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-open-api-parent</artifactId>
-        <version>2.1.18-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-open-api-core</artifactId>

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/JAXBElementDto.java

@@ -1,10 +1,10 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestContainer.java

@@ -4,20 +4,20 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Negative;
-import javax.validation.constraints.NegativeOrZero;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
-import javax.validation.constraints.PositiveOrZero;
-import javax.validation.constraints.Size;
-import javax.validation.groups.Default;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Negative;
+import jakarta.validation.constraints.NegativeOrZero;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.groups.Default;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/Dog.java

@@ -1,6 +1,6 @@
 package test.io.smallrye.openapi.runtime.scanner.dataobject;
 
-import javax.json.bind.annotation.JsonbProperty;
+import jakarta.json.bind.annotation.JsonbProperty;
 
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/JaxbCustomPropertyOrder.java

@@ -1,8 +1,8 @@
 package test.io.smallrye.openapi.runtime.scanner.dataobject;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType(propOrder = { "theName", "comment2ActuallyFirst", "comment", "name2" })
 public class JaxbCustomPropertyOrder {

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/MySchema.java

@@ -1,6 +1,6 @@
 package test.io.smallrye.openapi.runtime.scanner.dataobject;
 
-import javax.json.bind.annotation.JsonbPropertyOrder;
+import jakarta.json.bind.annotation.JsonbPropertyOrder;
 
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypeFieldOnly.java

@@ -1,7 +1,7 @@
 package test.io.smallrye.openapi.runtime.scanner.dataobject;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
 
 @XmlAccessorType(value = XmlAccessType.FIELD)
 public class XmlAccessTypeFieldOnly {

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePropertyOnly.java

@@ -1,7 +1,7 @@
 package test.io.smallrye.openapi.runtime.scanner.dataobject;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
 
 @XmlAccessorType(value = XmlAccessType.PROPERTY)
 public class XmlAccessTypePropertyOnly {

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePublicMember.java

@@ -1,7 +1,7 @@
 package test.io.smallrye.openapi.runtime.scanner.dataobject;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
 
 @XmlAccessorType(value = XmlAccessType.PUBLIC_MEMBER)
 public class XmlAccessTypePublicMember {

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientClass.java

@@ -1,6 +1,6 @@
 package test.io.smallrye.openapi.runtime.scanner.dataobject;
 
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
 
 @XmlTransient
 public class XmlTransientClass {

core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientField.java

@@ -1,6 +1,6 @@
 package test.io.smallrye.openapi.runtime.scanner.dataobject;
 
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
 
 public class XmlTransientField {
 

extension-jaxrs/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-open-api-parent</artifactId>
-        <version>2.1.18-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-open-api-jaxrs</artifactId>
@@ -111,7 +111,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <!-- Overriding version from smallrye-parent. JUnit 5 Tests not executed otherwise. -->
+                    <!-- Overriding version from smallrye-jakarta-parent. JUnit 5 Tests not executed otherwise. -->
                     <version>3.0.0-M5</version>
                 </plugin>
             </plugins>

extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/ConfigSchemaTest.java

@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import javax.json.Json;
+import jakarta.json.Json;
 
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;

extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/JaxRsAnnotationScannerTest.java

@@ -5,12 +5,12 @@
 import java.util.HashMap;
 import java.util.UUID;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.openapi.OASConfig;
 import org.eclipse.microprofile.openapi.annotations.extensions.Extension;

extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/util/JandexUtilTests.java

@@ -4,7 +4,7 @@
 
 import java.util.Arrays;
 
-import javax.ws.rs.Path;
+import jakarta.ws.rs.Path;
 
 import org.eclipse.microprofile.openapi.annotations.media.Content;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/AllTheParamsTestResource.java

@@ -2,20 +2,20 @@
 
 import java.util.concurrent.CompletionStage;
 
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.BeanParam;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.MatrixParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.BeanParam;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.MatrixParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.openapi.annotations.enums.Explode;
 import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn;

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseGenericResource.java

@@ -2,9 +2,9 @@
 
 import java.util.Map;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.QueryParam;
 
 public class BaseGenericResource<T1, T2, T3> {
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseModel.java

@@ -3,7 +3,7 @@
 import java.util.Date;
 import java.util.UUID;
 
-import javax.json.bind.annotation.JsonbDateFormat;
+import jakarta.json.bind.annotation.JsonbDateFormat;
 
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource.java

@@ -1,6 +1,6 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 public abstract class BaseResource<T extends BaseModel> {
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource2.java

@@ -2,9 +2,9 @@
 
 import java.util.Map;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.QueryParam;
 
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamAddon.java

@@ -1,6 +1,6 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-import javax.ws.rs.HeaderParam;
+import jakarta.ws.rs.HeaderParam;
 
 public interface BeanParamAddon {
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamBase.java

@@ -1,6 +1,6 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.QueryParam;
 
 public class BeanParamBase implements BeanParamAddon {
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamImpl.java

@@ -1,6 +1,6 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-import javax.ws.rs.CookieParam;
+import jakarta.ws.rs.CookieParam;
 
 public class BeanParamImpl extends BeanParamBase implements BeanParamAddon {
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamMultipartFormInheritanceResource.java

@@ -1,12 +1,12 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-import javax.ws.rs.BeanParam;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BeanParam;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CharSequenceArrayParamTestResource.java

@@ -1,10 +1,10 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CommonTargetMethodParameterResource.java

@@ -1,11 +1,11 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Conversation.java

@@ -1,10 +1,10 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 public interface Conversation {
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DefaultEnumTestResource.java

@@ -2,13 +2,13 @@
 
 import java.util.Optional;
 
-import javax.validation.constraints.Size;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.validation.constraints.Size;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
 

extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorFullDeclaredInResponseTestResource.java

@@ -1,10 +1,10 @@
 package test.io.smallrye.openapi.runtime.scanner;
 
-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.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 org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.media.Content;