From 8916a1b02dccacc5f582914eb4b07b005b22acc1 Mon Sep 17 00:00:00 2001 From: Thomas Beyer Date: Fri, 5 May 2023 11:06:19 +0200 Subject: [PATCH 1/3] RED-6603 - change from iqser to knecon --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 4 ++-- bamboo-specs/src/main/resources/scripts/build-java.sh | 2 +- bamboo-specs/src/main/resources/scripts/sonar-java.sh | 4 ++-- redaction-report-service-image-v1/pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 49dfcf3..ccf629f 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -95,7 +95,7 @@ public class PlanSpec { .enabled(true), new InjectVariablesTask().description("Inject git Tag").path("git.tag").namespace("g").scope(InjectVariablesScope.LOCAL), new VcsTagTask().description("${bamboo.g.gitTag}").tagName("${bamboo.g.gitTag}").defaultRepository()) - .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim") + .dockerConfiguration(new DockerConfiguration().image("nexus.knecon.com:5001/infra/maven:3.8.4-openjdk-17-slim") .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml") .volume("/var/run/docker.sock", "/var/run/docker.sock")))) .linkedRepositories("RED / " + SERVICE_NAME) @@ -114,7 +114,7 @@ public class PlanSpec { .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"), new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Sonar").location(Location.FILE).fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh").argument(SERVICE_NAME)) - .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim") + .dockerConfiguration(new DockerConfiguration().image("nexus.knecon.com:5001/infra/maven:3.8.4-openjdk-17-slim") .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml") .dockerRunArguments("--net=host") .volume("/var/run/docker.sock", "/var/run/docker.sock")))) diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index 7b458c3..886f06c 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -49,7 +49,7 @@ mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ -Dmaven.wagon.http.ssl.insecure=true \ -Dmaven.wagon.http.ssl.allowall=true \ -Dmaven.wagon.http.ssl.ignore.validity.dates=true \ - -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases + -DaltDeploymentRepository=iqser_release::default::https://knecon.iqser.com/repository/red-platform-releases mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ diff --git a/bamboo-specs/src/main/resources/scripts/sonar-java.sh b/bamboo-specs/src/main/resources/scripts/sonar-java.sh index a959a52..ba0b1de 100755 --- a/bamboo-specs/src/main/resources/scripts/sonar-java.sh +++ b/bamboo-specs/src/main/resources/scripts/sonar-java.sh @@ -22,7 +22,7 @@ then -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ sonar:sonar \ -Dsonar.projectKey=RED_$SERVICE_NAME \ - -Dsonar.host.url=https://sonarqube.iqser.com \ + -Dsonar.host.url=https://sonarqube.knecon.com \ -Dsonar.login=${bamboo_sonarqube_api_token_secret} \ -Dsonar.branch.name=${bamboo_planRepository_1_branch} \ -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \ @@ -34,7 +34,7 @@ else -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ sonar:sonar \ -Dsonar.projectKey=RED_$SERVICE_NAME \ - -Dsonar.host.url=https://sonarqube.iqser.com \ + -Dsonar.host.url=https://sonarqube.knecon.com \ -Dsonar.login=${bamboo_sonarqube_api_token_secret} \ -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \ -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \ diff --git a/redaction-report-service-image-v1/pom.xml b/redaction-report-service-image-v1/pom.xml index ca046d8..408155c 100644 --- a/redaction-report-service-image-v1/pom.xml +++ b/redaction-report-service-image-v1/pom.xml @@ -3,9 +3,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.iqser.red + com.knecon.fforesight platform-docker-dependency - 1.2.0 + 0.1.0 4.0.0 From d27b8e20e88e94b3d52a261262fd3eff717cea28 Mon Sep 17 00:00:00 2001 From: Thomas Beyer Date: Fri, 5 May 2023 11:49:21 +0200 Subject: [PATCH 2/3] RED-6603 - change iqser to knecon fix --- bamboo-specs/src/main/resources/scripts/build-java.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index 886f06c..0e18e03 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -49,7 +49,7 @@ mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ -Dmaven.wagon.http.ssl.insecure=true \ -Dmaven.wagon.http.ssl.allowall=true \ -Dmaven.wagon.http.ssl.ignore.validity.dates=true \ - -DaltDeploymentRepository=iqser_release::default::https://knecon.iqser.com/repository/red-platform-releases + -DaltDeploymentRepository=iqser_release::default::https://nexus.knecon.com/repository/red-platform-releases mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ From af64ccd85c9ba38f9efd13faff59323ad6d6aa40 Mon Sep 17 00:00:00 2001 From: Thomas Beyer Date: Fri, 5 May 2023 11:53:40 +0200 Subject: [PATCH 3/3] RED-6603 - change Assertions. to assertThat() part 2 --- .../report/v1/server/RedactionReportIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java index 0ba6f35..1dd11de 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java @@ -224,7 +224,7 @@ public class RedactionReportIntegrationTest { List paragraphs = doc.getParagraphs(); - Assertions.assertEquals(19, paragraphs.size()); + assertThat(paragraphs.size()).isEqualTo(19); List expectedContent = getExpectedContent("expected/iuclid.txt");