From eaa7c67ac9004298aa9ed6dccb346d2ce3d58794 Mon Sep 17 00:00:00 2001 From: Michael Moen Allport Date: Fri, 29 Nov 2024 13:17:38 +0100 Subject: [PATCH 1/4] change artifact name 'dapla-dlp-pseudo-service' -> 'pseudo-service' --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c06061..339ec5a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 no.ssb.dapla.dlp.pseudo - dapla-dlp-pseudo-service + pseudo-service 3.1.11-SNAPSHOT pseudo-service From 475e47c7087e77917f6bc6c5a9dfe40311c78de9 Mon Sep 17 00:00:00 2001 From: Michael Moen Allport Date: Fri, 29 Nov 2024 13:24:32 +0100 Subject: [PATCH 2/4] Fix jar name --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 331232b..bfc41f9 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM azul/zulu-openjdk:21 RUN apt-get -qq update && apt-get -y dist-upgrade && apt-get -y --no-install-recommends install curl -COPY target/dapla-dlp-pseudo-service-*.jar dapla-dlp-pseudo-service.jar +COPY target/pseudo-service-*.jar pseudo-service.jar COPY src/main/resources/logback*.xml /conf/ COPY conf/bootstrap.yml /conf/ COPY conf/application.yml /conf/ COPY conf/application-sid-client.yml /conf/ EXPOSE 10210 -CMD ["java", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-Dcom.sun.management.jmxremote", "-Dmicronaut.bootstrap.context=true", "-Xmx8g", "-jar", "dapla-dlp-pseudo-service.jar"] +CMD ["java", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-Dcom.sun.management.jmxremote", "-Dmicronaut.bootstrap.context=true", "-Xmx8g", "-jar", "pseudo-service.jar"] From 08fbe898a34363d1e41088848dc65f7132a76b41 Mon Sep 17 00:00:00 2001 From: Michael Moen Allport Date: Fri, 29 Nov 2024 14:09:14 +0100 Subject: [PATCH 3/4] Remove references to 'dapla-dlp-pseudo-service' --- .github/.cruft.json | 2 +- Makefile | 4 ++-- SECURITY.md | 2 +- conf/idea/runConfigurations/pseudo-service-local-gcp.run.xml | 2 +- conf/idea/runConfigurations/pseudo-service-local.run.xml | 2 +- .../runConfigurations/pseudo-service-remote-debug.run.xml | 2 +- pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/.cruft.json b/.github/.cruft.json index 9788962..2614b90 100644 --- a/.github/.cruft.json +++ b/.github/.cruft.json @@ -4,7 +4,7 @@ "checkout": null, "context": { "cookiecutter": { - "repo_name": "dapla-dlp-pseudo-service", + "repo_name": "pseudo-service", "team_uniform_name": "dapla-stat", "program_type": "APPLICATION", "java_version": "21", diff --git a/Makefile b/Makefile index 589e0f2..f1d5acc 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build-mvn: ## Build project and install to you local maven repo .PHONY: build-docker build-docker: ## Build dev docker image - docker build -t dapla-dlp-pseudo-service:dev -f Dockerfile . + docker build -t pseudo-service:dev -f Dockerfile . .PHONY: init-local-config init-local-config: ## Initialize the private folder to hold your local offline untracked configuration @@ -28,7 +28,7 @@ validate-local-config: ## Validate and echo local app config .PHONY: run-local run-local: validate-local-config - java ${JAVA_OPTS} --enable-preview -Dmicronaut.config.files=conf/application-local.yml -Dmicronaut.environments=local,local-sid -jar target/dapla-dlp-pseudo-service-*-SNAPSHOT.jar + java ${JAVA_OPTS} --enable-preview -Dmicronaut.config.files=conf/application-local.yml -Dmicronaut.environments=local,local-sid -jar target/pseudo-service-*-SNAPSHOT.jar .PHONY: release-dryrun release-dryrun: ## Simulate a release in order to detect any issues diff --git a/SECURITY.md b/SECURITY.md index 8d9f5c3..09a30b9 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -9,4 +9,4 @@ the security and privacy of all our users. ## Reporting a Vulnerability If you believe you have found a security vulnerability in any of SSB's GitHub -repositories, please report it to us using the [Github Private vulnerability reporting tool](https://github.com/statisticsnorway/dapla-dlp-pseudo-service/security/advisories). +repositories, please report it to us using the [Github Private vulnerability reporting tool](https://github.com/statisticsnorway/pseudo-service/security/advisories). diff --git a/conf/idea/runConfigurations/pseudo-service-local-gcp.run.xml b/conf/idea/runConfigurations/pseudo-service-local-gcp.run.xml index b84e9ac..700aa98 100644 --- a/conf/idea/runConfigurations/pseudo-service-local-gcp.run.xml +++ b/conf/idea/runConfigurations/pseudo-service-local-gcp.run.xml @@ -1,6 +1,6 @@ - +