Merge branch 'develop' into 'main' (3db291d6) · Commits · OSL / code / org.etsi.osl.model.tmf

.gitignore

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,3 +4,5 @@
	/.project		/.project
	/.classpath		/.classpath
	/.settings		/.settings
			*.iml
			/.factorypath

.gitlab-ci.yml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@ include:
	- ci-templates/default.yml		- ci-templates/default.yml
	- ci-templates/build.yml		- ci-templates/build.yml
	rules:		rules:
	- if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'		- if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'

	- project: osl/code/org.etsi.osl.main		- project: osl/code/org.etsi.osl.main
	ref: develop		ref: develop
	@@ -29,7 +29,7 @@ include:
	- ci-templates/default.yml		- ci-templates/default.yml
	- ci-templates/build_unprotected.yml		- ci-templates/build_unprotected.yml
	rules:		rules:
	- if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'		- if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'

	maven_build:		maven_build:
	extends: .maven_build		extends: .maven_build

README.md

+1 −2

Original line number	Original line	Diff line number	Diff line
	# org.etsi.osl.model.tmf		# org.etsi.osl.model.tmf



	## Getting started		## Getting started

	To make it easy for you to get started with GitLab, here's a list of recommended next steps.		To make it easy for you to get started with GitLab, here's a list of recommended next steps.
	@@ -44,6 +42,7 @@ Use the built-in continuous integration in GitLab.

	***		***


	# Editing this README		# Editing this README

	When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.		When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.

pom.xml

+30 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,11 +3,13 @@
	<parent>		<parent>
	<groupId>org.etsi.osl</groupId>		<groupId>org.etsi.osl</groupId>
	<artifactId>org.etsi.osl.main</artifactId>		<artifactId>org.etsi.osl.main</artifactId>
	<version>1.0.0</version>		<version>2024Q4</version>
	<relativePath>../org.etsi.osl.main</relativePath>		<relativePath>../org.etsi.osl.main</relativePath>
	</parent>		</parent>


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

	<properties>		<properties>
	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
	@@ -18,11 +20,16 @@
	<mapstruct.version>1.5.3.Final</mapstruct.version>		<mapstruct.version>1.5.3.Final</mapstruct.version>
	</properties>		</properties>


	<repositories>		<repositories>
	<repository>		<repository>
	<id>gitlab-maven</id>		<id>gitlab-maven</id>
	<url>https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven</url>		<url>https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven</url>
	</repository>		</repository>
			<repository>
			<id>jitpack.io</id>
			<url>https://jitpack.io</url>
			</repository>
	</repositories>		</repositories>
	<distributionManagement>		<distributionManagement>
	<repository>		<repository>
	@@ -65,6 +72,11 @@
	<groupId>com.fasterxml.jackson.datatype</groupId>		<groupId>com.fasterxml.jackson.datatype</groupId>
	<artifactId>jackson-datatype-hibernate5-jakarta</artifactId>		<artifactId>jackson-datatype-hibernate5-jakarta</artifactId>
	</dependency>		</dependency>
			<dependency>
			<groupId>org.openapitools</groupId>
			<artifactId>jackson-databind-nullable</artifactId>
			<version>0.2.6</version>
			</dependency>

	<!-- swagger -->		<!-- swagger -->
	<dependency>		<dependency>
	@@ -84,6 +96,23 @@
	<artifactId>mapstruct-processor</artifactId>		<artifactId>mapstruct-processor</artifactId>
	<version>${mapstruct.version}</version>		<version>${mapstruct.version}</version>
	</dependency>		</dependency>
			<dependency>
			<groupId>javax.annotation</groupId>
			<artifactId>javax.annotation-api</artifactId>
			<version>1.3.2</version>
			<scope>compile</scope>
			</dependency>
			<dependency>
			<groupId>jakarta.validation</groupId>
			<artifactId>jakarta.validation-api</artifactId>
			<version>3.0.2</version>
			</dependency>
			<dependency>
			<groupId>org.jetbrains</groupId>
			<artifactId>annotations</artifactId>
			<version>13.0</version>
			<scope>compile</scope>
			</dependency>
	</dependencies>		</dependencies>

	<build>		<build>

src/main/java/org/etsi/osl/tmf/am651/model/Agreement.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ import java.util.Objects;

	import com.fasterxml.jackson.annotation.JsonProperty;		import com.fasterxml.jackson.annotation.JsonProperty;
	import org.etsi.osl.tmf.common.model.TimePeriod;		import org.etsi.osl.tmf.common.model.TimePeriod;
			import org.etsi.osl.tmf.common.model.service.Characteristic;
	import org.springframework.validation.annotation.Validated;		import org.springframework.validation.annotation.Validated;
	import io.swagger.v3.oas.annotations.media.Schema;		import io.swagger.v3.oas.annotations.media.Schema;
	import jakarta.validation.Valid;		import jakarta.validation.Valid;