From 4955e4144c88f69b405e29361eb9d0818ddb6028 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr> Date: Wed, 13 Dec 2023 12:23:12 +0000 Subject: [PATCH] Revert "Merge branch 'revert-5b74bbbc' into 'develop'" This reverts merge request !12 --- .gitlab-ci.yml | 8 ++++++++ ci_settings.xml | 16 ++++++++++++++++ pom.xml | 36 ++++++++++++++++++------------------ 3 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 ci_settings.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..db0ad64 --- /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 -DskipTests 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 @@ +<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"> + <servers> + <server> + <id>gitlab-maven</id> + <configuration> + <httpHeaders> + <property> + <name>Job-Token</name> + <value>${CI_JOB_TOKEN}</value> + </property> + </httpHeaders> + </configuration> + </server> + </servers> +</settings> diff --git a/pom.xml b/pom.xml index e3dc8c5..0b4ac7c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,6 @@ <license.licenseName>apache_v2</license.licenseName> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>1.8</java.version> <camel.version>4.0.0-RC2</camel.version> <spring-boot-version>3.1.2</spring-boot-version> <swagger.version>3.0.0</swagger.version> @@ -52,23 +51,24 @@ </properties> - <modules> - <module>../org.etsi.osl.bugzilla</module> - <module>../org.etsi.osl.centrallog.client</module> - <module>../org.etsi.osl.centrallog.service</module> - <module>../org.etsi.osl.cridge</module> - <module>../org.etsi.osl.mano</module> - <module>../org.etsi.osl.model.k8s</module> - <module>../org.etsi.osl.model.nfv</module> - <module>../org.etsi.osl.model.tmf</module> - <module>../org.etsi.osl.oas</module> - <module>../org.etsi.osl.osom</module> - <module>../org.etsi.osl.portal.api</module> - <module>../org.etsi.osl.sol005nbi.osm10</module> - <module>../org.etsi.osl.sol005nbi.osm</module> - <module>../org.etsi.osl.tmf.api</module> - - </modules> + + <repositories> + <repository> + <id>gitlab-maven</id> + <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url> + </repository> + </repositories> + <distributionManagement> + <repository> + <id>gitlab-maven</id> + <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url> + </repository> + <snapshotRepository> + <id>gitlab-maven</id> + <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url> + </snapshotRepository> + </distributionManagement> + <build> <pluginManagement> -- GitLab