Commit ab0d70af authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'productorder' into 'develop' 

Productorder

See merge request !13
parents 19b69aab 4dedc0fa

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ 
		<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>

	<version>${org.etsi.osl.model.tmf.version}</version>
@@ -19,6 +20,7 @@ 
		<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>

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;

src/main/java/org/etsi/osl/tmf/am651/model/AgreementCreate.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;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ import java.util.List; 
import java.util.Objects;

import java.util.Objects;





import com.fasterxml.jackson.annotation.JsonProperty;

import com.fasterxml.jackson.annotation.JsonProperty;



import org.etsi.osl.tmf.pcm620.model.ProductOfferingRef;

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;