From 52156084cc3231c440fbcb40c58b1a7390264de0 Mon Sep 17 00:00:00 2001 From: tranoris <tranoris@ece.upatras.gr> Date: Tue, 12 Dec 2023 11:04:50 +0000 Subject: [PATCH] Revert "Merge branch..." This reverts merge request !9 --- .gitlab-ci.yml | 8 -------- ci_settings.xml | 16 ---------------- pom.xml | 36 ++++++++++++++++++------------------ 3 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 ci_settings.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index db0ad64..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 69ad06e..0000000 --- a/ci_settings.xml +++ /dev/null @@ -1,16 +0,0 @@ -<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 0b4ac7c..e3dc8c5 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,7 @@ <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> @@ -51,24 +52,23 @@ </properties> - - <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> - + <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> <build> <pluginManagement> -- GitLab