diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml index 7cc609c2789..198dcf05258 100644 --- a/modules/swagger-codegen/pom.xml +++ b/modules/swagger-codegen/pom.xml @@ -72,7 +72,7 @@ maven-compiler-plugin - 3.10.1 + 3.13.0 org.apache.maven.plugins @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.0 + 3.12.1 org.apache.maven.plugins @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.2 1.8 UTF-8 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 index d6e38f4cbdf..9401ff936e1 100644 --- 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 index e82cadf8467..61e91de1045 100644 --- 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 } - /// /// Gets or Sets Days /// 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 index 73b652b1fcc..945abb6e16f 100644 --- 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 } - /// /// Gets or Sets Days /// diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml index 5764d3f11cf..af3803ede65 100644 --- a/modules/swagger-generator/pom.xml +++ b/modules/swagger-generator/pom.xml @@ -329,11 +329,11 @@ 2.5 - 1.4.14 + 1.5.3 1.0.0 2.5 2.11.5 9.4.53.v20231009 - 2.41 + 2.42 diff --git a/pom.xml b/pom.xml index a83174568f6..a7c71bbfccb 100644 --- a/pom.xml +++ b/pom.xml @@ -1058,23 +1058,23 @@ 8 - 1.0.68 + 1.0.70 2.11.1 3.3.0 - 1.6.12 - 2.15.1 - 1.6.0 + 1.6.14 + 2.16.1 + 1.7.0 4.13.2 - 2.16.1 + 2.17.0 1.0.0 3.14.0 1.7.36 3.2.1 - 1.15 - 7.9.0 + 1.16 + 7.10.1 3.0.0 1.49 - 5.8.0 + 5.11.0 0.10.2 2.2 4.5.14 diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml index 143fc8f6427..97b84b9bd3d 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/pom.xml +++ b/samples/server/petstore/jaxrs-datelib-j8/pom.xml @@ -1,7 +1,7 @@ 4.0.0 io.swagger - swagger-jaxrs-server + swagger-jaxrs-server-j8 jar swagger-jaxrs-server 1.0.0 @@ -47,7 +47,7 @@ stopit 10 - 80 + 8080 60000 diff --git a/samples/server/petstore/jaxrs-spec/pom.xml b/samples/server/petstore/jaxrs-spec/pom.xml index eb9a57a261f..84e49fc4065 100644 --- a/samples/server/petstore/jaxrs-spec/pom.xml +++ b/samples/server/petstore/jaxrs-spec/pom.xml @@ -1,7 +1,7 @@ 4.0.0 io.swagger - swagger-jaxrs-server + swagger-jaxrs-server-spec war swagger-jaxrs-server 1.0.0