diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..49a3cd4cecec0faed1186614939c0bf980f5bcce --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,27 @@ +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: develop + file: + - ci-templates/default.yml + - ci-templates/build_unprotected.yml + rules: + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + +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 1ede39a567e7d03d8baa20d3cd9315f79c5cc51f..c4fbe6bf7dcbf03d80bf65d6b03e0db02255cca6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,6 @@ <groupId>org.etsi.osl</groupId> <artifactId>org.etsi.osl.main</artifactId> <version>1.2.0-SNAPSHOT</version> - <relativePath>../org.etsi.osl.main</relativePath> </parent> <artifactId>org.etsi.osl.model.tmf</artifactId> @@ -19,7 +18,23 @@ <mapstruct.version>1.5.3.Final</mapstruct.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> <!-- Spring Boot BOM -->