Commit 0d8b7cad authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merging 2024Q2_RC into main, creating 2024Q2 Release

parents a4762cf5 2bc1b3ed

.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.osom→Dockerfile

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

COPY target/org.etsi.osl.osom-1.2.0-SNAPSHOT-exec.jar /opt/openslice/lib/

COPY target/org.etsi.osl.osom-1.0.0.jar /opt/openslice/lib/

COPY target/org.etsi.osl.osom-1.0.0-exec.jar /opt/openslice/lib/

COPY . /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.osom-1.2.0-SNAPSHOT-exec.jar"]
 
 No newline at end of file
 
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.osom-1.0.0-exec.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

+23 −6
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 
	<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.osom</artifactId>



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

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

	<url>http://maven.apache.org</url>
@@ -23,6 +23,23 @@ 
		<flowable.version>${flowable-version}</flowable.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 -->
@@ -68,14 +85,14 @@ 
		</dependency>

		<dependency>

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

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

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

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

			<version>${org.etsi.osl.model.tmf.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>

src/main/java/org/etsi/osl/osom/OsomSpringBoot.java

+0 −6
Original line number Diff line number Diff line
@@ -26,16 +26,10 @@ import org.springframework.beans.factory.annotation.Autowired; 
import org.springframework.boot.CommandLineRunner;

import org.springframework.boot.ExitCodeGenerator;

import org.springframework.boot.SpringApplication;

import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

import org.springframework.boot.autoconfigure.SpringBootApplication;

import org.springframework.boot.autoconfigure.domain.EntityScan;

import org.springframework.boot.context.properties.EnableConfigurationProperties;

//import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

//import org.springframework.cloud.context.config.annotation.RefreshScope;

import org.springframework.context.ApplicationContext;

import org.springframework.context.annotation.ComponentScan;

import org.springframework.context.annotation.ComponentScan.Filter;

import org.springframework.context.annotation.FilterType;



/**

 * @author ctranoris