From f6bf1084ff19911644855c45d2c9c9f24688c736 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 3 Apr 2025 15:58:17 +0200
Subject: [PATCH 1/6] OZG-7978 pom: Use develop intelliform-semantik
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 07f32bfb..f714cb5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<properties>
<eingang-manager.version>2.19.0</eingang-manager.version>
- <intelliform-semantik.version>2.19.0</intelliform-semantik.version>
+ <intelliform-semantik.version>2.20.0-MR-6-SNAPSHOT</intelliform-semantik.version>
<dfoerdermittel-semantik.version>2.19.0</dfoerdermittel-semantik.version>
<xta-client-lib.version>0.2.2</xta-client-lib.version>
--
GitLab
From a4712f4c3b75d9191138ccc59ee17d89cacd88b1 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 3 Apr 2025 16:12:05 +0200
Subject: [PATCH 2/6] OZG-7978 pom: Use develop eingang-manager
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f714cb5c..b5948feb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<description>Eingangs Adapter - XTA</description>
<properties>
- <eingang-manager.version>2.19.0</eingang-manager.version>
+ <eingang-manager.version>2.20.0-develop-SNAPSHOT</eingang-manager.version>
<intelliform-semantik.version>2.20.0-MR-6-SNAPSHOT</intelliform-semantik.version>
<dfoerdermittel-semantik.version>2.19.0</dfoerdermittel-semantik.version>
<xta-client-lib.version>0.2.2</xta-client-lib.version>
--
GitLab
From 270b9df1a79644c81332f0e38eaf34c4b8f3ae69 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 10 Apr 2025 16:03:08 +0200
Subject: [PATCH 3/6] pipeline: Add push-develop-image-nexus step
---
.gitlab-ci.yml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 100b059e..95540879 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,6 +117,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
--
GitLab
From 44eab18ca2cdf8999588a3acc9906b4d3bd3bcba Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 24 Apr 2025 16:32:20 +0200
Subject: [PATCH 4/6] pom: Use intelliform-semantik develop
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 676e4d04..605ef99b 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-MR-6-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>
--
GitLab
From 2918bd5ff041e87aab3b9f60dc357ac1fa6eeeb3 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Fri, 25 Apr 2025 09:56:25 +0200
Subject: [PATCH 5/6] pom: Cleanup
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 605ef99b..09e0c1a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
--
GitLab
From 1a7c6476bf78ad257545eca86d4aaab2a320b3f1 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Fri, 25 Apr 2025 09:58:26 +0200
Subject: [PATCH 6/6] pipeline: Push merge request images, automatically
---
.gitlab-ci.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95540879..c25c62e0 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"
--
GitLab