Commit 1725ada4 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merging 2024Q2_RC into main, creating 2024Q2 Release

parents 501407c9 3180833e

.gitlab-ci.yml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
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

Dockerfile.mano→Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -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.manoclient-1.2.0-SNAPSHOT.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.manoclient-1.2.0-SNAPSHOT.jar"]
 
 No newline at end of file
 
COPY target/org.etsi.osl.manoclient-1.0.0.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.manoclient-1.0.0.jar"]
 
 No newline at end of file

ci_settings.xml

0 → 100644
+16 −0
Original line number Diff line number Diff line 
<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>

pom.xml

+26 −10
Original line number Diff line number Diff line
@@ -3,12 +3,11 @@ 
	<parent>

		<groupId>org.etsi.osl</groupId>

		<artifactId>org.etsi.osl.main</artifactId>

		<version>1.2.0-SNAPSHOT</version>

		<version>1.0.0</version>

		<relativePath>../org.etsi.osl.main</relativePath>

	</parent>



	<artifactId>org.etsi.osl.manoclient</artifactId>



	<name>org.etsi.osl.manoclient</name>

	<url>http://maven.apache.org</url>
@@ -18,6 +17,23 @@ 
		<spring.boot-version>${spring-boot-version}</spring.boot-version>

	</properties>



	<repositories>

		<repository>

			<id>gitlab-maven</id>

			<url>https://labs.etsi.org/rep/api/v4/groups/260/-/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>

	

	<dependencyManagement>

		<dependencies>

			<!-- Spring Boot BOM -->
@@ -137,31 +153,31 @@ 
		<dependency>

			<groupId>org.etsi.osl</groupId>

			<artifactId>org.etsi.osl.tmf.api</artifactId>

			<version>${project.version}</version>

			<version>${org.etsi.osl.tmf.api.version}</version>

		</dependency>

		<dependency>

			<groupId>org.etsi.osl</groupId>

			<artifactId>org.etsi.osl.model</artifactId>

			<version>${project.version}</version>

			<artifactId>org.etsi.osl.model.nfv</artifactId>

			<version>${org.etsi.osl.model.nfv.version}</version>

		</dependency>

		<dependency>

			<groupId>org.etsi.osl</groupId>			

			<artifactId>org.etsi.osl.centrallog.client</artifactId>

			<version>${project.version}</version>

			<version>${org.etsi.osl.centrallog.client.version}</version>

		</dependency>		

		<dependency>

			<groupId>com.fasterxml.jackson.core</groupId>

			<artifactId>jackson-databind</artifactId>

		</dependency>

		<dependency>

			<groupId>org.etsi.osl.sol005nbi</groupId>

			<groupId>org.etsi.osl</groupId>

			<artifactId>org.etsi.osl.sol005nbi.osm</artifactId>

			<version>1.2.0-SNAPSHOT</version>

			<version>${org.etsi.osl.sol005nbi.osm.version}</version>

		</dependency>		

		<dependency>

			<groupId>org.etsi.osl.sol005nbi</groupId>

			<groupId>org.etsi.osl</groupId>

			<artifactId>org.etsi.osl.sol005nbi.osm10</artifactId>

			<version>1.2.0-SNAPSHOT</version>

			<version>${org.etsi.osl.sol005nbi.osm10.version}</version>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.datatype</groupId>

src/main/java/org/etsi/osl/mano/MANOClient.java

+8 −8
Original line number Diff line number Diff line
@@ -44,14 +44,14 @@ import com.fasterxml.jackson.databind.JsonMappingException; 
import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;



import org.etsi.osl.model.DeploymentDescriptor;

import org.etsi.osl.model.ExperimentMetadata;

import org.etsi.osl.model.ExperimentOnBoardDescriptor;

import org.etsi.osl.model.Infrastructure;

import org.etsi.osl.model.MANOprovider;

import org.etsi.osl.model.PortalUser;

import org.etsi.osl.model.VxFMetadata;

import org.etsi.osl.model.VxFOnBoardedDescriptor;

import org.etsi.osl.model.nfv.DeploymentDescriptor;

import org.etsi.osl.model.nfv.ExperimentMetadata;

import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;

import org.etsi.osl.model.nfv.Infrastructure;

import org.etsi.osl.model.nfv.MANOprovider;

import org.etsi.osl.model.nfv.PortalUser;

import org.etsi.osl.model.nfv.VxFMetadata;

import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;

import org.etsi.osl.tmf.am642.model.AffectedService;

import org.etsi.osl.tmf.am642.model.AlarmCreate;

import org.etsi.osl.tmf.am642.model.AlarmStateType;