Update to SR OpenAPI 4.0.6 and Jandex 3.2.3

- SmallRye OpenAPI 4.0.6 - Jandex 3.2.3 (prereq of OpenAPI) This includes a fix to not output properties introduced in OpenAPI 3.1 when generating an OpenAPI 3.0 document.
OpenLiberty · Jan 10, 2025 · e563498 · e563498
1 parent bb6bb81
commit e563498
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 30 deletions.
diff --git a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
@@ -1189,7 +1189,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>jandex</artifactId>
-      <version>3.2.0</version>
+      <version>3.2.3</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye</groupId>
@@ -1244,7 +1244,7 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-open-api-core</artifactId>
-      <version>4.0.2</version>
+      <version>4.0.6</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye</groupId>
@@ -1254,12 +1254,12 @@
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-open-api-jaxrs</artifactId>
-      <version>4.0.2</version>
+      <version>4.0.6</version>
     </dependency>
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-open-api-model</artifactId>
-      <version>4.0.2</version>
+      <version>4.0.6</version>
     </dependency>
     <dependency>
       <groupId>io.zipkin.reporter2</groupId>

diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven
@@ -233,7 +233,7 @@ io.smallrye.reactive:mutiny:2.5.6
 io.smallrye.reactive:smallrye-reactive-converter-api:3.0.1
 io.smallrye.reactive:smallrye-reactive-messaging-api:4.16.0
 io.smallrye.reactive:smallrye-reactive-messaging-provider:4.16.0
-io.smallrye:jandex:3.2.0
+io.smallrye:jandex:3.2.3
 io.smallrye:smallrye-graphql-api:1.0.26
 io.smallrye:smallrye-graphql-cdi:1.0.26
 io.smallrye:smallrye-graphql-client-api:1.0.26
@@ -244,10 +244,10 @@ io.smallrye:smallrye-graphql-servlet:1.0.26
 io.smallrye:smallrye-graphql:1.0.26
 io.smallrye:smallrye-metrics:5.1.0
 io.smallrye:smallrye-open-api-core:3.1.1
-io.smallrye:smallrye-open-api-core:4.0.2
+io.smallrye:smallrye-open-api-core:4.0.6
 io.smallrye:smallrye-open-api-jaxrs:3.1.1
-io.smallrye:smallrye-open-api-jaxrs:4.0.2
-io.smallrye:smallrye-open-api-model:4.0.2
+io.smallrye:smallrye-open-api-jaxrs:4.0.6
+io.smallrye:smallrye-open-api-model:4.0.6
 io.zipkin.reporter2:zipkin-reporter:2.16.4
 io.zipkin.reporter2:zipkin-reporter:3.3.0
 io.zipkin.reporter2:zipkin-sender-okhttp3:2.16.4

diff --git a/dev/io.openliberty.io.smallrye.jandex3/bnd.bnd b/dev/io.openliberty.io.smallrye.jandex3/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2017, 2024 IBM Corporation and others.
+# Copyright (c) 2017, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
@@ -12,10 +12,10 @@
 #*******************************************************************************
 
 -include=\
-	jar:${fileuri;${repo;io.smallrye:jandex;3.2.0;EXACT}}!/META-INF/MANIFEST.MF,\
+	jar:${fileuri;${repo;io.smallrye:jandex;3.2.3;EXACT}}!/META-INF/MANIFEST.MF,\
 	bnd.overrides
 
 instrument.disabled: true
 
 -buildpath:\
-	io.smallrye:jandex;version=3.2.0;strategy=exact
+	io.smallrye:jandex;version=3.2.3;strategy=exact
diff --git a/dev/io.openliberty.io.smallrye.jandex3/bnd.overrides b/dev/io.openliberty.io.smallrye.jandex3/bnd.overrides
@@ -5,4 +5,4 @@ Bundle-Name: jandex 3
 Bundle-SymbolicName: io.openliberty.io.smallrye.jandex3
 
 Include-Resource:\
-        @${repo;io.smallrye:jandex;3.2.0;EXACT}!/!META-INF/*
+        @${repo;io.smallrye:jandex;3.2.3;EXACT}!/!META-INF/*
diff --git a/dev/io.openliberty.io.smallrye.openapi4.core/bnd.bnd b/dev/io.openliberty.io.smallrye.openapi4.core/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2024 IBM Corporation and others.
+# Copyright (c) 2024, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
@@ -31,11 +31,12 @@ Import-Package: \
 Export-Package: \
     io.smallrye.openapi.api.*;version=4.0,\
     io.smallrye.openapi.internal.models.*;version=4.0,\
+    io.smallrye.openapi.internal.support.*;version=4.0,\
     io.smallrye.openapi.runtime.*;version=4.0,\
-    io.smallrye.openapi.spi.*;version=4.0,\
+    io.smallrye.openapi.spi.*;version=4.0
 
 -buildpath: \
-    io.smallrye:smallrye-open-api-core;version=4.0.2,\
+    io.smallrye:smallrye-open-api-core;version=4.0.6,\
     io.openliberty.io.smallrye.openapi4.model;version=latest,\
     io.openliberty.jakarta.validation.3.0;version=latest,\
     io.openliberty.org.eclipse.microprofile.openapi.4.0;version=latest,\

diff --git a/dev/io.openliberty.io.smallrye.openapi4.jaxrs/bnd.bnd b/dev/io.openliberty.io.smallrye.openapi4.jaxrs/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2024 IBM Corporation and others.
+# Copyright (c) 2024, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
@@ -23,7 +23,7 @@ javac.target: 11
 Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=11))"
 
 Include-Resource: \
-    @${repo;io.smallrye:smallrye-open-api-jaxrs;4.0.2}!/META-INF/services/*
+    @${repo;io.smallrye:smallrye-open-api-jaxrs;4.0.6}!/META-INF/services/*
 
 Service-Component: \
     io.smallrye.openapi.runtime.scanner.spi.AnnotationScanner; \
@@ -40,7 +40,7 @@ Export-Package: \
     io.smallrye.openapi.jaxrs;version=4.0;thread-context=true
 
 -buildpath: \
-    io.smallrye:smallrye-open-api-jaxrs;version=4.0.2,\
+    io.smallrye:smallrye-open-api-jaxrs;version=4.0.6,\
     io.openliberty.io.smallrye.openapi4.core;version=latest,\
     io.openliberty.jakarta.validation.3.0;version=latest,\
     io.openliberty.org.eclipse.microprofile.openapi.4.0;version=latest,\

diff --git a/dev/io.openliberty.io.smallrye.openapi4.model/bnd.bnd b/dev/io.openliberty.io.smallrye.openapi4.model/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2024 IBM Corporation and others.
+# Copyright (c) 2024, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
@@ -27,7 +27,7 @@ Export-Package: \
     io.smallrye.openapi.model.*;version=4.0
 
 -buildpath: \
-    io.smallrye:smallrye-open-api-model;version=4.0.2,\
+    io.smallrye:smallrye-open-api-model;version=4.0.6,\
     io.openliberty.org.eclipse.microprofile.openapi.4.0;version=latest,\
     io.openliberty.io.smallrye.jandex3;version=latest,\
     com.ibm.ws.org.jboss.logging;version=latest
diff --git a/.../openliberty/microprofile/openapi40/internal/services/impl/ConfigFieldProvider40Impl.java b/.../openliberty/microprofile/openapi40/internal/services/impl/ConfigFieldProvider40Impl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -15,13 +15,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.Set;
-import java.util.StringJoiner;
 import java.util.function.Function;
 
 import org.eclipse.microprofile.openapi.OASConfig;
@@ -74,7 +68,8 @@ enum ConfigField40 implements ConfigField {
         INFO_LICENSE_URL("getInfoLicenseUrl", SmallRyeOASConfig.INFO_LICENSE_URL, OpenApiConfig::getInfoLicenseName),
         OPERATION_ID_STRATEGY("getOperationIdStrategy", SmallRyeOASConfig.OPERATION_ID_STRAGEGY, OpenApiConfig::getOperationIdStrategy, OperationIdStrategy::name),
         ARRAY_REFERENCES_ENABLE("arrayReferencesEnable", SmallRyeOASConfig.SMALLRYE_ARRAY_REFERENCES_ENABLE, c -> Boolean.toString(c.arrayReferencesEnable())),
-        DUPLICATE_OPERATION_ID_BEHAVIOR("getDuplicateOperationIdBehavior", SmallRyeOASConfig.DUPLICATE_OPERATION_ID_BEHAVIOR, OpenApiConfig::getDuplicateOperationIdBehavior, DuplicateOperationIdBehavior::name),
+        DUPLICATE_OPERATION_ID_BEHAVIOR("getDuplicateOperationIdBehavior", SmallRyeOASConfig.DUPLICATE_OPERATION_ID_BEHAVIOR, OpenApiConfig::getDuplicateOperationIdBehavior,
+                                        DuplicateOperationIdBehavior::name),
         DEFAULT_PRODUCES("getDefaultProduces", SmallRyeOASConfig.DEFAULT_PRODUCES, OpenApiConfig::getDefaultProduces, Optional::toString),
         DEFAULT_CONSUMES("getDefaultConsumes", SmallRyeOASConfig.DEFAULT_CONSUMES, OpenApiConfig::getDefaultConsumes, Optional::toString),
         DEFAULT_PRIMITIVES_PRODUCES("getDefaultPrimitivesProduces", SmallRyeOASConfig.DEFAULT_PRODUCES_PRIMITIVES, OpenApiConfig::getDefaultPrimitivesProduces, Optional::toString),
@@ -88,8 +83,9 @@ enum ConfigField40 implements ConfigField {
         REMOVE_UNUSED_SCHEMAS("removeUnusedSchemas", SmallRyeOASConfig.SMALLRYE_REMOVE_UNUSED_SCHEMAS, c -> Boolean.toString(c.removeUnusedSchemas())),
         MAXIMUM_STATIC_FILE_SIZE("getMaximumStaticFileSize", SmallRyeOASConfig.MAXIMUM_STATIC_FILE_SIZE, c -> c.getMaximumStaticFileSize().toString()),
         AUTO_INHERITANCE("getAutoInheritance", SmallRyeOASConfig.AUTO_INHERITANCE, OpenApiConfig::getAutoInheritance, AutoInheritance::name),
-        SCAN_COMPOSITION_EXCLUDE_PACKAGES("getScanCompositionExcludePackages", SmallRyeOASConfig.SCAN_COMPOSITION_EXCLUDE_PACKAGES, OpenApiConfig::getScanCompositionExcludePackages, ConfigField::serializeSet),
-        ;
+        SCAN_COMPOSITION_EXCLUDE_PACKAGES("getScanCompositionExcludePackages", SmallRyeOASConfig.SCAN_COMPOSITION_EXCLUDE_PACKAGES,
+                                          OpenApiConfig::getScanCompositionExcludePackages, ConfigField::serializeSet),
+        MERGE_SCHEMA_EXAMPLES("mergeSchemaExamples", SmallRyeOASConfig.SMALLRYE_MERGE_SCHEMA_EXAMPLES, c -> Boolean.toString(c.mergeSchemaExamples()));
 
         Function<OpenApiConfig, String> function;
         String methodName;