Merge pull request #514 from avaje/dependabot/maven/master/dependenci…

…es-39babbad17 Bump the dependencies group with 6 updates
avaje · Nov 18, 2024 · 4705147 · 4705147
2 parents 078d250 + dab399a
commit 4705147
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/htmx-nima/pom.xml b/htmx-nima/pom.xml
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.helidon.webserver</groupId>
       <artifactId>helidon-webserver</artifactId>
-      <version>4.1.3</version>
+      <version>4.1.4</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/http-generator-core/pom.xml b/http-generator-core/pom.xml
@@ -34,12 +34,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.swagger.core.v3</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-models</artifactId>

diff --git a/...-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java b/...-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java
@@ -3,9 +3,20 @@
 import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Set;
 
 final class OpenAPISerializer {
 
+  private static final Set<String> IGNORED_FIELDS = Set.of(
+          "SCHEMA_RESOLUTION_PROPERTY",
+          "BIND_TYPE_AND_TYPES",
+          "BINARY_STRING_CONVERSION_PROPERTY",
+          "COMPONENTS_SCHEMAS_REF",
+          "APPLY_SCHEMA_RESOLUTION_PROPERTY",
+          "exampleSetFlag",
+          "types",
+          "specVersion");
+
   private OpenAPISerializer() {}
 
   /**
@@ -65,13 +76,8 @@ static String serialize(Object obj) throws IllegalAccessException {
         for (final Field field : fields) {
 
           // skip JsonIgnored fields
-          if ("SCHEMA_RESOLUTION_PROPERTY".equals(field.getName())
-              || "BIND_TYPE_AND_TYPES".equals(field.getName())
-              || "BINARY_STRING_CONVERSION_PROPERTY".equals(field.getName())
-              || "COMPONENTS_SCHEMAS_REF".equals(field.getName())
-              || "exampleSetFlag".equals(field.getName())
-              || "types".equals(field.getName())
-              || "specVersion".equals(field.getName())) {
+          if (IGNORED_FIELDS
+              .contains(field.getName())) {
             continue;
           }
 

diff --git a/pom.xml b/pom.xml
@@ -19,9 +19,9 @@
 
   <properties>
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
-    <swagger.version>2.2.25</swagger.version>
+    <swagger.version>2.2.26</swagger.version>
     <jackson.version>2.14.2</jackson.version>
-    <avaje.prisms.version>1.34</avaje.prisms.version>
+    <avaje.prisms.version>1.35</avaje.prisms.version>
     <module-info.shade>${project.build.directory}${file.separator}module-info.shade</module-info.shade>
   </properties>
 

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -17,7 +17,7 @@
     <jackson.version>2.18.1</jackson.version>
     <jex.version>2.5</jex.version>
     <avaje-inject.version>10.5</avaje-inject.version>
-    <nima.version>4.1.3</nima.version>
+    <nima.version>4.1.4</nima.version>
     <javalin.version>6.3.0</javalin.version>
   </properties>
 

diff --git a/tests/test-javalin-jsonb/pom.xml b/tests/test-javalin-jsonb/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
     <main.class>org.example.myapp.Main</main.class>
-    <swagger.version>2.2.25</swagger.version>
+    <swagger.version>2.2.26</swagger.version>
     <kotlin.version>1.3.71</kotlin.version>
   </properties>
 

diff --git a/tests/test-javalin/pom.xml b/tests/test-javalin/pom.xml
@@ -12,7 +12,7 @@
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
     <main.class>org.example.myapp.Main</main.class>
-    <swagger.version>2.2.25</swagger.version>
+    <swagger.version>2.2.26</swagger.version>
     <kotlin.version>1.3.71</kotlin.version>
   </properties>
 

diff --git a/tests/test-jex/pom.xml b/tests/test-jex/pom.xml
@@ -13,7 +13,7 @@
     <maven.deploy.skip>true</maven.deploy.skip>
     <main.class>org.example.myapp.Main</main.class>
     <jex.version>2.5</jex.version>
-    <swagger.version>2.2.25</swagger.version>
+    <swagger.version>2.2.26</swagger.version>
   </properties>
 
   <dependencies>

diff --git a/tests/test-sigma/pom.xml b/tests/test-sigma/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <maven.compiler.release>17</maven.compiler.release>
     <maven.deploy.skip>true</maven.deploy.skip>
-    <swagger.version>2.2.25</swagger.version>
+    <swagger.version>2.2.26</swagger.version>
     <kotlin.version>1.3.71</kotlin.version>
   </properties>