diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..3d872f628da12898f872b41465d9794dfc5c0684 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,35 @@ +include: + - project: osl/code/org.etsi.osl.main + ref: main + file: + - ci-templates/default.yml + - ci-templates/build.yml + rules: + - if: '$CI_COMMIT_REF_NAME == "main"' + + - project: osl/code/org.etsi.osl.main + ref: develop + file: + - ci-templates/default.yml + - ci-templates/build.yml + rules: + - if: '$CI_COMMIT_REF_NAME == "develop"' + + - project: osl/code/org.etsi.osl.main + ref: $CI_COMMIT_REF_NAME + file: + - ci-templates/default.yml + - ci-templates/build.yml + rules: + - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + + - project: osl/code/org.etsi.osl.main + ref: develop + file: + - ci-templates/default.yml + - ci-templates/build_unprotected.yml + rules: + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED' + +maven_build: + extends: .maven_build diff --git a/ci_settings.xml b/ci_settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..69ad06ed6c63795d191555afde6ea2d1da4e133d --- /dev/null +++ b/ci_settings.xml @@ -0,0 +1,16 @@ + + + + gitlab-maven + + + + Job-Token + ${CI_JOB_TOKEN} + + + + + + diff --git a/pom.xml b/pom.xml index 5714caca9f9eceea30b7c5b28d67bfd3ca166193..e59e6ef43f4f97b921375525b17dbf9af6081a6c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,32 @@ - 4.0.0 - - + 4.0.0 org.etsi.osl org.etsi.osl.main - 1.2.0-SNAPSHOT + 1.0.0 ../org.etsi.osl.main - org.etsi.osl.centrallog.client - org.etsi.osl.centrallog.client - + org.etsi.osl.centrallog.client + org.etsi.osl.centrallog.client + + + + gitlab-maven + https://labs.etsi.org/rep/api/v4/groups/260/-/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 + + + diff --git a/src/main/java/org/etsi/osl/centrallog/client/CentralLogger.java b/src/main/java/org/etsi/osl/centrallog/client/CentralLogger.java index 4f2a281761de14691db840bf44871d9ec4ae6b25..d700e76ac6ccf4e8d22a9d97eee426afad34387b 100644 --- a/src/main/java/org/etsi/osl/centrallog/client/CentralLogger.java +++ b/src/main/java/org/etsi/osl/centrallog/client/CentralLogger.java @@ -129,7 +129,7 @@ public class CentralLogger { // .to("activemq:queue:centrallogger.log"); //Future result = template.withBody( json ).asyncSend(); //waitAndStopForTemplate( result, template); - template.sendBody("activemq:queue:centrallogger.log", json); + template.sendBody("jms:topic:centrallogger.log", json); }