diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bb7d754baa751630b25598e182a30f062e9b6ebd
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,40 @@
+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
+
+docker_build:
+ extends: .docker_build
+ needs:
+ - maven_build
diff --git a/Dockerfile.centrallog b/Dockerfile
similarity index 55%
rename from Dockerfile.centrallog
rename to Dockerfile
index 3fe8ac2df2b3ea6a8677c8380e5a6a12548abb86..a80e534d384b104eabd3dfec4fb38156a622ba6d 100644
--- a/Dockerfile.centrallog
+++ b/Dockerfile
@@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
MAINTAINER openslice.io
RUN mkdir /opt/shareclasses
RUN mkdir -p /opt/openslice/lib/
-COPY target/org.etsi.osl.centrallog.service-1.2.0-SNAPSHOT.jar /opt/openslice/lib/
-CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.centrallog.service-1.2.0-SNAPSHOT.jar"]
\ No newline at end of file
+COPY target/org.etsi.osl.centrallog.service-1.0.0.jar /opt/openslice/lib/
+CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.centrallog.service-1.0.0.jar"]
\ No newline at end of file
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 e7c5e5b8796a7a6fa7c2938f9acdc5ff287410ad..d957357f2aef048f4c7304cdd995308bfd688c2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
-
org.etsi.osl
org.etsi.osl.main
- 1.2.0-SNAPSHOT
+ 1.0.0
../org.etsi.osl.main
@@ -21,7 +20,23 @@
${spring-cloud-consul-version}
-
+
+
+ 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
+
+
+
@@ -157,13 +172,8 @@
org.etsi.osl
- org.etsi.osl.model
- ${project.version}
-
-
- org.etsi.osl
- org.etsi.osl.tmf.api
- ${project.version}
+ org.etsi.osl.model.tmf
+ ${org.etsi.osl.model.tmf.version}
diff --git a/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java b/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java
index 60b6bc92541988c845df9c6101b9b5166b48172b..a08395e1a9318df15fc9cb1f25571fdf6eabff7d 100644
--- a/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java
+++ b/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java
@@ -56,8 +56,8 @@ public class CentralLoggerRouteBuilder extends RouteBuilder{
String url = CENTRALLOGGERURL;
- from("activemq:queue:centrallogger.log")
- .log( "activemq:queue:centrallogger.log package with body ${body} !" )
+ from("jms:topic:centrallogger.log")
+ .log( "jms:topic:centrallogger.log package with body ${body} !" )
.setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http.HttpMethods.POST))
.setHeader("Content-Type", constant("application/json"))
.to("log:DEBUG?showBody=true&showHeaders=true")