diff --git a/pom.xml b/pom.xml
index f8ba16c9cf822e7dcb36aef2806973f53dfc296e..1af53f806a04bb161eb4f6d98c8e9324a3bb7a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,6 +5,8 @@
<groupId>org.springframework.samples</groupId>
<artifactId>spring-petclinic-rest</artifactId>
+ <version>2.6.2</version>
+
<description>REST version of the Spring Petclinic sample application</description>
<url>https://spring-petclinic.github.io/</url>
@@ -18,7 +20,6 @@
<properties>
<!-- Third librairies -->
<spring-data-jdbc.version>1.2.1.RELEASE</spring-data-jdbc.version>
- <!-- <springfox-swagger.version>3.0.0</springfox-swagger.version> -->
<springdoc-openapi-ui.version>1.6.11</springdoc-openapi-ui.version>
<jackson-databind-nullable.version>0.2.1</jackson-databind-nullable.version>
<mapstruct.version>1.4.1.Final</mapstruct.version>
@@ -120,17 +121,11 @@
<artifactId>json-path</artifactId>
<scope>test</scope>
</dependency>
- <!-- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>${springfox-swagger.version}</version>
- </dependency> -->
-
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
- <version>${springdoc-openapi-ui.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ <version>${springdoc-openapi-ui.version}</version>
+ </dependency>
<dependency>
<groupId>org.openapitools</groupId>
@@ -161,7 +156,8 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- </dependency>
+ <version>${jaxb-api.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -271,7 +267,7 @@
<inputSpec>${project.basedir}/src/main/resources/openapi.yml</inputSpec>
<generatorName>spring</generatorName>
<library>spring-boot</library>
-
+
<!-- Only enabling model andopenapi-generator-maven-plugin API generation -->
<modelNameSuffix>Dto</modelNameSuffix>
<apiPackage>org.springframework.samples.petclinic.rest.api</apiPackage>
@@ -302,6 +298,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>add-source</id>
@@ -320,6 +317,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<annotationProcessorPaths>
<path>
diff --git a/src/main/java/org/springframework/samples/petclinic/config/SwaggerConfig.java b/src/main/java/org/springframework/samples/petclinic/config/SwaggerConfig.java
index ae291140eb64698820888ce1385025e332568bba..adc38aac5571f1a51f656d5f272aeb9abaa77390 100755
--- a/src/main/java/org/springframework/samples/petclinic/config/SwaggerConfig.java
+++ b/src/main/java/org/springframework/samples/petclinic/config/SwaggerConfig.java
@@ -34,35 +34,32 @@ import io.swagger.v3.oas.models.info.License;
*/
@Configuration
public class SwaggerConfig {
-
+
@Bean
OpenAPI customOpenAPI() {
- return new OpenAPI()
- .components(new Components())
- .info(new Info()
- .title("REST Petclinic backend Api Documentation")
- .version("1.0")
- .termsOfService("Petclinic backend terms of service")
- .description("This is REST API documentation of the Spring Petclinic backend. If authentication is enabled, when calling the APIs use admin/admin")
- .license(swaggerLicense())
- .contact(swaggerContact()));
+ return new OpenAPI().components(new Components()).info(new Info()
+ .title("REST Petclinic backend Api Documentation").version("1.0")
+ .termsOfService("Petclinic backend terms of service")
+ .description(
+ "This is REST API documentation of the Spring Petclinic backend. If authentication is enabled, when calling the APIs use admin/admin")
+ .license(swaggerLicense()).contact(swaggerContact()));
}
-
+
private Contact swaggerContact() {
- Contact petclinicContact = new Contact();
- petclinicContact.setName("Vitaliy Fedoriv");
- petclinicContact.setEmail("vitaliy.fedoriv@gmail.com");
- petclinicContact.setUrl("https://github.com/spring-petclinic/spring-petclinic-rest");
- return petclinicContact;
+ Contact petclinicContact = new Contact();
+ petclinicContact.setName("Vitaliy Fedoriv");
+ petclinicContact.setEmail("vitaliy.fedoriv@gmail.com");
+ petclinicContact.setUrl("https://github.com/spring-petclinic/spring-petclinic-rest");
+ return petclinicContact;
}
-
+
private License swaggerLicense() {
- License petClinicLicense = new License();
- petClinicLicense.setName("Apache 2.0");
- petClinicLicense.setUrl("http://www.apache.org/licenses/LICENSE-2.0");
- petClinicLicense.setExtensions(Collections.emptyMap());
- return petClinicLicense;
+ License petClinicLicense = new License();
+ petClinicLicense.setName("Apache 2.0");
+ petClinicLicense.setUrl("http://www.apache.org/licenses/LICENSE-2.0");
+ petClinicLicense.setExtensions(Collections.emptyMap());
+ return petClinicLicense;
}
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a864bc9eebd819ade56e0ba0b540d0fe501c3327..27f427499035bc193b512706d4d3ef8d2d0dbb5e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -23,10 +23,6 @@ spring.profiles.active=hsqldb,spring-data-jpa
server.port=9966
server.servlet.context-path=/petclinic/
-# Springfox workaround required by Spring Boot 2.6
-# See https://github.com/springfox/springfox/issues/3462
-#spring.mvc.pathmatch.matching-strategy=ant_path_matcher
-
spring.messages.basename=messages/messages
spring.jpa.open-in-view=false
@@ -40,9 +36,3 @@ logging.level.org.springframework=INFO
# by default the authentication is disabled
petclinic.security.enable=false
-# SpringDoc autoconfiguration is disabled
-# ------------------------------------------------
-#springdoc.api-docs.enabled=false
-#springdoc.packagesToScan=org.springframework.samples.petclinic*
-#springdoc.pathsToMatch=/*
-#springdoc.swagger-ui.url=/openapi.yml
\ No newline at end of file