From eb5f593f0f58e12c809288ce4aa71305f83320ce Mon Sep 17 00:00:00 2001 From: "Stefan E. Funk" Date: Wed, 29 Jun 2022 16:55:28 +0200 Subject: [PATCH 01/11] chore: fix logging --- .../java/info/textgrid/middleware/TriggerDHPrescaleJob.java | 2 +- pom.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cli-tools/src/main/java/info/textgrid/middleware/TriggerDHPrescaleJob.java b/cli-tools/src/main/java/info/textgrid/middleware/TriggerDHPrescaleJob.java index dc412e5..ba9726a 100644 --- a/cli-tools/src/main/java/info/textgrid/middleware/TriggerDHPrescaleJob.java +++ b/cli-tools/src/main/java/info/textgrid/middleware/TriggerDHPrescaleJob.java @@ -188,7 +188,7 @@ public class TriggerDHPrescaleJob extends DHCrudIndexClient implements Callable< con.setRequestMethod("GET"); int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { // success + if (responseCode == HttpURLConnection.HTTP_OK) { System.out.println("[" + count + "/" + hits.totalHits + "] --> " + uri + " (" + format + ") / last modified: " + dateFormat.format(lastModified) + " - tgcrud recache: OK"); } else { diff --git a/pom.xml b/pom.xml index 62624b7..06e8376 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,13 @@ 1.14.0 +<<<<<<< Updated upstream 11.7.0 4.0.5 +======= + 11.3.0-TG-RELEASE + 4.0.4-SNAPSHOT +>>>>>>> Stashed changes 1.24 1.4.18 -- GitLab From 39c3d78f990d3a9b35e7ebef00b2cb8faa55a5e3 Mon Sep 17 00:00:00 2001 From: "Stefan E. Funk" Date: Wed, 29 Jun 2022 17:02:29 +0200 Subject: [PATCH 02/11] build: increase dep versions --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 06e8376..62624b7 100644 --- a/pom.xml +++ b/pom.xml @@ -40,13 +40,8 @@ 1.14.0 -<<<<<<< Updated upstream 11.7.0 4.0.5 -======= - 11.3.0-TG-RELEASE - 4.0.4-SNAPSHOT ->>>>>>> Stashed changes 1.24 1.4.18 -- GitLab From 05fbb8a9a2b281f295e939f0422484c5ee61959d Mon Sep 17 00:00:00 2001 From: "Stefan E. Funk" Date: Wed, 29 Jun 2022 17:04:14 +0200 Subject: [PATCH 03/11] chore: add bom version develop to develop BOMs --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bff3f9..2d2752d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,9 +105,9 @@ Upload DARIAH-DE-COMMON BOM: - tags variables: X_API_KEY: ${DEPS_UPLOAD_TOKEN} - AUTO_CREATE_PROJECT: "true" - PROJECT_NAME: "dariah-de-common" - PROJECT_VERSION: ${PVERSION} + AUTO_CREATE_PROJECT: 'true' + PROJECT_NAME: 'dariah-de-common' + PROJECT_VERSION: 'devlop' BOM_LOCATION: "./target/bom.json" extends: - .upload-bom-to-deps -- GitLab From 002cdd8d82c808c438c0dba7e5f88e00029ce078 Mon Sep 17 00:00:00 2001 From: "Stefan E. Funk" Date: Wed, 29 Jun 2022 19:20:51 +0200 Subject: [PATCH 04/11] build: add ubbo's new BOM template --- .gitlab-ci.yml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d2752d..d373293 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ include: file: '/templates/.java.gitlab-ci.yml' - project: 'dariah-de/gitlab-templates' ref: 'main' - file: '/templates/.deps.gitlab-ci.yml' + file: '/templates/SBOM-Upload.gitlab-ci.yml' # Stages... stages: @@ -45,7 +45,7 @@ cache: ### # Update POM and CHANGELOG RELEASE files, TAG a new RELEASE version! -Seantic Versioning: +seantic-versioning: stage: prepare rules: # Only run if branch "main" AND commit title IS NOT "1.2.3" (main commit with tag) AND DOES NOT START WITH "Prepare next development iteration" (main commit with new version) @@ -55,7 +55,7 @@ Seantic Versioning: - .prepare-semantic-release # Get the project version from main POM file and store it to artifact. -Get POM version: +get-pom-version: stage: prepare only: - develop @@ -64,7 +64,7 @@ Get POM version: - .get-pom-version-to-env # Build, validate, and package all the feature branches -Validate Java: +validate-java: image: maven:3.8.3-jdk-8 stage: test except: @@ -81,7 +81,7 @@ Validate Java: # Build and deploy all JARs to GWDG Nexus (develop -> SNAPSHOT and tags -> RELEASE)! # NOTE mvn deploy triggers BOM creation! -Build and deploy JARs: +build-and-deploy -jars: image: maven:3.8.3-jdk-8 stage: build only: @@ -89,25 +89,11 @@ Build and deploy JARs: - tags script: - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean validate deploy + - cp target/bom.json . artifacts: paths: - - ./target/bom.json + - ./bom.json reports: # Declare the JUnit reports (recursive pattern for multi-module projects) junit: - "**/target/*-reports/TEST-*.xml" - -# Upload bom.json to deps.sub.uni-goettingen.de -Upload DARIAH-DE-COMMON BOM: - stage: deploy - only: - - develop - - tags - variables: - X_API_KEY: ${DEPS_UPLOAD_TOKEN} - AUTO_CREATE_PROJECT: 'true' - PROJECT_NAME: 'dariah-de-common' - PROJECT_VERSION: 'devlop' - BOM_LOCATION: "./target/bom.json" - extends: - - .upload-bom-to-deps -- GitLab From 49cd14951033032a934703fdb2398e723f86e347 Mon Sep 17 00:00:00 2001 From: "Stefan E. Funk" Date: Wed, 29 Jun 2022 19:29:07 +0200 Subject: [PATCH 05/11] chore: fix typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d373293..c3781c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,7 +81,7 @@ validate-java: # Build and deploy all JARs to GWDG Nexus (develop -> SNAPSHOT and tags -> RELEASE)! # NOTE mvn deploy triggers BOM creation! -build-and-deploy -jars: +build-and-deploy-jars: image: maven:3.8.3-jdk-8 stage: build only: -- GitLab From 0948e33741686db3030f0d77ca8822bb52e8c589 Mon Sep 17 00:00:00 2001 From: Ubbo Veentjer Date: Fri, 26 Aug 2022 15:25:54 +0200 Subject: [PATCH 06/11] build(maven): sbom to profile, tgsearch 4.0.6-SNAPSHOT --- .gitlab-ci.yml | 2 +- pom.xml | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3781c9..b5ce814 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,7 +88,7 @@ build-and-deploy-jars: - develop - tags script: - - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean validate deploy + - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean validate deploy -Psbom - cp target/bom.json . artifacts: paths: diff --git a/pom.xml b/pom.xml index 62624b7..67b03dd 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 11.7.0 - 4.0.5 + 4.0.6-SNAPSHOT 1.24 1.4.18 @@ -189,4 +189,29 @@ + + + sbom + + + + org.cyclonedx + cyclonedx-maven-plugin + ${cyclonedx-maven-plugin.version} + + + package + + makeAggregateBom + + + + + JSON + + + + + + -- GitLab From 89728e4da5d2da98676d5daa33f102e1d0c41e67 Mon Sep 17 00:00:00 2001 From: Ubbo Veentjer Date: Fri, 26 Aug 2022 15:28:12 +0200 Subject: [PATCH 07/11] build(maven): fix pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67b03dd..f691fac 100644 --- a/pom.xml +++ b/pom.xml @@ -212,6 +212,6 @@ - + -- GitLab From 5e0a4935fefa8738ad10d90c7f92ba618018b69f Mon Sep 17 00:00:00 2001 From: Ubbo Veentjer Date: Fri, 26 Aug 2022 15:29:16 +0200 Subject: [PATCH 08/11] build(maven): remove second cyclond-dx entry from plugins --- pom.xml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pom.xml b/pom.xml index f691fac..34f8c01 100644 --- a/pom.xml +++ b/pom.xml @@ -171,22 +171,6 @@ all,-missing - - org.cyclonedx - cyclonedx-maven-plugin - ${cyclonedx-maven-plugin.version} - - - package - - makeAggregateBom - - - - - JSON - - -- GitLab From 4ff893fd5c4df4667c8c4857c606822479a0e3aa Mon Sep 17 00:00:00 2001 From: Ubbo Veentjer Date: Tue, 30 Aug 2022 13:30:47 +0200 Subject: [PATCH 09/11] build(maven): tgsearch 4.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34f8c01..0739cbc 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 11.7.0 - 4.0.6-SNAPSHOT + 4.0.6 1.24 1.4.18 -- GitLab From 536f0501e0098c450bf1e03aa649fe378dbd2dff Mon Sep 17 00:00:00 2001 From: "Stefan E. Funk" Date: Tue, 30 Aug 2022 13:54:52 +0200 Subject: [PATCH 10/11] style: reformat pom, correct typo in gitlab-ci --- .gitlab-ci.yml | 4 +--- pom.xml | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5ce814..f6e3b7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,6 @@ include: - project: 'dariah-de/gitlab-templates' ref: 'main' file: '/templates/.java.gitlab-ci.yml' - - project: 'dariah-de/gitlab-templates' - ref: 'main' file: '/templates/SBOM-Upload.gitlab-ci.yml' # Stages... @@ -45,7 +43,7 @@ cache: ### # Update POM and CHANGELOG RELEASE files, TAG a new RELEASE version! -seantic-versioning: +prepare-release: stage: prepare rules: # Only run if branch "main" AND commit title IS NOT "1.2.3" (main commit with tag) AND DOES NOT START WITH "Prepare next development iteration" (main commit with new version) diff --git a/pom.xml b/pom.xml index 0739cbc..a8ffab5 100644 --- a/pom.xml +++ b/pom.xml @@ -175,25 +175,25 @@ - sbom - - - - org.cyclonedx + sbom + + + + org.cyclonedx cyclonedx-maven-plugin ${cyclonedx-maven-plugin.version} - package - - makeAggregateBom - - - - - JSON - - + package + + makeAggregateBom + + + + + JSON + + -- GitLab From c814732bff827c8914ba93a44f5f3f5dd06bddc3 Mon Sep 17 00:00:00 2001 From: "Stefan E. Funk" Date: Tue, 30 Aug 2022 15:46:02 +0200 Subject: [PATCH 11/11] build: correct includes in gitlab-ci --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6e3b7b..4cd1d02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,9 @@ variables: include: - project: 'dariah-de/gitlab-templates' ref: 'main' - file: '/templates/.java.gitlab-ci.yml' - file: '/templates/SBOM-Upload.gitlab-ci.yml' + file: + - '/templates/.java.gitlab-ci.yml' + - '/templates/SBOM-Upload.gitlab-ci.yml' # Stages... stages: -- GitLab