TOMEE-4344 - MP6: OpenAPI 3.1

apache · May 30, 2024 · 4c79b73 · 4c79b73
1 parent c50750b
commit 4c79b73
Show file tree

Hide file tree

Showing 15 changed files with 104 additions and 132 deletions.
diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml
@@ -241,7 +241,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>3.0</version>
+      <version>3.1.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
@@ -433,7 +433,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>jandex</artifactId>
-      <version>3.0.1</version>
+      <version>3.1.6</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -510,7 +510,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-open-api-core</artifactId>
-      <version>3.0.1</version>
+      <version>3.10.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -521,7 +521,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-open-api-jaxrs</artifactId>
-      <version>3.0.1</version>
+      <version>3.10.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2028,7 +2028,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>3.0</version>
+      <version>3.1.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
@@ -241,7 +241,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>3.0</version>
+      <version>3.1.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
@@ -433,7 +433,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>jandex</artifactId>
-      <version>3.0.1</version>
+      <version>3.1.6</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -510,7 +510,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-open-api-core</artifactId>
-      <version>3.0.1</version>
+      <version>3.10.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -521,7 +521,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-open-api-jaxrs</artifactId>
-      <version>3.0.1</version>
+      <version>3.10.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2127,7 +2127,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>3.0</version>
+      <version>3.1.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
@@ -252,7 +252,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>3.0</version>
+      <version>3.1.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
@@ -433,7 +433,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>jandex</artifactId>
-      <version>3.0.1</version>
+      <version>3.1.6</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -510,7 +510,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-open-api-core</artifactId>
-      <version>3.0.1</version>
+      <version>3.10.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -521,7 +521,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-open-api-jaxrs</artifactId>
-      <version>3.0.1</version>
+      <version>3.10.0</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -2149,7 +2149,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>3.0</version>
+      <version>3.1.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -184,7 +184,7 @@
     <version.microprofile.health>4.0.1</version.microprofile.health>
     <version.microprofile.jwt>2.1</version.microprofile.jwt>
     <version.microprofile.metrics>5.0.2</version.microprofile.metrics>
-    <version.microprofile.openapi>3.0</version.microprofile.openapi>
+    <version.microprofile.openapi>3.1.1</version.microprofile.openapi>
     <version.microprofile.opentracing>3.0</version.microprofile.opentracing>
     <version.microprofile.rest-client>3.0.1</version.microprofile.rest-client>
 
@@ -195,7 +195,7 @@
     <version.microprofile.impl.fault-tolerance>6.2.2</version.microprofile.impl.fault-tolerance>
     <version.microprofile.impl.health>4.0.1</version.microprofile.impl.health>
     <version.microprofile.impl.metrics>5.0.1</version.microprofile.impl.metrics>
-    <version.microprofile.impl.openapi>3.0.1</version.microprofile.impl.openapi>
+    <version.microprofile.impl.openapi>3.10.0</version.microprofile.impl.openapi>
     <version.microprofile.impl.opentracing>3.0.3</version.microprofile.impl.opentracing>
 
     <!-- Jackson and snakeyaml required by OpenAPI Impl -->

diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
@@ -115,7 +115,6 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <!-- 7.4.0 is broken, so until 7.5.0 is released ... -->
       <version>7.5.1</version>
       <scope>test</scope>
     </dependency>

diff --git a/...a/org.apache.tomee.microprofile.tck.openapi/MicroProfileOpenAPITCKDeploymentPackager.java b/...a/org.apache.tomee.microprofile.tck.openapi/MicroProfileOpenAPITCKDeploymentPackager.java
diff --git a/.../test/java/org.apache.tomee.microprofile.tck.openapi/MicroProfileOpenAPITCKExtension.java b/.../test/java/org.apache.tomee.microprofile.tck.openapi/MicroProfileOpenAPITCKExtension.java
@@ -16,17 +16,14 @@
  */
 package org.apache.tomee.microprofile.tck.openapi;
 
-import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
-import org.jboss.arquillian.container.test.spi.client.protocol.Protocol;
 import org.jboss.arquillian.core.spi.LoadableExtension;
-import org.jboss.arquillian.protocol.servlet5.v_5.ServletProtocol;
 
 public class MicroProfileOpenAPITCKExtension implements LoadableExtension {
     @Override
     public void register(final ExtensionBuilder extensionBuilder) {
         extensionBuilder
-                .override(Protocol.class, ServletProtocol.class, MicroProfileOpenAPITCKProtocol.class)
                 .observer(MicroProfileOpenAPITCKObserver.class)
+            .observer(MicroprofileOpenAPITCKDeploymentProcessor.class)
         ;
     }
 }
diff --git a/...c/test/java/org.apache.tomee.microprofile.tck.openapi/MicroProfileOpenAPITCKObserver.java b/...c/test/java/org.apache.tomee.microprofile.tck.openapi/MicroProfileOpenAPITCKObserver.java
@@ -22,6 +22,6 @@
 
 public class MicroProfileOpenAPITCKObserver {
     public void AfterDeploy(@Observes final AfterDeploy afterDeploy) {
-        RestAssured.basePath = "microprofile-openapi";
+        RestAssured.basePath = afterDeploy.getDeployment().getArchive().getName().replace(".war","");
     }
 }
diff --git a/...c/test/java/org.apache.tomee.microprofile.tck.openapi/MicroProfileOpenAPITCKProtocol.java b/...c/test/java/org.apache.tomee.microprofile.tck.openapi/MicroProfileOpenAPITCKProtocol.java
diff --git a/.../org.apache.tomee.microprofile.tck.openapi/MicroprofileOpenAPITCKDeploymentProcessor.java b/.../org.apache.tomee.microprofile.tck.openapi/MicroprofileOpenAPITCKDeploymentProcessor.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.microprofile.tck.openapi;
+
+import java.util.Map;
+
+import org.apache.ziplock.JarLocation;
+import org.hamcrest.Matchers;
+import org.jboss.arquillian.container.spi.client.deployment.DeploymentDescription;
+import org.jboss.arquillian.container.spi.event.container.BeforeDeploy;
+import org.jboss.arquillian.core.api.annotation.Observes;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
+public class MicroprofileOpenAPITCKDeploymentProcessor {
+
+    public void observeDeployment(@Observes final BeforeDeploy beforeDeploy) {
+        DeploymentDescription deployment = beforeDeploy.getDeployment();
+        Archive<?> testableArchive = deployment.getTestableArchive();
+        if (testableArchive != null) {
+            process(testableArchive);
+        } else {
+            process(deployment.getArchive());
+        }
+    }
+
+    private void process(Archive<?> archive) {
+        if (archive instanceof WebArchive webapp) {
+            webapp.addAsLibrary(JarLocation.jarLocation(Matchers.class)) // required for ModelConstructionTest
+                    .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+        }
+    }
+
+}
diff --git a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
@@ -33,7 +33,6 @@
       <property name="appWorkingDir">target/workdir</property>
       <property name="cleanOnStartUp">true</property>
       <property name="properties">
-        geronimo.openapi.application.append-context-path = false
       </property>
     </configuration>
   </container>
@@ -49,7 +48,6 @@
       <property name="cleanOnStartUp">true</property>
       <property name="properties">
         tomee.mp.scan = all
-        geronimo.openapi.application.append-context-path = false
       </property>
     </configuration>
   </container>
@@ -65,7 +63,6 @@
       <property name="cleanOnStartUp">true</property>
       <property name="properties">
         tomee.mp.scan = all
-        geronimo.openapi.application.append-context-path = false
       </property>
     </configuration>
   </container>