From 712ce4f157d894365761b3ebde616ac351125d9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Nov 2022 11:05:20 +0000 Subject: [PATCH 01/21] Bump quarkus.platform.version from 2.14.1.Final to 2.14.2.Final Bumps `quarkus.platform.version` from 2.14.1.Final to 2.14.2.Final. Updates `quarkus-universe-bom` from 2.14.1.Final to 2.14.2.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.14.1.Final...2.14.2.Final) Updates `quarkus-maven-plugin` from 2.14.1.Final to 2.14.2.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4b80c87..c4a0b975 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0 0.12.0 - 2.14.1.Final + 2.14.2.Final 2.3.7 3.1 2.19.0 From e840b5a996fc6c4540948f6008039a2f1ba997ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:04:20 +0000 Subject: [PATCH 02/21] Bump quarkus.platform.version from 2.14.2.Final to 2.14.3.Final Bumps `quarkus.platform.version` from 2.14.2.Final to 2.14.3.Final. Updates `quarkus-universe-bom` from 2.14.2.Final to 2.14.3.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.14.2.Final...2.14.3.Final) Updates `quarkus-maven-plugin` from 2.14.2.Final to 2.14.3.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4a0b975..0b984fc7 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0 0.12.0 - 2.14.2.Final + 2.14.3.Final 2.3.7 3.1 2.19.0 From 180a5ef0ea2a7de632df24b345d5a21f78d4a46f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 11:03:16 +0000 Subject: [PATCH 03/21] Bump quarkus.platform.version from 2.14.3.Final to 2.15.0.Final Bumps `quarkus.platform.version` from 2.14.3.Final to 2.15.0.Final. Updates `quarkus-universe-bom` from 2.14.3.Final to 2.15.0.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.14.3.Final...2.15.0.Final) Updates `quarkus-maven-plugin` from 2.14.3.Final to 2.15.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b984fc7..36ee355e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0 0.12.0 - 2.14.3.Final + 2.15.0.Final 2.3.7 3.1 2.19.0 From a2cd9fff913452fdb9b1d072cc01a1371d9ddefe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Dec 2022 08:45:53 +0000 Subject: [PATCH 04/21] Bump ubi8/ubi-minimal from 8.7-923 to 8.7-1031 in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-923 to 8.7-1031. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile-basex.jvm | 2 +- app/src/main/docker/Dockerfile-basex.native | 2 +- app/src/main/docker/Dockerfile-postgresql.jvm | 2 +- app/src/main/docker/Dockerfile-postgresql.native | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/docker/Dockerfile-basex.jvm b/app/src/main/docker/Dockerfile-basex.jvm index e4aade5f..4a32a67e 100644 --- a/app/src/main/docker/Dockerfile-basex.jvm +++ b/app/src/main/docker/Dockerfile-basex.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-923 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1031 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-basex.native b/app/src/main/docker/Dockerfile-basex.native index 14b0b3ec..45d966d5 100644 --- a/app/src/main/docker/Dockerfile-basex.native +++ b/app/src/main/docker/Dockerfile-basex.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-923 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1031 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/app/src/main/docker/Dockerfile-postgresql.jvm b/app/src/main/docker/Dockerfile-postgresql.jvm index f37f05fa..0541f870 100644 --- a/app/src/main/docker/Dockerfile-postgresql.jvm +++ b/app/src/main/docker/Dockerfile-postgresql.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-923 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1031 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-postgresql.native b/app/src/main/docker/Dockerfile-postgresql.native index 1065b351..765dba0b 100644 --- a/app/src/main/docker/Dockerfile-postgresql.native +++ b/app/src/main/docker/Dockerfile-postgresql.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-923 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1031 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 43a8318785a66d1bfd3d800622c05456eeeacccd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 11:04:18 +0000 Subject: [PATCH 05/21] Bump quarkus.platform.version from 2.15.0.Final to 2.15.2.Final Bumps `quarkus.platform.version` from 2.15.0.Final to 2.15.2.Final. Updates `quarkus-universe-bom` from 2.15.0.Final to 2.15.2.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.15.0.Final...2.15.2.Final) Updates `quarkus-maven-plugin` from 2.15.0.Final to 2.15.2.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36ee355e..784ed85d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0 0.12.0 - 2.15.0.Final + 2.15.2.Final 2.3.7 3.1 2.19.0 From 9d39c39b2866bb0efa5bd7b9ce579a22249e82de Mon Sep 17 00:00:00 2001 From: Stef3st Date: Tue, 13 Dec 2022 17:05:31 +0100 Subject: [PATCH 06/21] Added name duplication check in REST API Signed-off-by: Stef3st --- .../data/rest/v1/CompasSclDataResource.java | 13 +++++ .../v1/model/DuplicateNameCheckRequest.java | 30 +++++++++++ .../v1/model/DuplicateNameCheckResponse.java | 27 ++++++++++ app/src/main/resources/application.properties | 18 +++---- .../v1/CompasSclDataResourceAsEditorTest.java | 51 ++++++++++++++++++- .../model/DuplicateNameCheckRequestTest.java | 8 +++ .../model/DuplicateNameCheckResponseTest.java | 9 ++++ .../CompasSclDataPostgreSQLRepository.java | 2 +- ...CompasSclDataPostgreSQLRepositoryTest.java | 3 -- .../data/service/CompasSclDataService.java | 6 ++- 10 files changed, 152 insertions(+), 15 deletions(-) create mode 100644 app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java create mode 100644 app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java create mode 100644 app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequestTest.java create mode 100644 app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponseTest.java diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java index f6ce9f30..5bad7160 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java @@ -143,4 +143,17 @@ public Uni deleteVersion(@PathParam(TYPE_PATH_PARAM) SclFileType type, compasSclDataService.delete(type, id, version); return Uni.createFrom().nullItem(); } + + @POST + @Path("/checkname") + @Consumes(MediaType.APPLICATION_XML) + @Produces(MediaType.APPLICATION_XML) + public Uni checkDuplicateName(@PathParam(TYPE_PATH_PARAM) SclFileType type, + @Valid DuplicateNameCheckRequest request) { + LOGGER.info("Checking for duplicate SCL File name."); + + var response = new DuplicateNameCheckResponse(); + response.setDuplicate(compasSclDataService.hasDuplicateSclName(type, request.getName())); + return Uni.createFrom().item(response); + } } diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java new file mode 100644 index 00000000..b776c5f5 --- /dev/null +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java @@ -0,0 +1,30 @@ +package org.lfenergy.compas.scl.data.rest.v1.model; + +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.lfenergy.compas.core.commons.constraint.FilenameValid; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; + +@Schema(description = "Request to check for duplicate names.") +@XmlRootElement(name = "DuplicateNameCheckRequest", namespace = SCL_DATA_SERVICE_V1_NS_URI) +@XmlAccessorType(XmlAccessType.FIELD) +public class DuplicateNameCheckRequest { + @FilenameValid + @Schema(description = "The name that will be stored as Private Element and can later be used to determine the filename.", + example = "STATION-0012312") + @XmlElement(name = "Name", namespace = SCL_DATA_SERVICE_V1_NS_URI, required = true) + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java new file mode 100644 index 00000000..c94e76d4 --- /dev/null +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java @@ -0,0 +1,27 @@ +package org.lfenergy.compas.scl.data.rest.v1.model; + +import org.eclipse.microprofile.openapi.annotations.media.Schema; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; + +@Schema(description = "Response from duplicate name check in the database.") +@XmlRootElement(name = "DuplicateNameCheckResponse", namespace = SCL_DATA_SERVICE_V1_NS_URI) +@XmlAccessorType(XmlAccessType.FIELD) +public class DuplicateNameCheckResponse { + @Schema(description = "Boolean result for duplicate name check.") + @XmlElement(name = "Duplicate", namespace = SCL_DATA_SERVICE_V1_NS_URI) + private boolean duplicate; + + public boolean isDuplicate() { + return duplicate; + } + + public void setDuplicate(boolean duplicate) { + this.duplicate = duplicate; + } +} diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index 07b1add8..0e176f9b 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -48,7 +48,7 @@ quarkus.http.auth.permission.SSD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.SSD_READ_GET.policy=SSD_READ quarkus.http.auth.permission.SSD_READ_GET.methods=GET quarkus.http.auth.policy.SSD_CREATE.roles-allowed=SSD_CREATE -quarkus.http.auth.permission.SSD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SSD +quarkus.http.auth.permission.SSD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SSD/* quarkus.http.auth.permission.SSD_CREATE_POST.policy=SSD_CREATE quarkus.http.auth.permission.SSD_CREATE_POST.methods=POST quarkus.http.auth.policy.SSD_UPDATE.roles-allowed=SSD_UPDATE @@ -74,7 +74,7 @@ quarkus.http.auth.permission.IID_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.IID_READ_GET.policy=IID_READ quarkus.http.auth.permission.IID_READ_GET.methods=GET quarkus.http.auth.policy.IID_CREATE.roles-allowed=IID_CREATE -quarkus.http.auth.permission.IID_CREATE_POST.paths=/compas-scl-data-service/scl/v1/IID +quarkus.http.auth.permission.IID_CREATE_POST.paths=/compas-scl-data-service/scl/v1/IID/* quarkus.http.auth.permission.IID_CREATE_POST.policy=IID_CREATE quarkus.http.auth.permission.IID_CREATE_POST.methods=POST quarkus.http.auth.policy.IID_UPDATE.roles-allowed=IID_UPDATE @@ -100,7 +100,7 @@ quarkus.http.auth.permission.ICD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.ICD_READ_GET.policy=ICD_READ quarkus.http.auth.permission.ICD_READ_GET.methods=GET quarkus.http.auth.policy.ICD_CREATE.roles-allowed=ICD_CREATE -quarkus.http.auth.permission.ICD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/ICD +quarkus.http.auth.permission.ICD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/ICD/* quarkus.http.auth.permission.ICD_CREATE_POST.policy=ICD_CREATE quarkus.http.auth.permission.ICD_CREATE_POST.methods=POST quarkus.http.auth.policy.ICD_UPDATE.roles-allowed=ICD_UPDATE @@ -126,7 +126,7 @@ quarkus.http.auth.permission.SCD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.SCD_READ_GET.policy=SCD_READ quarkus.http.auth.permission.SCD_READ_GET.methods=GET quarkus.http.auth.policy.SCD_CREATE.roles-allowed=SCD_CREATE -quarkus.http.auth.permission.SCD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SCD +quarkus.http.auth.permission.SCD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SCD/* quarkus.http.auth.permission.SCD_CREATE_POST.policy=SCD_CREATE quarkus.http.auth.permission.SCD_CREATE_POST.methods=POST quarkus.http.auth.policy.SCD_UPDATE.roles-allowed=SCD_UPDATE @@ -152,7 +152,7 @@ quarkus.http.auth.permission.CID_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.CID_READ_GET.policy=CID_READ quarkus.http.auth.permission.CID_READ_GET.methods=GET quarkus.http.auth.policy.CID_CREATE.roles-allowed=CID_CREATE -quarkus.http.auth.permission.CID_CREATE_POST.paths=/compas-scl-data-service/scl/v1/CID +quarkus.http.auth.permission.CID_CREATE_POST.paths=/compas-scl-data-service/scl/v1/CID/* quarkus.http.auth.permission.CID_CREATE_POST.policy=CID_CREATE quarkus.http.auth.permission.CID_CREATE_POST.methods=POST quarkus.http.auth.policy.CID_UPDATE.roles-allowed=CID_UPDATE @@ -178,7 +178,7 @@ quarkus.http.auth.permission.SED_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.SED_READ_GET.policy=SED_READ quarkus.http.auth.permission.SED_READ_GET.methods=GET quarkus.http.auth.policy.SED_CREATE.roles-allowed=SED_CREATE -quarkus.http.auth.permission.SED_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SED +quarkus.http.auth.permission.SED_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SED/* quarkus.http.auth.permission.SED_CREATE_POST.policy=SED_CREATE quarkus.http.auth.permission.SED_CREATE_POST.methods=POST quarkus.http.auth.policy.SED_UPDATE.roles-allowed=SED_UPDATE @@ -204,7 +204,7 @@ quarkus.http.auth.permission.ISD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.ISD_READ_GET.policy=ISD_READ quarkus.http.auth.permission.ISD_READ_GET.methods=GET quarkus.http.auth.policy.ISD_CREATE.roles-allowed=ISD_CREATE -quarkus.http.auth.permission.ISD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/ISD +quarkus.http.auth.permission.ISD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/ISD/* quarkus.http.auth.permission.ISD_CREATE_POST.policy=ISD_CREATE quarkus.http.auth.permission.ISD_CREATE_POST.methods=POST quarkus.http.auth.policy.ISD_UPDATE.roles-allowed=ISD_UPDATE @@ -230,7 +230,7 @@ quarkus.http.auth.permission.STD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.STD_READ_GET.policy=STD_READ quarkus.http.auth.permission.STD_READ_GET.methods=GET quarkus.http.auth.policy.STD_CREATE.roles-allowed=STD_CREATE -quarkus.http.auth.permission.STD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/STD +quarkus.http.auth.permission.STD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/STD/* quarkus.http.auth.permission.STD_CREATE_POST.policy=STD_CREATE quarkus.http.auth.permission.STD_CREATE_POST.methods=POST quarkus.http.auth.policy.STD_UPDATE.roles-allowed=STD_UPDATE @@ -249,4 +249,4 @@ quarkus.http.auth.permission.STD_READ_GET_VERSION_WS.policy=STD_READ quarkus.http.auth.permission.STD_CREATE_POST_WS.paths=/compas-scl-data-service/scl-ws/v1/STD/create quarkus.http.auth.permission.STD_CREATE_POST_WS.policy=STD_CREATE quarkus.http.auth.permission.STD_UPDATE_PUT_WS.paths=/compas-scl-data-service/scl-ws/v1/STD/update -quarkus.http.auth.permission.STD_UPDATE_PUT_WS.policy=STD_UPDATE +quarkus.http.auth.permission.STD_UPDATE_PUT_WS.policy=STD_UPDATE \ No newline at end of file diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResourceAsEditorTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResourceAsEditorTest.java index 34dc5252..cfb1265c 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResourceAsEditorTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResourceAsEditorTest.java @@ -16,6 +16,7 @@ import org.lfenergy.compas.scl.data.model.Item; import org.lfenergy.compas.scl.data.model.Version; import org.lfenergy.compas.scl.data.rest.v1.model.CreateRequest; +import org.lfenergy.compas.scl.data.rest.v1.model.DuplicateNameCheckRequest; import org.lfenergy.compas.scl.data.rest.v1.model.UpdateRequest; import org.lfenergy.compas.scl.data.service.CompasSclDataService; import org.lfenergy.compas.scl.extensions.model.SclFileType; @@ -27,7 +28,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.path.xml.config.XmlPathConfig.xmlPathConfig; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_NS_URI; import static org.lfenergy.compas.scl.data.rest.Constants.*; import static org.mockito.Mockito.*; @@ -267,6 +268,54 @@ void deleteVersion_WhenCalled_ThenServiceCalled() { verify(compasSclDataService).delete(type, uuid, version); } + @Test + void checkNameForDuplication_WhenCalled_WithDuplicateName_ThenServiceCalled() { + var type = SclFileType.SCD; + var name = "STATION-0012312"; + + when(compasSclDataService.hasDuplicateSclName(type, name)).thenReturn(true); + + var request = new DuplicateNameCheckRequest(); + request.setName(name); + + var response = given() + .pathParam(TYPE_PATH_PARAM, type) + .contentType(ContentType.XML) + .body(request) + .when().post("/checkname") + .then() + .statusCode(200) + .extract() + .response(); + + verify(compasSclDataService).hasDuplicateSclName(type, name); + assertTrue(response.xmlPath().getBoolean("DuplicateNameCheckResponse.Duplicate")); + } + + @Test + void checkNameForDuplication_WhenCalled_WithUniqueName_ThenServiceCalled() { + var type = SclFileType.SCD; + var name = "STATION-0012312"; + + when(compasSclDataService.hasDuplicateSclName(type, name)).thenReturn(false); + + var request = new DuplicateNameCheckRequest(); + request.setName(name); + + var response = given() + .pathParam(TYPE_PATH_PARAM, type) + .contentType(ContentType.XML) + .body(request) + .when().post("/checkname") + .then() + .statusCode(200) + .extract() + .response(); + + verify(compasSclDataService).hasDuplicateSclName(type, name); + assertFalse(response.xmlPath().getBoolean("DuplicateNameCheckResponse.Duplicate")); + } + private String readSCL() throws IOException { try (var inputStream = getClass().getResourceAsStream("/scl/icd_import_ied_test.scd")) { assert inputStream != null; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequestTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequestTest.java new file mode 100644 index 00000000..bdcce217 --- /dev/null +++ b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequestTest.java @@ -0,0 +1,8 @@ +package org.lfenergy.compas.scl.data.rest.v1.model; + +class DuplicateNameCheckRequestTest extends AbstractPojoTester { + @Override + protected Class getClassToBeTested() { + return DuplicateNameCheckRequest.class; + } +} \ No newline at end of file diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponseTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponseTest.java new file mode 100644 index 00000000..ac3e754c --- /dev/null +++ b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponseTest.java @@ -0,0 +1,9 @@ +package org.lfenergy.compas.scl.data.rest.v1.model; + +class DuplicateNameCheckResponseTest extends AbstractPojoTester{ + + @Override + protected Class getClassToBeTested() { + return DuplicateNameCheckResponse.class; + } +} \ No newline at end of file diff --git a/repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java b/repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java index 46394e23..bf1a937f 100644 --- a/repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java +++ b/repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java @@ -191,7 +191,7 @@ public String findByUUID(SclFileType type, UUID id, Version version) { @Transactional(SUPPORTS) public boolean hasDuplicateSclName(SclFileType type, String name) { var sql = """ - select distinct on (scl_file.id) * + select distinct on (scl_file.id) scl_file.name from scl_file where scl_file.type = ? order by scl_file.id diff --git a/repository-postgresql/src/test/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepositoryTest.java b/repository-postgresql/src/test/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepositoryTest.java index 6f4c54e1..4fafb2d4 100644 --- a/repository-postgresql/src/test/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepositoryTest.java +++ b/repository-postgresql/src/test/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepositoryTest.java @@ -29,9 +29,6 @@ void beforeEach() { repository = new CompasSclDataPostgreSQLRepository(PostgreSQLServerJUnitExtension.getDataSource()); } - /* - * TODO: Method beneath needs to be moved to AbstractCompasSclDataRepositoryTest - * when hasDuplicateSclName has been implemented by CompasSclDataBaseXRepository. */ @Test void hasDuplicateSclName_WhenUsingSclNameThatHasBeenUsedYet_ThenDuplicateIsFound() { var expectedVersion = new Version(1, 0, 0); diff --git a/service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataService.java b/service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataService.java index fbae11dd..b0f5bfd7 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataService.java @@ -122,7 +122,7 @@ public String create(SclFileType type, String name, String who, String comment, throw new CompasException(NO_SCL_ELEMENT_FOUND_ERROR_CODE, "No valid SCL found in the passed SCL Data."); } - if (repository.hasDuplicateSclName(type, name)) { + if (hasDuplicateSclName(type, name)) { throw new CompasException(DUPLICATE_SCL_NAME_ERROR_CODE, "Given name of SCL File already used."); } @@ -147,6 +147,10 @@ public String create(SclFileType type, String name, String who, String comment, return newSclData; } + public boolean hasDuplicateSclName(SclFileType type, String name){ + return repository.hasDuplicateSclName(type, name); + } + /** * Create a new version of a specific SCL XML File. The content will be the passed SCL XML File. * The UUID and new version (depending on the passed ChangeSetType) are set and From 66b7784212dfbd3027fa97e9ebc906baa5ff2d30 Mon Sep 17 00:00:00 2001 From: Stef3st Date: Tue, 13 Dec 2022 17:11:00 +0100 Subject: [PATCH 07/21] Added header Signed-off-by: Stef3st --- .../scl/data/rest/v1/model/DuplicateNameCheckRequest.java | 4 ++++ .../scl/data/rest/v1/model/DuplicateNameCheckResponse.java | 4 ++++ .../scl/data/rest/v1/model/DuplicateNameCheckRequestTest.java | 4 ++++ .../data/rest/v1/model/DuplicateNameCheckResponseTest.java | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java index b776c5f5..32827e8e 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2022 Alliander N.V. +// +// SPDX-License-Identifier: Apache-2.0 + package org.lfenergy.compas.scl.data.rest.v1.model; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java index c94e76d4..0cb1ba22 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2022 Alliander N.V. +// +// SPDX-License-Identifier: Apache-2.0 + package org.lfenergy.compas.scl.data.rest.v1.model; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequestTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequestTest.java index bdcce217..e037f693 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequestTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequestTest.java @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2022 Alliander N.V. +// +// SPDX-License-Identifier: Apache-2.0 + package org.lfenergy.compas.scl.data.rest.v1.model; class DuplicateNameCheckRequestTest extends AbstractPojoTester { diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponseTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponseTest.java index ac3e754c..6c5d8075 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponseTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponseTest.java @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2022 Alliander N.V. +// +// SPDX-License-Identifier: Apache-2.0 + package org.lfenergy.compas.scl.data.rest.v1.model; class DuplicateNameCheckResponseTest extends AbstractPojoTester{ From 47fb2b8436a9172feb34f3200683d86885e879b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 11:03:16 +0000 Subject: [PATCH 08/21] Bump quarkus.platform.version from 2.14.3.Final to 2.15.0.Final Bumps `quarkus.platform.version` from 2.14.3.Final to 2.15.0.Final. Updates `quarkus-universe-bom` from 2.14.3.Final to 2.15.0.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.14.3.Final...2.15.0.Final) Updates `quarkus-maven-plugin` from 2.14.3.Final to 2.15.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: Stef3st --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b984fc7..36ee355e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0 0.12.0 - 2.14.3.Final + 2.15.0.Final 2.3.7 3.1 2.19.0 From b66c165e77e7d21a33d03631e214643edfd011cb Mon Sep 17 00:00:00 2001 From: Stef3st Date: Fri, 6 Jan 2023 14:23:20 +0100 Subject: [PATCH 09/21] Update application.properties Only read rights to duplicate name check Signed-off-by: Stef3st --- app/src/main/resources/application.properties | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index 0e176f9b..18fa1f80 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -48,7 +48,7 @@ quarkus.http.auth.permission.SSD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.SSD_READ_GET.policy=SSD_READ quarkus.http.auth.permission.SSD_READ_GET.methods=GET quarkus.http.auth.policy.SSD_CREATE.roles-allowed=SSD_CREATE -quarkus.http.auth.permission.SSD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SSD/* +quarkus.http.auth.permission.SSD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SSD quarkus.http.auth.permission.SSD_CREATE_POST.policy=SSD_CREATE quarkus.http.auth.permission.SSD_CREATE_POST.methods=POST quarkus.http.auth.policy.SSD_UPDATE.roles-allowed=SSD_UPDATE @@ -60,6 +60,11 @@ quarkus.http.auth.permission.SSD_DELETE_DELETE.paths=/compas-scl-data-service/sc quarkus.http.auth.permission.SSD_DELETE_DELETE.policy=SSD_DELETE quarkus.http.auth.permission.SSD_DELETE_DELETE.methods=DELETE +quarkus.http.auth.policy.SSD_CHECK_NAME.roles-allowed=SSD_READ +quarkus.http.auth.permission.SSD_CHECK_NAME.paths=/compas-scl-data-service/scl/v1/SSD/checkname +quarkus.http.auth.permission.SSD_CHECK_NAME.policy=SSD_READ +quarkus.http.auth.permission.SSD_CHECK_NAME.methods=POST + quarkus.http.auth.permission.SSD_READ_GET_WS.paths=/compas-scl-data-service/scl-ws/v1/SSD/get quarkus.http.auth.permission.SSD_READ_GET_WS.policy=SSD_READ quarkus.http.auth.permission.SSD_READ_GET_VERSION_WS.paths=/compas-scl-data-service/scl-ws/v1/SSD/get-version @@ -74,7 +79,7 @@ quarkus.http.auth.permission.IID_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.IID_READ_GET.policy=IID_READ quarkus.http.auth.permission.IID_READ_GET.methods=GET quarkus.http.auth.policy.IID_CREATE.roles-allowed=IID_CREATE -quarkus.http.auth.permission.IID_CREATE_POST.paths=/compas-scl-data-service/scl/v1/IID/* +quarkus.http.auth.permission.IID_CREATE_POST.paths=/compas-scl-data-service/scl/v1/IID quarkus.http.auth.permission.IID_CREATE_POST.policy=IID_CREATE quarkus.http.auth.permission.IID_CREATE_POST.methods=POST quarkus.http.auth.policy.IID_UPDATE.roles-allowed=IID_UPDATE @@ -100,7 +105,7 @@ quarkus.http.auth.permission.ICD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.ICD_READ_GET.policy=ICD_READ quarkus.http.auth.permission.ICD_READ_GET.methods=GET quarkus.http.auth.policy.ICD_CREATE.roles-allowed=ICD_CREATE -quarkus.http.auth.permission.ICD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/ICD/* +quarkus.http.auth.permission.ICD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/ICD quarkus.http.auth.permission.ICD_CREATE_POST.policy=ICD_CREATE quarkus.http.auth.permission.ICD_CREATE_POST.methods=POST quarkus.http.auth.policy.ICD_UPDATE.roles-allowed=ICD_UPDATE @@ -126,7 +131,7 @@ quarkus.http.auth.permission.SCD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.SCD_READ_GET.policy=SCD_READ quarkus.http.auth.permission.SCD_READ_GET.methods=GET quarkus.http.auth.policy.SCD_CREATE.roles-allowed=SCD_CREATE -quarkus.http.auth.permission.SCD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SCD/* +quarkus.http.auth.permission.SCD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SCD quarkus.http.auth.permission.SCD_CREATE_POST.policy=SCD_CREATE quarkus.http.auth.permission.SCD_CREATE_POST.methods=POST quarkus.http.auth.policy.SCD_UPDATE.roles-allowed=SCD_UPDATE @@ -147,12 +152,17 @@ quarkus.http.auth.permission.SCD_CREATE_POST_WS.policy=SCD_CREATE quarkus.http.auth.permission.SCD_UPDATE_PUT_WS.paths=/compas-scl-data-service/scl-ws/v1/SCD/update quarkus.http.auth.permission.SCD_UPDATE_PUT_WS.policy=SCD_UPDATE +quarkus.http.auth.policy.SCD_CHECK_NAME.roles-allowed=SCD_READ +quarkus.http.auth.permission.SCD_CHECK_NAME.paths=/compas-scl-data-service/scl/v1/SCD/checkname +quarkus.http.auth.permission.SCD_CHECK_NAME.policy=SCD_READ +quarkus.http.auth.permission.SCD_CHECK_NAME.methods=POST + quarkus.http.auth.policy.CID_READ.roles-allowed=CID_READ quarkus.http.auth.permission.CID_READ_GET.paths=/compas-scl-data-service/scl/v1/CID/* quarkus.http.auth.permission.CID_READ_GET.policy=CID_READ quarkus.http.auth.permission.CID_READ_GET.methods=GET quarkus.http.auth.policy.CID_CREATE.roles-allowed=CID_CREATE -quarkus.http.auth.permission.CID_CREATE_POST.paths=/compas-scl-data-service/scl/v1/CID/* +quarkus.http.auth.permission.CID_CREATE_POST.paths=/compas-scl-data-service/scl/v1/CID quarkus.http.auth.permission.CID_CREATE_POST.policy=CID_CREATE quarkus.http.auth.permission.CID_CREATE_POST.methods=POST quarkus.http.auth.policy.CID_UPDATE.roles-allowed=CID_UPDATE @@ -178,7 +188,7 @@ quarkus.http.auth.permission.SED_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.SED_READ_GET.policy=SED_READ quarkus.http.auth.permission.SED_READ_GET.methods=GET quarkus.http.auth.policy.SED_CREATE.roles-allowed=SED_CREATE -quarkus.http.auth.permission.SED_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SED/* +quarkus.http.auth.permission.SED_CREATE_POST.paths=/compas-scl-data-service/scl/v1/SED quarkus.http.auth.permission.SED_CREATE_POST.policy=SED_CREATE quarkus.http.auth.permission.SED_CREATE_POST.methods=POST quarkus.http.auth.policy.SED_UPDATE.roles-allowed=SED_UPDATE @@ -204,7 +214,7 @@ quarkus.http.auth.permission.ISD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.ISD_READ_GET.policy=ISD_READ quarkus.http.auth.permission.ISD_READ_GET.methods=GET quarkus.http.auth.policy.ISD_CREATE.roles-allowed=ISD_CREATE -quarkus.http.auth.permission.ISD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/ISD/* +quarkus.http.auth.permission.ISD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/ISD quarkus.http.auth.permission.ISD_CREATE_POST.policy=ISD_CREATE quarkus.http.auth.permission.ISD_CREATE_POST.methods=POST quarkus.http.auth.policy.ISD_UPDATE.roles-allowed=ISD_UPDATE @@ -230,7 +240,7 @@ quarkus.http.auth.permission.STD_READ_GET.paths=/compas-scl-data-service/scl/v1/ quarkus.http.auth.permission.STD_READ_GET.policy=STD_READ quarkus.http.auth.permission.STD_READ_GET.methods=GET quarkus.http.auth.policy.STD_CREATE.roles-allowed=STD_CREATE -quarkus.http.auth.permission.STD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/STD/* +quarkus.http.auth.permission.STD_CREATE_POST.paths=/compas-scl-data-service/scl/v1/STD quarkus.http.auth.permission.STD_CREATE_POST.policy=STD_CREATE quarkus.http.auth.permission.STD_CREATE_POST.methods=POST quarkus.http.auth.policy.STD_UPDATE.roles-allowed=STD_UPDATE From 4d37dd549768947d70ae8c8e4564b73bb4be8485 Mon Sep 17 00:00:00 2001 From: Stef3st Date: Fri, 6 Jan 2023 14:46:01 +0100 Subject: [PATCH 10/21] DSO check failed Signed-off-by: Stef3st --- app/src/main/resources/application.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index 18fa1f80..88e84e90 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -142,7 +142,6 @@ quarkus.http.auth.policy.SCD_DELETE.roles-allowed=SCD_DELETE quarkus.http.auth.permission.SCD_DELETE_DELETE.paths=/compas-scl-data-service/scl/v1/SCD/* quarkus.http.auth.permission.SCD_DELETE_DELETE.policy=SCD_DELETE quarkus.http.auth.permission.SCD_DELETE_DELETE.methods=DELETE - quarkus.http.auth.permission.SCD_READ_GET_WS.paths=/compas-scl-data-service/scl-ws/v1/SCD/get quarkus.http.auth.permission.SCD_READ_GET_WS.policy=SCD_READ quarkus.http.auth.permission.SCD_READ_GET_VERSION_WS.paths=/compas-scl-data-service/scl-ws/v1/SCD/get-version From 4ef04b65c2ed5fb940c46b4dc6d9a86b29398dbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 11:03:33 +0000 Subject: [PATCH 11/21] Bump quarkus.platform.version from 2.15.2.Final to 2.16.0.Final Bumps `quarkus.platform.version` from 2.15.2.Final to 2.16.0.Final. Updates `quarkus-universe-bom` from 2.15.2.Final to 2.16.0.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.15.2.Final...2.16.0.Final) Updates `quarkus-maven-plugin` from 2.15.2.Final to 2.16.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fc59821..209fecba 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ SPDX-License-Identifier: Apache-2.0 3.2.0 0.12.0 - 2.15.2.Final + 2.16.0.Final 2.3.7 3.1 From 825e51c4f1825ab9eaf2cb6dc5f86db445000f7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 08:05:58 +0000 Subject: [PATCH 12/21] Bump surefire-plugin.version from 3.0.0-M7 to 3.0.0-M8 Bumps `surefire-plugin.version` from 3.0.0-M7 to 3.0.0-M8. Updates `maven-surefire-plugin` from 3.0.0-M7 to 3.0.0-M8 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M7...surefire-3.0.0-M8) Updates `maven-failsafe-plugin` from 3.0.0-M7 to 3.0.0-M8 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M7...surefire-3.0.0-M8) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 209fecba..3ddbfd25 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 3.10.1 - 3.0.0-M7 + 3.0.0-M8 3.2.0 0.12.0 From 0b8f0c1783a42113d4edcfabbfa4bdfb9d146458 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 11:07:12 +0000 Subject: [PATCH 13/21] Bump alex-page/github-project-automation-plus from 0.8.2 to 0.8.3 Bumps [alex-page/github-project-automation-plus](https://github.com/alex-page/github-project-automation-plus) from 0.8.2 to 0.8.3. - [Release notes](https://github.com/alex-page/github-project-automation-plus/releases) - [Commits](https://github.com/alex-page/github-project-automation-plus/compare/v0.8.2...v0.8.3) --- updated-dependencies: - dependency-name: alex-page/github-project-automation-plus dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/automate-projects.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml index ec3166d7..c907722c 100644 --- a/.github/workflows/automate-projects.yml +++ b/.github/workflows/automate-projects.yml @@ -14,14 +14,14 @@ jobs: steps: - name: add-new-issues-to-organization-based-project-column if: github.event_name == 'issues' && github.event.action == 'opened' - uses: alex-page/github-project-automation-plus@v0.8.2 + uses: alex-page/github-project-automation-plus@v0.8.3 with: project: CoMPAS Issues Overview Board column: To do repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }} - name: add-new-pull-request-to-organization-based-project-column if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened' - uses: alex-page/github-project-automation-plus@v0.8.2 + uses: alex-page/github-project-automation-plus@v0.8.3 with: project: CoMPAS Pull Request Overview Board column: To do From 73b996d31ea51a69b65a251e8fed0c786f95b25d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 11:02:58 +0000 Subject: [PATCH 14/21] Bump jaxb-impl from 2.3.7 to 2.3.8 Bumps jaxb-impl from 2.3.7 to 2.3.8. --- updated-dependencies: - dependency-name: com.sun.xml.bind:jaxb-impl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ddbfd25..a932d45b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0 0.12.0 2.16.0.Final - 2.3.7 + 2.3.8 3.1 2.19.0 0.9.1 From e790f4cd75640a029546d4b3c8931c4fb6df699f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 11:03:59 +0000 Subject: [PATCH 15/21] Bump quarkus.platform.version from 2.16.0.Final to 2.16.2.Final Bumps `quarkus.platform.version` from 2.16.0.Final to 2.16.2.Final. Updates `quarkus-universe-bom` from 2.16.0.Final to 2.16.2.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.16.0.Final...2.16.2.Final) Updates `quarkus-maven-plugin` from 2.16.0.Final to 2.16.2.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ddbfd25..8ce2a9db 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ SPDX-License-Identifier: Apache-2.0 3.2.0 0.12.0 - 2.16.0.Final + 2.16.2.Final 2.3.7 3.1 From cc40a0031a4b5f75ad349d64bafbd4a98fa03413 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 12:01:53 +0000 Subject: [PATCH 16/21] Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-1031 to 8.7-1049.1675784874. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile-basex.jvm | 2 +- app/src/main/docker/Dockerfile-basex.native | 2 +- app/src/main/docker/Dockerfile-postgresql.jvm | 2 +- app/src/main/docker/Dockerfile-postgresql.native | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/docker/Dockerfile-basex.jvm b/app/src/main/docker/Dockerfile-basex.jvm index 4a32a67e..d29ed5d1 100644 --- a/app/src/main/docker/Dockerfile-basex.jvm +++ b/app/src/main/docker/Dockerfile-basex.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1031 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-basex.native b/app/src/main/docker/Dockerfile-basex.native index 45d966d5..bdf46ea9 100644 --- a/app/src/main/docker/Dockerfile-basex.native +++ b/app/src/main/docker/Dockerfile-basex.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1031 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/app/src/main/docker/Dockerfile-postgresql.jvm b/app/src/main/docker/Dockerfile-postgresql.jvm index 0541f870..673fb26e 100644 --- a/app/src/main/docker/Dockerfile-postgresql.jvm +++ b/app/src/main/docker/Dockerfile-postgresql.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1031 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-postgresql.native b/app/src/main/docker/Dockerfile-postgresql.native index 765dba0b..13694743 100644 --- a/app/src/main/docker/Dockerfile-postgresql.native +++ b/app/src/main/docker/Dockerfile-postgresql.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1031 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 926563357a29dab7607ae9b0a74c46a82f652d7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 20:11:58 +0000 Subject: [PATCH 17/21] Bump maven-javadoc-plugin from 3.4.1 to 3.5.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c91c0a14..acb69671 100644 --- a/pom.xml +++ b/pom.xml @@ -278,7 +278,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 attach-javadocs From 6b196ce2dab2415e204bd3b0eacc3920db483b9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 20:12:01 +0000 Subject: [PATCH 18/21] Bump surefire-plugin.version from 3.0.0-M8 to 3.0.0-M9 Bumps `surefire-plugin.version` from 3.0.0-M8 to 3.0.0-M9. Updates `maven-surefire-plugin` from 3.0.0-M8 to 3.0.0-M9 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.0.0-M9) Updates `maven-failsafe-plugin` from 3.0.0-M8 to 3.0.0-M9 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.0.0-M9) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c91c0a14..b81bb544 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 3.10.1 - 3.0.0-M8 + 3.0.0-M9 3.2.0 0.12.0 From 79f05dbabdd031c12c7061cd0494f19e00357929 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 11:58:53 +0000 Subject: [PATCH 19/21] Bump quarkus.platform.version from 2.16.2.Final to 2.16.3.Final Bumps `quarkus.platform.version` from 2.16.2.Final to 2.16.3.Final. Updates `quarkus-universe-bom` from 2.16.2.Final to 2.16.3.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.16.2.Final...2.16.3.Final) Updates `quarkus-maven-plugin` from 2.16.2.Final to 2.16.3.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8cb656e8..34f24d7b 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ SPDX-License-Identifier: Apache-2.0 3.2.0 0.12.0 - 2.16.2.Final + 2.16.3.Final 2.3.8 3.1 From 1181cf1ea4dd05ea271d48477afb22a500bedd39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 11:59:10 +0000 Subject: [PATCH 20/21] Bump log4j2.version from 2.19.0 to 2.20.0 Bumps `log4j2.version` from 2.19.0 to 2.20.0. Updates `log4j-api` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0) Updates `log4j-core` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0) Updates `log4j-slf4j-impl` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0) --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34f24d7b..eb6ad634 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ SPDX-License-Identifier: Apache-2.0 2.3.8 3.1 - 2.19.0 + 2.20.0 0.9.1 From ccd8b99529ac04933da07e8599e19858515b96e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 12:02:08 +0000 Subject: [PATCH 21/21] Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-1049.1675784874 to 8.7-1085. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile-basex.jvm | 2 +- app/src/main/docker/Dockerfile-basex.native | 2 +- app/src/main/docker/Dockerfile-postgresql.jvm | 2 +- app/src/main/docker/Dockerfile-postgresql.native | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/docker/Dockerfile-basex.jvm b/app/src/main/docker/Dockerfile-basex.jvm index d29ed5d1..66d7ce10 100644 --- a/app/src/main/docker/Dockerfile-basex.jvm +++ b/app/src/main/docker/Dockerfile-basex.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-basex.native b/app/src/main/docker/Dockerfile-basex.native index bdf46ea9..7cf1b486 100644 --- a/app/src/main/docker/Dockerfile-basex.native +++ b/app/src/main/docker/Dockerfile-basex.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/app/src/main/docker/Dockerfile-postgresql.jvm b/app/src/main/docker/Dockerfile-postgresql.jvm index 673fb26e..80ad6494 100644 --- a/app/src/main/docker/Dockerfile-postgresql.jvm +++ b/app/src/main/docker/Dockerfile-postgresql.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-postgresql.native b/app/src/main/docker/Dockerfile-postgresql.native index 13694743..d33b2a19 100644 --- a/app/src/main/docker/Dockerfile-postgresql.native +++ b/app/src/main/docker/Dockerfile-postgresql.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \