Commit 3e100606 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '2024Q2_RC' into 'develop' 

Merging 2024Q2_RC into develop

See merge request !6
parents 58a234f8 6279486b

.gitlab-ci.yml

+9 −1
Original line number Original line Diff line number Diff line
@@ -15,13 +15,21 @@ include: 
    rules:

    rules:

      - if: '$CI_COMMIT_REF_NAME == "develop"'

      - 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

  - project: osl/code/org.etsi.osl.main

    ref: develop

    ref: develop

    file: 

    file: 

      - 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"'

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'





maven_build:

maven_build:

  extends: .maven_build
 
  extends: .maven_build

pom.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<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-SNAPSHOT</version>

		<version>1.0.0</version>

		<relativePath>../org.etsi.osl.main</relativePath>

		<relativePath>../org.etsi.osl.main</relativePath>

	</parent>

	</parent>

src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ public class ConstituentVxF { 
	@Basic()

	@Basic()

	private String vnfdidRef;

	private String vnfdidRef;

	

	

	@ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH } )

	@ManyToOne(cascade = { CascadeType.DETACH } )

	@JoinColumn(name = "vxf_id")

	@JoinColumn(name = "vxf_id")

	private VxFMetadata vxfref;

	private VxFMetadata vxfref;