From dbf4eea66a0921a45953c02da26e5761fc9365a3 Mon Sep 17 00:00:00 2001 From: Lars Uffmann <lars.uffmann@vitroconnect.de> Date: Mon, 19 Dec 2022 14:03:21 +0100 Subject: [PATCH 1/2] Upgrade to Spring Boot 2.7.6/3.0.0 --- .../JavaSpring/libraries/spring-cloud/pom-sb3.mustache | 6 +++--- .../JavaSpring/libraries/spring-cloud/pom.mustache | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache index f03e991483b..9fbd0465059 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache @@ -11,7 +11,7 @@ <maven.compiler.target>${java.version}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> {{#springDocDocumentationProvider}} - <springdoc.version>2.0.0-M3</springdoc.version> + <springdoc.version>2.0.2</springdoc.version> {{/springDocDocumentationProvider}} {{^springDocDocumentationProvider}} {{#swagger2AnnotationLibrary}} @@ -30,7 +30,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>3.0.0-M4</version> + <version>3.0.0</version> <relativePath/> <!-- lookup parent from repository --> </parent> {{/parentOverridden}} @@ -53,7 +53,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2022.0.0-M3</version> + <version>2022.0.0</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache index 0510c41538c..c7c2a48f115 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache @@ -14,7 +14,7 @@ <springfox.version>2.9.2</springfox.version> {{/springFoxDocumentationProvider}} {{#springDocDocumentationProvider}} - <springdoc.version>1.6.8</springdoc.version> + <springdoc.version>1.6.14</springdoc.version> {{/springDocDocumentationProvider}} {{^springFoxDocumentationProvider}} {{^springDocDocumentationProvider}} @@ -38,7 +38,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> {{/parentOverridden}} @@ -52,7 +52,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> -- GitLab From dc31735c590ea3208e6fc7a3d40cc2b6c5de59b4 Mon Sep 17 00:00:00 2001 From: Lars Uffmann <lars.uffmann@vitroconnect.de> Date: Mon, 19 Dec 2022 14:37:01 +0100 Subject: [PATCH 2/2] generate samples --- samples/client/petstore/spring-cloud-async/pom.xml | 4 ++-- samples/client/petstore/spring-cloud-date-time/pom.xml | 4 ++-- .../client/petstore/spring-cloud-feign-without-url/pom.xml | 4 ++-- .../client/petstore/spring-cloud-spring-pageable/pom.xml | 4 ++-- samples/client/petstore/spring-cloud/pom.xml | 4 ++-- samples/openapi3/client/petstore/spring-cloud-3/pom.xml | 6 +++--- samples/openapi3/client/petstore/spring-cloud-async/pom.xml | 6 +++--- .../openapi3/client/petstore/spring-cloud-date-time/pom.xml | 6 +++--- .../client/petstore/spring-cloud-oas3-fakeapi/pom.xml | 6 +++--- .../client/petstore/spring-cloud-spring-pageable/pom.xml | 6 +++--- samples/openapi3/client/petstore/spring-cloud/pom.xml | 6 +++--- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/samples/client/petstore/spring-cloud-async/pom.xml b/samples/client/petstore/spring-cloud-async/pom.xml index 9fa1e0803bf..d9e5e528f27 100644 --- a/samples/client/petstore/spring-cloud-async/pom.xml +++ b/samples/client/petstore/spring-cloud-async/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/client/petstore/spring-cloud-date-time/pom.xml b/samples/client/petstore/spring-cloud-date-time/pom.xml index 88ea56e58a8..03de5f5f2bd 100644 --- a/samples/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/client/petstore/spring-cloud-date-time/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml index 9fa1e0803bf..d9e5e528f27 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml +++ b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/client/petstore/spring-cloud-spring-pageable/pom.xml b/samples/client/petstore/spring-cloud-spring-pageable/pom.xml index 1d85a1da9a3..0760f2f8cdf 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/pom.xml +++ b/samples/client/petstore/spring-cloud-spring-pageable/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml index 9fa1e0803bf..d9e5e528f27 100644 --- a/samples/client/petstore/spring-cloud/pom.xml +++ b/samples/client/petstore/spring-cloud/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml index 5f8ccfd5a74..cf3ea83330b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml @@ -10,12 +10,12 @@ <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <springdoc.version>2.0.0-M3</springdoc.version> + <springdoc.version>2.0.2</springdoc.version> </properties> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>3.0.0-M4</version> + <version>3.0.0</version> <relativePath/> <!-- lookup parent from repository --> </parent> @@ -36,7 +36,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2022.0.0-M3</version> + <version>2022.0.0</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml index ca78f3b4fee..bc99c56cacf 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml @@ -10,12 +10,12 @@ <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <springdoc.version>1.6.8</springdoc.version> + <springdoc.version>1.6.14</springdoc.version> </properties> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml index c5052d3c803..6fcd4631b65 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml @@ -10,12 +10,12 @@ <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <springdoc.version>1.6.8</springdoc.version> + <springdoc.version>1.6.14</springdoc.version> </properties> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml index bc8ba979fc2..1bea809b9c1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml @@ -10,12 +10,12 @@ <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <springdoc.version>1.6.8</springdoc.version> + <springdoc.version>1.6.14</springdoc.version> </properties> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml index 1f06629d5d0..722fb203b2d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml @@ -10,12 +10,12 @@ <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <springdoc.version>1.6.8</springdoc.version> + <springdoc.version>1.6.14</springdoc.version> </properties> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/samples/openapi3/client/petstore/spring-cloud/pom.xml b/samples/openapi3/client/petstore/spring-cloud/pom.xml index bc8ba979fc2..1bea809b9c1 100644 --- a/samples/openapi3/client/petstore/spring-cloud/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud/pom.xml @@ -10,12 +10,12 @@ <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <springdoc.version>1.6.8</springdoc.version> + <springdoc.version>1.6.14</springdoc.version> </properties> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.7.0</version> + <version>2.7.6</version> <relativePath/> <!-- lookup parent from repository --> </parent> <build> @@ -27,7 +27,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-parent</artifactId> - <version>2021.0.1</version> + <version>2021.0.5</version> <type>pom</type> <scope>import</scope> </dependency> -- GitLab