From 2410c4a5c288b15abf338e558beb8c7194b0ac6c Mon Sep 17 00:00:00 2001
From: Sandro La Bruzzo <sandro.labruzzo@gmail.com>
Date: Wed, 31 Aug 2022 11:12:01 +0200
Subject: [PATCH 1/4] update swagger annotation jar version to be compatible
 with new implementation of openAPI ui

---
 pom.xml                                             | 13 ++-----------
 .../dhp/schema/sx/api/model/v2/PageResultType.java  |  5 -----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7de4e25..dab3c77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v2/PageResultType.java b/src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v2/PageResultType.java
index f804865..6c3311e 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/sx/api/model/v2/PageResultType.java
+++ b/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<>();
 
 

From bfd3a50feab69a75b1f7f386414a84fb22d80c9d Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Mon, 5 Sep 2022 08:09:53 +0200
Subject: [PATCH 2/4] new version 2.13.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dab3c77..0345448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.12.2-SNAPSHOT</version>
+    <version>2.13.0-SNAPSHOT</version>
 
     <licenses>
         <license>

From 542d0cb98acbc92760ca4a0b83908603863a919b Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Thu, 8 Sep 2022 10:20:30 +0200
Subject: [PATCH 3/4] [maven-release-plugin] prepare release dhp-schemas-2.14.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1743472..1770993 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.14.0-SNAPSHOT</version>
+    <version>2.14.0</version>
 
     <licenses>
         <license>
@@ -32,7 +32,7 @@
         <connection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</connection>
         <developerConnection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</developerConnection>
         <url>https://code-repo.d4science.org/D-Net/dhp-schemas/</url>
-        <tag>dhp-schemas-2.10.30</tag>
+        <tag>dhp-schemas-2.14.0</tag>
     </scm>
 
     <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>

From 2b553e7aa5e4c3ce0bc64babc8cf5175519cb451 Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Thu, 8 Sep 2022 10:20:33 +0200
Subject: [PATCH 4/4] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1770993..23a03f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>2.14.0</version>
+    <version>2.14.1-SNAPSHOT</version>
 
     <licenses>
         <license>
@@ -32,7 +32,7 @@
         <connection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</connection>
         <developerConnection>scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git</developerConnection>
         <url>https://code-repo.d4science.org/D-Net/dhp-schemas/</url>
-        <tag>dhp-schemas-2.14.0</tag>
+        <tag>dhp-schemas-2.10.30</tag>
     </scm>
 
     <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>