Merge pull request 'springdoc-openapi-ui' (#21) from springdoc-openapi-ui into master

Reviewed-on: #21

pom.xml

@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.13.2-SNAPSHOT</version>
+    <version>2.14.0-SNAPSHOT</version>
 
     <licenses>
         <license>
@@ -339,11 +339,6 @@
                 <scope>provided</scope>
             </dependency>
 
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${dhp.swagger-annotations-version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-annotations</artifactId>
@@ -397,10 +392,6 @@
             <groupId>me.xuender</groupId>
             <artifactId>unidecode</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
@@ -474,13 +465,13 @@
         <dhp.dateparser.version>1.0.7</dhp.dateparser.version>
         <dhp.jsonschema.module.addon.version>1.2.1</dhp.jsonschema.module.addon.version>
         <dhp.validation.api.version>2.0.1.Final</dhp.validation.api.version>
-        <dhp.swagger.annotations.version>2.1.12</dhp.swagger.annotations.version>
+        <dhp.swagger.annotations.version>2.2.2</dhp.swagger.annotations.version>
         <dhp.javax.persistence.api.version>2.2</dhp.javax.persistence.api.version>
         <dhp.commons.codec.version>1.9</dhp.commons.codec.version>
         <dhp.commons.io.version>2.4</dhp.commons.io.version>
         <dhp.slf4j.version>1.7.25</dhp.slf4j.version>
         <dhp.unidecode.version>0.0.7</dhp.unidecode.version>
-        <dhp.swagger-annotations-version>1.5.20</dhp.swagger-annotations-version>
+        <dhp.swagger-annotations-version>2.1.12</dhp.swagger-annotations-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>

src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v2/PageResultType.java

@@ -8,7 +8,6 @@ import javax.validation.constraints.NotBlank;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
@@ -19,22 +18,18 @@ public class PageResultType implements Serializable {
 
     @NotBlank
     @JsonProperty("currentPage")
-    @ApiModelProperty(position = 0)
     private Integer currentPage = 0;
 
     @NotBlank
     @JsonProperty("totalLinks")
-    @ApiModelProperty(position = 1)
     private  Integer totalLinks= 0;
 
     @NotBlank
     @JsonProperty("totalPages")
-    @ApiModelProperty(position = 2)
     private Integer totalPages = 0;
 
     @NotBlank
     @JsonProperty("result")
-    @ApiModelProperty(position = 3)
     private List<ScholixType> result = new ArrayList<>();