Update MicroProfile OpenAPI tests for v4.0.

jboss-eap-qe · Nov 12, 2024 · b5ce59c · b5ce59c
1 parent 97a0076
commit b5ce59c
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 12 deletions.
diff --git a/microprofile-open-api/pom.xml b/microprofile-open-api/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>microprofile-test-suite</artifactId>
         <groupId>org.jboss.eap.qe</groupId>
@@ -11,6 +11,19 @@
 
     <artifactId>microprofile-open-api</artifactId>
 
+    <properties>
+        <version.openapi>3.1.0</version.openapi>
+    </properties>
+
+    <build>
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
@@ -65,8 +78,8 @@
             <artifactId>gson</artifactId>
             <scope>test</scope>
         </dependency>
-    </dependencies>    
-    
+    </dependencies>
+
     <profiles>
         <!-- Test against Bootable JAR -->
         <profile>

diff --git a/microprofile-open-api/src/test/resources/META-INF/openapi-broken.yaml b/microprofile-open-api/src/test/resources/META-INF/openapi-broken.yaml
@@ -1,5 +1,5 @@
 ---
-openapi: 3.0.1
+openapi: ${version.openapi}
 info:
   title: LSR App
   version: "1.0"
@@ -101,4 +101,4 @@ paths:
         - three
       x-object-array-property:
         - name: item-1
-        - name: item-2
+        - name: item-2
diff --git a/microprofile-open-api/src/test/resources/META-INF/openapi-fragment-header.yaml b/microprofile-open-api/src/test/resources/META-INF/openapi-fragment-header.yaml
@@ -1,6 +1,6 @@
 ---
-openapi: 3.0.1
+openapi: ${version.openapi}
 info:
   title: LSR App
   version: "1.0"
-paths:
+paths:
diff --git a/microprofile-open-api/src/test/resources/META-INF/openapi-server-path.yaml b/microprofile-open-api/src/test/resources/META-INF/openapi-server-path.yaml
@@ -1,5 +1,5 @@
 ---
-openapi: 3.0.1
+openapi: ${version.openapi}
 info:
   title: LSR App
   version: "1.0"

diff --git a/microprofile-open-api/src/test/resources/META-INF/openapi.json b/microprofile-open-api/src/test/resources/META-INF/openapi.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "${version.openapi}",
   "info": {
     "title": "LSR App",
     "version": "1.0"
@@ -176,4 +176,4 @@
       }
     }
   }
-}
+}
diff --git a/microprofile-open-api/src/test/resources/META-INF/openapi.yaml b/microprofile-open-api/src/test/resources/META-INF/openapi.yaml
@@ -1,5 +1,5 @@
 ---
-openapi: 3.0.1
+openapi: ${version.openapi}
 info:
   title: LSR App
   version: "1.0"

diff --git a/microprofile-open-api/src/test/resources/META-INF/openapi.yml b/microprofile-open-api/src/test/resources/META-INF/openapi.yml
@@ -1,5 +1,5 @@
 ---
-openapi: 3.0.1
+openapi: ${version.openapi}
 info:
   title: LSR App
   version: "1.0"