diff --git a/Jenkinsfile b/Jenkinsfile
index f39af07714222e3561ef798cb1edf0e1a511ab82..4859fed0b0d64ee29d7b4736bdf21122207858ba 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 5ff67c52753abe4541684d49fe94e070b1ff7cf7..9aaaf2af77471f1274f71337588f1688a61cdee9 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 ccda4931e93bc9514fcf48fea9d8d468491debd6..0f68bea999e6ec3e29140accb66f809f558b237a 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 ce9b16cf89e288b9a3c5b5cae23bd90a55f1c893..c2e08669da407f325ea81a08a54b288bc9c0902d 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 f65b15c4cf529ff8e00ad047c90ef4bd3c9563ca..281c7d77cbef2ed5f121be2856992470ffcfd974 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 e5dab7067df71b843ecc372fff24df0c519b3007..6b5e2cd360512f1f919aa6a3175787d0165e4375 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 c700166310f8bdae05fd41f7da3b783063803b11..4c271e75c55c0d847249da529fbaa4f7f594c2f8 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 2e2324b142596ed850986809b457ab5b3784b09d..e8c450e15212bcc0e5e5aeba5443f267392912e8 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 380406f52b9ac5498dc93fc8ed0c550389d37527..50015128215008b186f935911a7449d6e76050eb 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 2ab6d7b2d930744f2f89e930c90278d924b787d8..04b5f2bf7cc6e87df2dcfafca91b31fdc9320a0f 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 87830d62e27f1888a091855d3f4b6eaab785d957..d765cd4f30a4fa4718b230a55ddaeb6775c6b063 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 1ff8141f2256beaf9dc4b4b2b05364714992fbe5..2e035d26d07f281ecc04486d6d78d826bf26ab88 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>