Merging 2024Q2_RC into main, creating 2024Q2 Release (7904164c) · Commits · OSL / code / org.etsi.osl.bugzilla

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,5 +2,5 @@ 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.bugzilla-1.2.0-SNAPSHOT.jar /opt/openslice/lib/
		CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.2.0-SNAPSHOT.jar"]
		No newline at end of file
		COPY target/org.etsi.osl.bugzilla-1.0.0.jar /opt/openslice/lib/
		CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.0.0.jar"]
		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

+22 −7

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.bugzilla</artifactId>

		<artifactId>org.etsi.osl.bugzilla</artifactId>
		<name>org.etsi.osl.bugzilla</name>
		<url>http://maven.apache.org</url>

		@@ -22,6 +21,22 @@
		<spring.cloud-consul-version>${spring-cloud-consul-version}</spring.cloud-consul-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>
		@@ -164,13 +179,13 @@
		<!-- models -->
		<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</groupId>
		<artifactId>org.etsi.osl.tmf.api</artifactId>
		<version>${project.version}</version>
		<artifactId>org.etsi.osl.model.tmf</artifactId>
		<version>${org.etsi.osl.model.tmf.version}</version>
		</dependency>

src/main/java/org/etsi/osl/bugzilla/BugzillaClient.java

+15 −15

Original line number	Diff line number	Diff line
		@@ -45,21 +45,21 @@ import org.springframework.stereotype.Component;
		import com.fasterxml.jackson.core.JsonParseException;
		import com.fasterxml.jackson.databind.JsonMappingException;
		import com.fasterxml.jackson.databind.ObjectMapper;
		import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor;
		import org.etsi.osl.model.CompositeVxFOnBoardDescriptor;
		import org.etsi.osl.model.DeploymentDescriptor;
		import org.etsi.osl.model.DeploymentDescriptorStatus;
		import org.etsi.osl.model.DeploymentDescriptorVxFPlacement;
		import org.etsi.osl.model.ExperimentMetadata;
		import org.etsi.osl.model.ExperimentOnBoardDescriptor;
		import org.etsi.osl.model.IMANOCommunicationStatus;
		import org.etsi.osl.model.OnBoardingStatus;
		import org.etsi.osl.model.PortalUser;
		import org.etsi.osl.model.VFImage;
		import org.etsi.osl.model.ValidationJob;
		import org.etsi.osl.model.ValidationStatus;
		import org.etsi.osl.model.VxFMetadata;
		import org.etsi.osl.model.VxFOnBoardedDescriptor;
		import org.etsi.osl.model.nfv.CompositeExperimentOnBoardDescriptor;
		import org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor;
		import org.etsi.osl.model.nfv.DeploymentDescriptor;
		import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;
		import org.etsi.osl.model.nfv.DeploymentDescriptorVxFPlacement;
		import org.etsi.osl.model.nfv.ExperimentMetadata;
		import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
		import org.etsi.osl.model.nfv.IMANOCommunicationStatus;
		import org.etsi.osl.model.nfv.OnBoardingStatus;
		import org.etsi.osl.model.nfv.PortalUser;
		import org.etsi.osl.model.nfv.VFImage;
		import org.etsi.osl.model.nfv.ValidationJob;
		import org.etsi.osl.model.nfv.ValidationStatus;
		import org.etsi.osl.model.nfv.VxFMetadata;
		import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;
		import org.etsi.osl.tmf.common.model.Notification;
		import org.etsi.osl.tmf.common.model.service.Characteristic;
		import org.etsi.osl.tmf.common.model.service.Note;