switching branch 2.x to master

Author: bnasslahsen

Jenkinsfile

@@ -8,16 +8,16 @@ node {
 		checkout scm
 	}
 	stage('Clean') {
-		withMaven(jdk: 'java-11', maven: 'maven') {
-			sh "mvn clean -T100"
+		withMaven(jdk: 'java-17', maven: 'maven-3.8.4'){
+				sh "mvn clean -T100"
 		}
 	}
 	stage('Package') {
-		withMaven(jdk: 'java-11', maven: 'maven') {
-			sh "mvn -Pjib verify package jib:build"
+		withMaven(jdk: 'java-17', maven: 'maven-3.8.4'){
+			sh "mvn -Pjib package jib:build -T100"
 		}
 	}
 	stage("Deploy") {
-		build 'springdoc-openapi-demos-deploy'
+		build 'springdoc-openapi-demos-v2-deploy'
 	}
 }

README.md

@@ -6,9 +6,9 @@
 	<parent>
 		<groupId>org.springdoc</groupId>
 		<artifactId>springdoc-openapi-demos</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
-	<artifactId>springdoc-openapi-book-service</artifactId>
+	<artifactId>demo-book-service</artifactId>
 
 	<dependencies>
 		<dependency>
@@ -17,7 +17,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 		</dependency>
 	</dependencies>
 	<build>

SUPPORT.md

@@ -20,9 +20,8 @@
 
 import java.util.Collection;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.springdoc.demo.services.book.exception.BookNotFoundException;
 import org.springdoc.demo.services.book.model.Book;
 import org.springdoc.demo.services.book.repository.BookRepository;

springdoc-openapi-book-service/.gitignore renamed to demo-book-service/.gitignore

@@ -18,8 +18,8 @@
 
 package org.springdoc.demo.services.book.model;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 public class Book {
 

springdoc-openapi-book-service/README.md renamed to demo-book-service/README.md

@@ -1,6 +1,9 @@
 server:
   forward-headers-strategy: framework
+
 springdoc:
+  api-docs:
+    version: openapi_3_1
   version: '@springdoc.version@'
   swagger-ui:
     use-root-path: true

springdoc-openapi-book-service/pom.xml renamed to demo-book-service/pom.xml

@@ -5,8 +5,8 @@
 	<artifactId>config-service</artifactId>
 	<parent>
 		<groupId>org.springdoc</groupId>
-		<artifactId>springdoc-openapi-microservices</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<artifactId>demo-microservices</artifactId>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>

springdoc-openapi-book-service/src/main/java/org/springdoc/demo/services/book/SpringdocApplication.java renamed to demo-book-service/src/main/java/org/springdoc/demo/services/book/SpringdocApplication.java

@@ -48,7 +48,7 @@ spring:
             - ContextPathRewritePath=/demo-microservices/organization/(?<path>.*), /$\{path}
             - RewritePath=/organization/(?<path>.*), /$\{path}
         - id: openapi-proxy
-          uri: https://demos1.springdoc.org
+          uri: https://demos.springdoc.org
           predicates:
             - Path=/demo-microservices/v3/api-docs/**
           filters:

springdoc-openapi-book-service/src/main/java/org/springdoc/demo/services/book/controller/BookController.java renamed to demo-book-service/src/main/java/org/springdoc/demo/services/book/controller/BookController.java

@@ -12,7 +12,7 @@ eureka:
 logging:
   pattern:
     console: "%d{yyyy-MM-dd HH:mm:ss} ${LOG_LEVEL_PATTERN:-%5p} %m%n"
-    
+
 springdoc:
   cache:
     disabled: true

springdoc-openapi-book-service/src/main/java/org/springdoc/demo/services/book/exception/BookNotFoundException.java renamed to demo-book-service/src/main/java/org/springdoc/demo/services/book/exception/BookNotFoundException.java

@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springdoc</groupId>
-		<artifactId>springdoc-openapi-microservices</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<artifactId>demo-microservices</artifactId>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>department-service</artifactId>
 
@@ -34,13 +34,9 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-sleuth</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-webmvc-core</artifactId>
+			<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
 		</dependency>
 	</dependencies>
 

springdoc-openapi-book-service/src/main/java/org/springdoc/demo/services/book/exception/GlobalControllerExceptionHandler.java renamed to demo-book-service/src/main/java/org/springdoc/demo/services/book/exception/GlobalControllerExceptionHandler.java

@@ -5,3 +5,5 @@ spring:
     import: "optional:configserver:${CONFIG_SERVER:http://localhost:8088}"
 springdoc:
   version: '@springdoc.version@'
+  api-docs:
+    version: openapi_3_1

springdoc-openapi-book-service/src/main/java/org/springdoc/demo/services/book/model/Book.java renamed to demo-book-service/src/main/java/org/springdoc/demo/services/book/model/Book.java

@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springdoc</groupId>
-		<artifactId>springdoc-openapi-microservices</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<artifactId>demo-microservices</artifactId>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>discovery-service</artifactId>
 

springdoc-openapi-book-service/src/main/java/org/springdoc/demo/services/book/repository/BookRepository.java renamed to demo-book-service/src/main/java/org/springdoc/demo/services/book/repository/BookRepository.java

@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springdoc</groupId>
-		<artifactId>springdoc-openapi-microservices</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<artifactId>demo-microservices</artifactId>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>employee-service</artifactId>
 
@@ -26,13 +26,9 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-sleuth</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-webmvc-core</artifactId>
+			<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
 		</dependency>
 	</dependencies>
 

springdoc-openapi-spring-cloud-function/spring-cloud-function-webmvc/src/main/resources/application.yml renamed to demo-book-service/src/main/resources/application.yml

@@ -4,4 +4,6 @@ spring:
   config:
     import: "optional:configserver:${CONFIG_SERVER:http://localhost:8088}"
 springdoc:
-  version: '@springdoc.version@'
+  version: '@springdoc.version@'
+  api-docs:
+    version: openapi_3_1

springdoc-openapi-book-service/src/main/resources/logback.xml renamed to demo-book-service/src/main/resources/logback.xml

@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springdoc</groupId>
-		<artifactId>springdoc-openapi-microservices</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<artifactId>demo-microservices</artifactId>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>gateway-service</artifactId>
 
@@ -22,13 +22,9 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-config</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-sleuth</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-webflux-ui</artifactId>
+			<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
 		</dependency>
 	</dependencies>
 

springdoc-openapi-book-service/src/test/java/org/springdoc/demo/services/book/SwaggerUnitTest.java renamed to demo-book-service/src/test/java/org/springdoc/demo/services/book/SwaggerUnitTest.java

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springdoc.core.GroupedOpenApi;
+import org.springdoc.core.models.GroupedOpenApi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -35,5 +35,4 @@ public List<GroupedOpenApi> apis(RouteDefinitionLocator locator) {
 		});
 		return groups;
 	}
-
 }

springdoc-openapi-data-rest/.gitignore renamed to demo-microservices/.gitignore

@@ -7,3 +7,5 @@ springdoc:
   version: '@springdoc.version@'
   swagger-ui:
     use-root-path: true
+  api-docs:
+    version: openapi_3_1

springdoc-openapi-microservices/README.md renamed to demo-microservices/README.md

@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springdoc</groupId>
-		<artifactId>springdoc-openapi-microservices</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<artifactId>demo-microservices</artifactId>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>organization-service</artifactId>
 
@@ -34,13 +34,9 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-sleuth</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-webmvc-core</artifactId>
+			<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
 		</dependency>
 	</dependencies>
 

springdoc-openapi-microservices/config-service/.gitignore renamed to demo-microservices/config-service/.gitignore

@@ -4,4 +4,6 @@ spring:
   config:
     import: "optional:configserver:${CONFIG_SERVER:http://localhost:8088}"
 springdoc:
-  version: '@springdoc.version@'
+  version: '@springdoc.version@'
+  api-docs:
+    version: openapi_3_1

springdoc-openapi-microservices/config-service/pom.xml renamed to demo-microservices/config-service/pom.xml

@@ -5,12 +5,12 @@
 	<parent>
 		<artifactId>springdoc-openapi-demos</artifactId>
 		<groupId>org.springdoc</groupId>
-		<version>3.1.6-SNAPSHOT</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>springdoc-openapi-microservices</artifactId>
+	<artifactId>demo-microservices</artifactId>
 
 	<modules>
 		<module>config-service</module>

springdoc-openapi-microservices/config-service/src/main/java/org/springdoc/demo/services/config/ConfigApplication.java renamed to demo-microservices/config-service/src/main/java/org/springdoc/demo/services/config/ConfigApplication.java

@@ -0,0 +1,29 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springdoc</groupId>
+		<artifactId>demo-oauth2</artifactId>
+		<version>3.1.7-SNAPSHOT</version>
+	</parent>
+	<artifactId>oauth-authorization-server</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-oauth2-authorization-server</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+		</dependency>
+	</dependencies>
+</project>