Commit 87b575d9 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merging 2024Q2_RC into main, creating 2024Q2 Release

parents 88ddbeb3 58d64186

.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.oasapi→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.oas-1.2.0-SNAPSHOT.jar /opt/openslice/lib/

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

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

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

EXPOSE 13101
 
 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

+29 −26
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.oas</artifactId>



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

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

	<url>http://openslice.io</url>
@@ -27,6 +27,23 @@ 
		<lombok-version>1.18.28</lombok-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 -->
@@ -79,11 +96,6 @@ 
			<artifactId>spring-boot-starter-data-jpa</artifactId>

		</dependency>













		<dependency>

			<groupId>org.flowable</groupId>

			<artifactId>flowable-spring-boot-starter</artifactId>
@@ -93,18 +105,10 @@ 
		<dependency>

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

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

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

		</dependency>



		<dependency>

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

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

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

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

		</dependency>









		<!-- activeMQ -->

		<dependency>

			<groupId>org.springframework.boot</groupId>
@@ -126,6 +130,7 @@ 
			<artifactId>pooled-jms</artifactId>

		</dependency>





		<!-- Camel -->

		<dependency>

			<groupId>org.apache.camel.springboot</groupId>
@@ -163,16 +168,13 @@ 
			<artifactId>camel-stream</artifactId>

		</dependency>







		<dependency>

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

			<artifactId>jackson-databind</artifactId>

		</dependency>



		<!-- security -->





		<!-- security -->

		<dependency>

			<groupId>org.springframework.security</groupId>

			<artifactId>spring-security-web</artifactId>
@@ -214,9 +216,6 @@ 




		<!-- database -->





		

		<dependency>

			<groupId>com.h2database</groupId>

			<artifactId>h2</artifactId>
@@ -243,8 +242,6 @@ 




		<!-- Testing -->





		<dependency>

			<groupId>org.springframework.boot</groupId>

			<artifactId>spring-boot-starter-test</artifactId>
@@ -277,7 +274,6 @@ 
			<scope>test</scope>

		</dependency>





		<dependency>

			<groupId>org.apache.activemq</groupId>

			<artifactId>activemq-broker</artifactId>
@@ -285,6 +281,13 @@ 
		</dependency>





		<!--javax.jms -->

		<dependency>

			<groupId>javax.jms</groupId>

			<artifactId>javax.jms-api</artifactId>

			<version>2.0.1</version>

		</dependency>



	</dependencies>



	<build>

src/main/java/org/etsi/osl/oas/model/ActionCharacteristic.java

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package org.etsi.osl.oas.model; 


import com.fasterxml.jackson.annotation.JsonProperty;



import jakarta.persistence.Column;

import org.hibernate.annotations.GenericGenerator;

import org.springframework.validation.annotation.Validated;
@@ -33,5 +34,6 @@ public class ActionCharacteristic { 
	protected String name = null;

	

	@JsonProperty("value")

	@Column(name = "\"value\"")

	protected String value = null;

}