diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 100b059eb714c5674c56feee8b1a004a775363f0..c25c62e020c6a9761d8e3b89b66352c162972d69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,6 @@ push-merge-request-image-gitlab: - mvn deploy -Pgitlab-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - when: manual push-merge-request-image-nexus: stage: publish @@ -85,7 +84,6 @@ push-merge-request-image-nexus: - mvn deploy -Pnexus-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - when: manual push-merge-request-helm-nexus: stage: publish @@ -101,7 +99,6 @@ push-merge-request-helm-nexus: - !reference [.publish-helm-chart, script] rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - when: manual artifacts: paths: - "*.tgz" @@ -117,6 +114,16 @@ push-snapshot-image-gitlab: only: - main +push-develop-image-nexus: + stage: publish + extends: .get-version + script: + - export PRIMARY_IMAGE_TAG=${SNAPSHOT_TAG} + - export IMAGE_TAGS="${NEXUS_IMAGE_PREFIX}:${SNAPSHOT_TAG},${NEXUS_IMAGE_PREFIX}:${SNAPSHOT_TAG}-${CI_COMMIT_SHORT_SHA}" + - mvn deploy -Pnexus-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS + only: + - develop + push-snapshot-image-nexus: stage: publish extends: .get-version diff --git a/pom.xml b/pom.xml index 70d16b1bfb128519561cf091481e5a546f8712c4..09e0c1a4e98f167b4bacf7bd85725c5f05f15c62 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ <properties> <eingang-manager.version>2.21.0-SNAPSHOT</eingang-manager.version> - <intelliform-semantik.version>2.21.0-SNAPSHOT</intelliform-semantik.version> + <intelliform-semantik.version>2.21.0-MR-7-SNAPSHOT</intelliform-semantik.version> <dfoerdermittel-semantik.version>2.21.0-SNAPSHOT</dfoerdermittel-semantik.version> <xta-client-lib.version>0.2.2</xta-client-lib.version> @@ -190,7 +190,6 @@ <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId>