From 7747fc76cef6d0dc106a29488074c9627d3c8ad7 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 10 Jul 2023 14:16:27 +0200
Subject: [PATCH] release 1.10.3 - manual build
---
Jenkinsfile | 30 +++++++++----------
common/pom.xml | 2 +-
.../formcycle-adapter-impl/pom.xml | 4 +--
.../formcycle-adapter-interface/pom.xml | 2 +-
formcycle-adapter/pom.xml | 2 +-
formsolutions-adapter/pom.xml | 2 +-
forwarder/pom.xml | 2 +-
intelliform-adapter/pom.xml | 2 +-
pom.xml | 2 +-
router/pom.xml | 2 +-
semantik-adapter/pom.xml | 2 +-
xta-adapter/pom.xml | 2 +-
12 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f39af0771..4859fed0b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -84,7 +84,7 @@ pipeline {
when {
anyOf {
branch 'master'
- branch 'release'
+# branch 'release'
}
}
steps {
@@ -114,12 +114,12 @@ pipeline {
tagAndPushDockerImage('formcycle-adapter', 'snapshot-latest')
tagAndPushDockerImage('xta-adapter', 'snapshot-latest')
}
- else if (env.BRANCH_NAME == 'release') {
- tagAndPushDockerImage('intelliform-adapter', 'latest')
- tagAndPushDockerImage('formsolutions-adapter', 'latest')
- tagAndPushDockerImage('formcycle-adapter', 'latest')
- tagAndPushDockerImage('xta-adapter', 'latest')
- }
+# else if (env.BRANCH_NAME == 'release') {
+# tagAndPushDockerImage('intelliform-adapter', 'latest')
+# tagAndPushDockerImage('formsolutions-adapter', 'latest')
+# tagAndPushDockerImage('formcycle-adapter', 'latest')
+# tagAndPushDockerImage('xta-adapter', 'latest')
+# }
}
}
}
@@ -180,7 +180,7 @@ pipeline {
}
stage('Trigger Test rollout') {
when {
- branch 'release'
+# branch 'release'
}
steps {
@@ -200,7 +200,7 @@ pipeline {
when {
anyOf {
branch 'master'
- branch 'release'
+# branch 'release'
}
}
steps {
@@ -231,12 +231,12 @@ pipeline {
Void deployHelmChart(String helmChartName, String helmChartVersion) {
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){
- if (env.BRANCH_NAME == 'release') {
- result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@'''+helmChartName+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true
- }
- else {
+ # if (env.BRANCH_NAME == 'release') {
+ # result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F #file=@'''+helmChartName+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true
+ # }
+ # else {
result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@'''+helmChartName+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true
- }
+ # }
if (result != '') {
error(result)
@@ -442,4 +442,4 @@ Boolean isSameVersion(List versions, String expectedVersion) {
}
return true
-}
\ No newline at end of file
+}
diff --git a/common/pom.xml b/common/pom.xml
index 5ff67c527..9aaaf2af7 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../</relativePath>
</parent>
<artifactId>common</artifactId>
diff --git a/formcycle-adapter/formcycle-adapter-impl/pom.xml b/formcycle-adapter/formcycle-adapter-impl/pom.xml
index ccda4931e..0f68bea99 100644
--- a/formcycle-adapter/formcycle-adapter-impl/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-impl/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>formcycle-adapter</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../</relativePath>
</parent>
@@ -37,7 +37,7 @@
<name>EM - Formcycle Adapter - Implementation</name>
<properties>
- <formcycle-interface.version>1.11.0-SNAPSHOT</formcycle-interface.version>
+ <formcycle-interface.version>${project.version}</formcycle-interface.version>
</properties>
<dependencies>
diff --git a/formcycle-adapter/formcycle-adapter-interface/pom.xml b/formcycle-adapter/formcycle-adapter-interface/pom.xml
index ce9b16cf8..c2e08669d 100644
--- a/formcycle-adapter/formcycle-adapter-interface/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-interface/pom.xml
@@ -36,7 +36,7 @@
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>formcycle-adapter-interface</artifactId>
<name>EM - Formcycle Adapter - Interface</name>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
<properties>
<pluto.version>1.11.0-SNAPSHOT</pluto.version>
diff --git a/formcycle-adapter/pom.xml b/formcycle-adapter/pom.xml
index f65b15c4c..281c7d77c 100644
--- a/formcycle-adapter/pom.xml
+++ b/formcycle-adapter/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>formcycle-adapter</artifactId>
diff --git a/formsolutions-adapter/pom.xml b/formsolutions-adapter/pom.xml
index e5dab7067..6b5e2cd36 100644
--- a/formsolutions-adapter/pom.xml
+++ b/formsolutions-adapter/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../</relativePath>
</parent>
diff --git a/forwarder/pom.xml b/forwarder/pom.xml
index c70016631..4c271e75c 100644
--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../</relativePath>
</parent>
diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml
index 2e2324b14..e8c450e15 100644
--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 380406f52..500151282 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
<packaging>pom</packaging>
<name>Eingangs Adapter - Parent</name>
diff --git a/router/pom.xml b/router/pom.xml
index 2ab6d7b2d..04b5f2bf7 100644
--- a/router/pom.xml
+++ b/router/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../</relativePath>
</parent>
diff --git a/semantik-adapter/pom.xml b/semantik-adapter/pom.xml
index 87830d62e..d765cd4f3 100644
--- a/semantik-adapter/pom.xml
+++ b/semantik-adapter/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>semantik-adapter</artifactId>
diff --git a/xta-adapter/pom.xml b/xta-adapter/pom.xml
index 1ff8141f2..2e035d26d 100644
--- a/xta-adapter/pom.xml
+++ b/xta-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>xta-adapter</artifactId>
<name>Eingangs Adapter - XTA</name>
--
GitLab