diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..1e0b518b641a4e2e5496fc256e83fa9021f61372 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,36 @@ +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 + diff --git a/ci_settings.xml b/ci_settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..69ad06ed6c63795d191555afde6ea2d1da4e133d --- /dev/null +++ b/ci_settings.xml @@ -0,0 +1,16 @@ +<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> diff --git a/pom.xml b/pom.xml index f9f92e8f1740d50a93136a63454f1f0902724962..b26a82fdf37c80b04d1fc1be183ae05317859e8a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,17 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" 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> - - <groupId>org.etsi.osl.sol005nbi</groupId> - <artifactId>org.etsi.osl.sol005nbi.osm10</artifactId> - <version>1.2.0-SNAPSHOT</version> - <packaging>jar</packaging> + 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.0.0</version> + <relativePath>../org.etsi.osl.main</relativePath> + </parent> + + <packaging>jar</packaging> - <name>org.etsi.osl.sol005nbi.osm10</name> + <artifactId>org.etsi.osl.sol005nbi.osm10</artifactId> + <name>org.etsi.osl.sol005nbi.osm10</name> <organization> <name>openslice.io</name> @@ -27,7 +31,7 @@ </license> </licenses> -<pluginRepositories> + <pluginRepositories> <pluginRepository> <id>opendaylight-release</id> <name>opendaylight-release</name> @@ -41,8 +45,11 @@ </pluginRepositories> - <repositories> + <repository> + <id>gitlab-maven</id> + <url>https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven</url> + </repository> <repository> <id>opendaylight-release</id> <name>opendaylight-release</name> @@ -54,6 +61,16 @@ <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</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> <properties> @@ -144,9 +161,9 @@ <!-- Dependencies for OSMClient START --> <dependency> - <groupId>org.etsi.osl.sol005nbi</groupId> + <groupId>org.etsi.osl</groupId> <artifactId>org.etsi.osl.sol005nbi.osm</artifactId> - <version>${project.version}</version> + <version>${org.etsi.osl.sol005nbi.osm.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId>