From cb38c509a70e23f3a56d6659db9da590a95162a5 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Thu, 7 Dec 2023 14:26:34 +0000 Subject: [PATCH 01/18] added artifact build automation --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f1ae4ab --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +stages: + - deploy + +deploy: + stage: deploy + image: maven:3.9.5-ibm-semeru-17-focal + script: + - 'mvn deploy -s ci_settings.xml' -- GitLab From 73ac9c924c944c45cd6a1e0143214522cf6085f4 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Thu, 7 Dec 2023 14:41:01 +0000 Subject: [PATCH 02/18] added config for maven registry --- ci_settings.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 ci_settings.xml diff --git a/ci_settings.xml b/ci_settings.xml new file mode 100644 index 0000000..69ad06e --- /dev/null +++ b/ci_settings.xml @@ -0,0 +1,16 @@ + + + + gitlab-maven + + + + Job-Token + ${CI_JOB_TOKEN} + + + + + + -- GitLab From 8d7af82f440c457930a737d25d96a607ef176308 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 13:49:32 +0000 Subject: [PATCH 03/18] added mvn registry related config --- pom.xml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ebdae8..868722c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,25 @@ 1.18.28 - + + + gitlab-maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + + + + + gitlab-maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + + + gitlab-maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + + + + org.projectlombok lombok -- GitLab From 626e03d90772cc38dc19239db83ca32b7ab5ef29 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:03:57 +0000 Subject: [PATCH 04/18] fetch artifact from main project --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 868722c..c3724e9 100644 --- a/pom.xml +++ b/pom.xml @@ -17,22 +17,23 @@ UTF-8 UTF-8 1.18.28 + 276 gitlab-maven - ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + ${CI_API_V4_URL}/projects/${main.project.id}/packages/maven gitlab-maven - ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + ${CI_API_V4_URL}/projects/${main.project.id}/packages/maven gitlab-maven - ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + ${CI_API_V4_URL}/projects/${main.project.id}/packages/maven -- GitLab From efd51dfc18bc9c782e61294cf70ca46194b675be Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:10:40 +0000 Subject: [PATCH 05/18] testing with hardcoded project ID --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c3724e9..205cab0 100644 --- a/pom.xml +++ b/pom.xml @@ -23,17 +23,17 @@ gitlab-maven - ${CI_API_V4_URL}/projects/${main.project.id}/packages/maven + ${CI_API_V4_URL}/projects/276/packages/maven gitlab-maven - ${CI_API_V4_URL}/projects/${main.project.id}/packages/maven + ${CI_API_V4_URL}/projects/276/packages/maven gitlab-maven - ${CI_API_V4_URL}/projects/${main.project.id}/packages/maven + ${CI_API_V4_URL}/projects/276/packages/maven -- GitLab From 0458e36cffddbae4b1a2064e59a3fe311c94acf2 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:12:12 +0000 Subject: [PATCH 06/18] debugging command --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1ae4ab..0aefe0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,5 +4,7 @@ stages: deploy: stage: deploy image: maven:3.9.5-ibm-semeru-17-focal + before_script: + - echo $CI_API_V4_URL script: - 'mvn deploy -s ci_settings.xml' -- GitLab From e493959ebef546d638578880727c1eecff90c86e Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:14:39 +0000 Subject: [PATCH 07/18] used direct URL in ci --- .gitlab-ci.yml | 4 +--- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0aefe0e..d651bdf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,5 @@ stages: deploy: stage: deploy image: maven:3.9.5-ibm-semeru-17-focal - before_script: - - echo $CI_API_V4_URL script: - - 'mvn deploy -s ci_settings.xml' + - mvn deploy -s ci_settings.xml -Drepo.url=${CI_API_V4_URL}/projects/276/packages/maven diff --git a/pom.xml b/pom.xml index 205cab0..efc30ee 100644 --- a/pom.xml +++ b/pom.xml @@ -23,17 +23,17 @@ gitlab-maven - ${CI_API_V4_URL}/projects/276/packages/maven + ${repo.url} gitlab-maven - ${CI_API_V4_URL}/projects/276/packages/maven + ${repo.url} gitlab-maven - ${CI_API_V4_URL}/projects/276/packages/maven + ${repo.url} -- GitLab From 4273d71eea973f4cb6dd11e933abc6efdd47d9aa Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:18:46 +0000 Subject: [PATCH 08/18] debug commands --- .gitlab-ci.yml | 4 +++- pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d651bdf..3ee3fd5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,4 +5,6 @@ deploy: stage: deploy image: maven:3.9.5-ibm-semeru-17-focal script: - - mvn deploy -s ci_settings.xml -Drepo.url=${CI_API_V4_URL}/projects/276/packages/maven + - echo "CI_API_V4_URL: $CI_API_V4_URL" + - echo "CI_PROJECT_ID: $CI_PROJECT_ID" + - mvn deploy -s ci_settings.xml diff --git a/pom.xml b/pom.xml index efc30ee..205cab0 100644 --- a/pom.xml +++ b/pom.xml @@ -23,17 +23,17 @@ gitlab-maven - ${repo.url} + ${CI_API_V4_URL}/projects/276/packages/maven gitlab-maven - ${repo.url} + ${CI_API_V4_URL}/projects/276/packages/maven gitlab-maven - ${repo.url} + ${CI_API_V4_URL}/projects/276/packages/maven -- GitLab From 8c03d167b02338cdd162c30bb434b265d3986d67 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:19:53 +0000 Subject: [PATCH 09/18] debug commands --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ee3fd5..66ccca6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,6 @@ deploy: stage: deploy image: maven:3.9.5-ibm-semeru-17-focal script: - - echo "CI_API_V4_URL: $CI_API_V4_URL" - - echo "CI_PROJECT_ID: $CI_PROJECT_ID" + - echo $CI_API_V4_URL + - echo $CI_PROJECT_ID - mvn deploy -s ci_settings.xml -- GitLab From d2914bdd427f93d6ca1e910ed29399e9998fe5d2 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:34:49 +0000 Subject: [PATCH 10/18] skip tests --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66ccca6..f4506fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,4 +7,4 @@ deploy: script: - echo $CI_API_V4_URL - echo $CI_PROJECT_ID - - mvn deploy -s ci_settings.xml + - mvn deploy -s ci_settings.xml -DskipTests -- GitLab From 4adc7546c97a0d994977375eea2a9104d300c694 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:36:07 +0000 Subject: [PATCH 11/18] removed debug commands --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4506fc..db0ad64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,4 @@ deploy: stage: deploy image: maven:3.9.5-ibm-semeru-17-focal script: - - echo $CI_API_V4_URL - - echo $CI_PROJECT_ID - mvn deploy -s ci_settings.xml -DskipTests -- GitLab From 56f5f8782e81997cb85e8e737295c3568154b285 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:37:27 +0000 Subject: [PATCH 12/18] added group level URL --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 205cab0..b55da3d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,17 +23,17 @@ gitlab-maven - ${CI_API_V4_URL}/projects/276/packages/maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven gitlab-maven - ${CI_API_V4_URL}/projects/276/packages/maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven gitlab-maven - ${CI_API_V4_URL}/projects/276/packages/maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven -- GitLab From 8a7dba8c72287c698eef8634818b8b6c5c1da8ff Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:45:15 +0000 Subject: [PATCH 13/18] point to group for artifact dependency --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b55da3d..de09083 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,6 @@ UTF-8 UTF-8 1.18.28 - 276 @@ -29,11 +28,11 @@ gitlab-maven - https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven gitlab-maven - https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven -- GitLab From 742eeac66b1ffb3b631304b1ef710d868ec3223a Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Sun, 10 Dec 2023 23:54:23 +0200 Subject: [PATCH 14/18] removed relativepath --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index de09083..dc406cb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,6 @@ org.etsi.osl org.etsi.osl.main 1.2.0-SNAPSHOT - ../org.etsi.osl.main -- GitLab From cb18887221e7c1f887d6d3b7ae1637edcd409efa Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Mon, 11 Dec 2023 14:13:03 +0000 Subject: [PATCH 15/18] used absoute URLs --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dc406cb..4a2cc7b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,11 +27,11 @@ gitlab-maven - ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven gitlab-maven - ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven -- GitLab From 23f4f0b360221ab4de5ca1a62247da9dd1e81e26 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Mon, 11 Dec 2023 14:15:56 +0000 Subject: [PATCH 16/18] used absolute path on project level --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4a2cc7b..80ba1a8 100644 --- a/pom.xml +++ b/pom.xml @@ -27,11 +27,11 @@ gitlab-maven - https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven + https://labs.etsi.org/rep/api/v4/projects/292/packages/maven gitlab-maven - https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven + https://labs.etsi.org/rep/api/v4/projects/292/packages/maven -- GitLab From c09072b57f18170a2b5a18ec4801e522d6cdb2bc Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Wed, 13 Dec 2023 12:07:56 +0000 Subject: [PATCH 17/18] Revert "used absolute path on project level" This reverts commit 23f4f0b360221ab4de5ca1a62247da9dd1e81e26 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 80ba1a8..4a2cc7b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,11 +27,11 @@ gitlab-maven - https://labs.etsi.org/rep/api/v4/projects/292/packages/maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven gitlab-maven - https://labs.etsi.org/rep/api/v4/projects/292/packages/maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven -- GitLab From 0a4a1acfa076951b96326aaa2cb7b9700927af9b Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Wed, 13 Dec 2023 12:08:10 +0000 Subject: [PATCH 18/18] Revert "used absoute URLs" This reverts commit cb18887221e7c1f887d6d3b7ae1637edcd409efa --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4a2cc7b..dc406cb 100644 --- a/pom.xml +++ b/pom.xml @@ -27,11 +27,11 @@ gitlab-maven - https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven gitlab-maven - https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven -- GitLab