Merge branch 'master' of https://github.com/springdoc/springdoc-openapi

Author: bnasslahsen

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springdoc</groupId>
 	<artifactId>springdoc-openapi</artifactId>
-	<version>1.2.31-SNAPSHOT</version>
+	<version>1.2.32-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring openapi documentation generator</name>
 	<description>Spring openapi documentation generator</description>
@@ -69,7 +69,7 @@
 		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
 		<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
 		<swagger-api.version>2.1.1</swagger-api.version>
-		<swagger-ui.version>3.24.3</swagger-ui.version>
+		<swagger-ui.version>3.25.0</swagger-ui.version>
 		<webjars-locator.version>0.38</webjars-locator.version>
 		<spring-security-oauth2.version>2.3.8.RELEASE</spring-security-oauth2.version>
 	</properties>

springdoc-openapi-common/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springdoc</groupId>
 		<artifactId>springdoc-openapi</artifactId>
-		<version>1.2.31-SNAPSHOT</version>
+		<version>1.2.32-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

springdoc-openapi-data-rest/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>springdoc-openapi</artifactId>
 		<groupId>org.springdoc</groupId>
-		<version>1.2.31-SNAPSHOT</version>
+		<version>1.2.32-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

springdoc-openapi-kotlin/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springdoc</groupId>
 		<artifactId>springdoc-openapi</artifactId>
-		<version>1.2.31-SNAPSHOT</version>
+		<version>1.2.32-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<!-- springdoc-common -->

springdoc-openapi-security/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>springdoc-openapi</artifactId>
 		<groupId>org.springdoc</groupId>
-		<version>1.2.31-SNAPSHOT</version>
+		<version>1.2.32-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -36,8 +36,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

springdoc-openapi-ui/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springdoc</groupId>
 		<artifactId>springdoc-openapi</artifactId>
-		<version>1.2.31-SNAPSHOT</version>
+		<version>1.2.32-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<!-- springdoc-core -->
@@ -15,8 +15,8 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<!-- swagger-ui dependencies -->

springdoc-openapi-webflux-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springdoc</groupId>
 		<artifactId>springdoc-openapi</artifactId>
-		<version>1.2.31-SNAPSHOT</version>
+		<version>1.2.32-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<!-- springdoc-common -->

springdoc-openapi-webflux-ui/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springdoc</groupId>
 		<artifactId>springdoc-openapi</artifactId>
-		<version>1.2.31-SNAPSHOT</version>
+		<version>1.2.32-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<!-- springdoc-core -->

springdoc-openapi-webmvc-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springdoc</groupId>
 		<artifactId>springdoc-openapi</artifactId>
-		<version>1.2.31-SNAPSHOT</version>
+		<version>1.2.32-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<!-- springdoc-common -->
@@ -25,8 +25,8 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>