From 2410c4a5c288b15abf338e558beb8c7194b0ac6c Mon Sep 17 00:00:00 2001 From: Sandro La Bruzzo Date: Wed, 31 Aug 2022 11:12:01 +0200 Subject: [PATCH 1/2] 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 @@ provided - - io.swagger - swagger-annotations - ${dhp.swagger-annotations-version} - io.swagger.core.v3 swagger-annotations @@ -397,10 +392,6 @@ me.xuender unidecode - - io.swagger - swagger-annotations - io.swagger.core.v3 @@ -474,13 +465,13 @@ 1.0.7 1.2.1 2.0.1.Final - 2.1.12 + 2.2.2 2.2 1.9 2.4 1.7.25 0.0.7 - 1.5.20 + 2.1.12 UTF-8 UTF-8 3.6.0 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 result = new ArrayList<>(); -- 2.17.1 From bfd3a50feab69a75b1f7f386414a84fb22d80c9d Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Mon, 5 Sep 2022 08:09:53 +0200 Subject: [PATCH 2/2] 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 @@ eu.dnetlib.dhp dhp-schemas jar - 2.12.2-SNAPSHOT + 2.13.0-SNAPSHOT -- 2.17.1