update dependencies

frantuma · frantuma · commit 998702353566 · 2024-04-22T10:35:07.000+02:00
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
@@ -72,7 +72,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.13.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -99,7 +99,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.12.0</version>
+                <version>3.12.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -156,7 +156,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.2</version>
                 <configuration>
                     <source>1.8</source>
                     <encoding>UTF-8</encoding>
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java
@@ -265,8 +265,7 @@ public void testFromFile() throws Exception {
         assertEquals(configurator.getLanguageSpecificPrimitives().size(), 1);
         assertTrue(configurator.getLanguageSpecificPrimitives().contains("rolex"));
 
-        assertEquals(configurator.getDynamicProperties().size(), 1);
-        assertValueInMap(configurator.getDynamicProperties(), CodegenConstants.LOCAL_VARIABLE_PREFIX, "_");
+        assertEquals(configurator.getLocalVariablePrefix(), "_");
 
         assertEquals(configurator.getIgnoreFileOverride(), "/path/to/override/.swagger-codegen-ignore");
     }
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithOptionalInlineEnum.cs b/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithOptionalInlineEnum.cs
@@ -79,7 +79,6 @@ public enum DaysEnum
             [EnumMember(Value = "sat")]
             Sat = 7
         }
-
         /// <summary>
         /// Gets or Sets Days
         /// </summary>
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithRequiredInlineEnum.cs b/modules/swagger-codegen/src/test/resources/integrationtests/csharp/general/enum-support-expected/src/IO.Swagger/Model/MyClassWithRequiredInlineEnum.cs
@@ -79,7 +79,6 @@ public enum DaysEnum
             [EnumMember(Value = "sat")]
             Sat = 7
         }
-
         /// <summary>
         /// Gets or Sets Days
         /// </summary>
diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
@@ -329,11 +329,11 @@
     </dependencies>
     <properties>
         <servlet-api-version>2.5</servlet-api-version>
-        <logback-version>1.4.14</logback-version>
+        <logback-version>1.5.3</logback-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <servlet-api-version>2.5</servlet-api-version>
         <zip-version>2.11.5</zip-version>
         <jetty-version>9.4.53.v20231009</jetty-version>
-        <jersey2-version>2.41</jersey2-version>
+        <jersey2-version>2.42</jersey2-version>
     </properties>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -1058,23 +1058,23 @@
     </repositories>
     <properties>
         <maven.compiler.release>8</maven.compiler.release>
-        <swagger-parser-version>1.0.68</swagger-parser-version>
+        <swagger-parser-version>1.0.70</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.6.12</swagger-core-version>
-        <commons-io-version>2.15.1</commons-io-version>
-        <commons-cli-version>1.6.0</commons-cli-version>
+        <swagger-core-version>1.6.14</swagger-core-version>
+        <commons-io-version>2.16.1</commons-io-version>
+        <commons-cli-version>1.7.0</commons-cli-version>
         <junit-version>4.13.2</junit-version>
-        <jackson-version>2.16.1</jackson-version>
+        <jackson-version>2.17.0</jackson-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <commons-lang-version>3.14.0</commons-lang-version>
         <slf4j-version>1.7.36</slf4j-version>
         <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
-        <jmustache-version>1.15</jmustache-version>
-        <testng-version>7.9.0</testng-version>
+        <jmustache-version>1.16</jmustache-version>
+        <testng-version>7.10.1</testng-version>
         <surefire-version>3.0.0</surefire-version>
         <jmockit-version>1.49</jmockit-version>
-        <mockito-version>5.8.0</mockito-version>
+        <mockito-version>5.11.0</mockito-version>
         <reflections-version>0.10.2</reflections-version>
         <snakeyaml-version>2.2</snakeyaml-version>
         <httpclient-version>4.5.14</httpclient-version>
diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml
@@ -1,7 +1,7 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
-  <artifactId>swagger-jaxrs-server</artifactId>
+  <artifactId>swagger-jaxrs-server-j8</artifactId>
   <packaging>jar</packaging>
   <name>swagger-jaxrs-server</name>
   <version>1.0.0</version>
@@ -47,7 +47,7 @@
           <stopKey>stopit</stopKey>
           <stopWait>10</stopWait>
           <httpConnector>
-            <port>80</port>
+            <port>8080</port>
             <idleTimeout>60000</idleTimeout>
           </httpConnector>
         </configuration>
diff --git a/samples/server/petstore/jaxrs-spec/pom.xml b/samples/server/petstore/jaxrs-spec/pom.xml
@@ -1,7 +1,7 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
-  <artifactId>swagger-jaxrs-server</artifactId>
+  <artifactId>swagger-jaxrs-server-spec</artifactId>
   <packaging>war</packaging>
   <name>swagger-jaxrs-server</name>
   <version>1.0.0</version>

Original file line number	Diff line number	Diff line change
`@@ -265,8 +265,7 @@ public void testFromFile() throws Exception {`
`265`	`265`	`assertEquals(configurator.getLanguageSpecificPrimitives().size(), 1);`
`266`	`266`	`assertTrue(configurator.getLanguageSpecificPrimitives().contains("rolex"));`
`267`	`267`
`268`		`- assertEquals(configurator.getDynamicProperties().size(), 1);`
`269`		`- assertValueInMap(configurator.getDynamicProperties(), CodegenConstants.LOCAL_VARIABLE_PREFIX, "_");`
	`268`	`+ assertEquals(configurator.getLocalVariablePrefix(), "_");`
`270`	`269`
`271`	`270`	`assertEquals(configurator.getIgnoreFileOverride(), "/path/to/override/.swagger-codegen-ignore");`
`272`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ public enum DaysEnum`
`79`	`79`	`[EnumMember(Value = "sat")]`
`80`	`80`	`Sat = 7`
`81`	`81`	`}`
`82`		`-`
`83`	`82`	`/// <summary>`
`84`	`83`	`/// Gets or Sets Days`
`85`	`84`	`/// </summary>`