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 1/3] 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


From 93863822d1ad21871bf4f350afca0308b9ee2899 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Wed, 13 Dec 2023 12:25:47 +0000
Subject: [PATCH 2/3] used group URL for pull

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0b4ac7c..4f103aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
 	<repositories>
 		<repository>
 			<id>gitlab-maven</id>
-			<url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
+			<url>https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven</url>
 		</repository>
 	</repositories>
 	<distributionManagement>
-- 
GitLab


From 753094c4024d1e8a621c96fe6d22f38e31ca2420 Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Fri, 15 Dec 2023 15:03:59 +0200
Subject: [PATCH 3/3] fixes #4

---
 compose/deploy.sh | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/compose/deploy.sh b/compose/deploy.sh
index d2c1acc..8d55c59 100644
--- a/compose/deploy.sh
+++ b/compose/deploy.sh
@@ -20,29 +20,32 @@ updaterepo(){
         cd $1/
         git checkout $branch
         git pull
+
+        # Build maven project if .pom file is present
+        if [ -f  "./pom.xml" ]; then
+            docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven maven:3.9.5-ibm-semeru-17-focal mvn clean verify -DskipTests
+        fi
 }
 
 
 updaterepo org.etsi.osl.main
-updaterepo org.etsi.osl.sol005nbi.osm
-updaterepo org.etsi.osl.sol005nbi.osm10
-updaterepo org.etsi.osl.centrallog.client
+#updaterepo org.etsi.osl.sol005nbi.osm
+#updaterepo org.etsi.osl.sol005nbi.osm10
+#updaterepo org.etsi.osl.centrallog.client
 updaterepo org.etsi.osl.centrallog.service
-updaterepo org.etsi.osl.model.nfv
-updaterepo org.etsi.osl.model.tmf
-updaterepo org.etsi.osl.model.k8s
+#updaterepo org.etsi.osl.model.nfv
+#updaterepo org.etsi.osl.model.tmf
+#updaterepo org.etsi.osl.model.k8s
 updaterepo org.etsi.osl.portal.api
 updaterepo org.etsi.osl.mano
 updaterepo org.etsi.osl.bugzilla
 updaterepo org.etsi.osl.osom
 updaterepo org.etsi.osl.oas
-updaterepo org.etsi.osl.portal.web
 updaterepo org.etsi.osl.tmf.api
-updaterepo org.etsi.osl.tmf.web
 updaterepo org.etsi.osl.cridge
 
-cd $dirlocation
-docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven/org.etsi.osl.main maven:3.9.5-ibm-semeru-17-focal mvn clean verify -DskipTests
+updaterepo org.etsi.osl.tmf.web
+updaterepo org.etsi.osl.portal.web
 
 
 echo "Build org.etsi.osl.tmf.web" 
-- 
GitLab