Commit 0009eef4 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merging 2024Q2_RC into main, creating 2024Q2 Release

parents e029899c b5ed529e

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

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

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.2.0-SNAPSHOT.jar"]

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

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.portal.api-1.0.0.jar"]

EXPOSE 13000
 
 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 −11
Original line number Diff line number Diff line
@@ -2,16 +2,15 @@ 
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

	<modelVersion>4.0.0</modelVersion>



	<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.portal.api</artifactId>



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

	<name>org.etsi.osl.portal.api</name>

	<url>http://maven.apache.org</url>
@@ -28,6 +27,22 @@ 
		

	</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>
@@ -207,24 +222,24 @@ 
	    </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.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>org.etsi.osl</groupId>

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

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

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

		</dependency>

src/main/java/portal/api/PortalApplication.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; 
 */

@SpringBootApplication()

@EnableWebMvc

@EntityScan( basePackages = {"org.etsi.osl.model", "org.etsi.osl.centrallog.client"})

@EntityScan( basePackages = {"org.etsi.osl.model.nfv", "org.etsi.osl.centrallog.client"})

@ComponentScan(basePackages = {	

		"portal.api",

		"portal.api.bus",