diff --git a/Jenkinsfile b/Jenkinsfile index 6f8d5394698ea310d65a3bf3609b081a23a58bee..1b8dc8b1a49a9cae77b1656a4f596d1ade211c09 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -232,7 +232,7 @@ 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 + 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 diff --git a/common/pom.xml b/common/pom.xml index 5ff67c52753abe4541684d49fe94e070b1ff7cf7..61710c774ee927d3e6196308f4959be0472ee7c3 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.12.0-SNAPSHOT</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 b8ad58632830074aa647220c59e594324caa6f36..d48c2789e64d88a1f33f9609107b59efc91a1435 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.12.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> diff --git a/formcycle-adapter/formcycle-adapter-interface/pom.xml b/formcycle-adapter/formcycle-adapter-interface/pom.xml index ce9b16cf89e288b9a3c5b5cae23bd90a55f1c893..5abd6f5c55ab7e76fba351c47fcb6771472316cd 100644 --- a/formcycle-adapter/formcycle-adapter-interface/pom.xml +++ b/formcycle-adapter/formcycle-adapter-interface/pom.xml @@ -36,10 +36,10 @@ <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.12.0-SNAPSHOT</version> <properties> - <pluto.version>1.11.0-SNAPSHOT</pluto.version> + <pluto.version>1.11.0</pluto.version> <java.version>17</java.version> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> diff --git a/formcycle-adapter/pom.xml b/formcycle-adapter/pom.xml index f65b15c4cf529ff8e00ad047c90ef4bd3c9563ca..ae12b55b379135e1309e0f9ff36d503ede338b64 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.12.0-SNAPSHOT</version> </parent> <artifactId>formcycle-adapter</artifactId> diff --git a/formsolutions-adapter/pom.xml b/formsolutions-adapter/pom.xml index e5dab7067df71b843ecc372fff24df0c519b3007..1a49fd0e89eca8cfd79a436f4105193a8dee04a9 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.12.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> diff --git a/forwarder/pom.xml b/forwarder/pom.xml index c700166310f8bdae05fd41f7da3b783063803b11..274cebba76c2cb8644adc439eb3dbc05995eb381 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.12.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml index 2e2324b142596ed850986809b457ab5b3784b09d..eb73d9d386ef32c3d014864765ab7df974abe488 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.12.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> diff --git a/pom.xml b/pom.xml index 380406f52b9ac5498dc93fc8ed0c550389d37527..d6c21e33619a9716082d235f54b0956f71fead0b 100644 --- a/pom.xml +++ b/pom.xml @@ -31,13 +31,13 @@ <parent> <groupId>de.itvsh.kop.common</groupId> <artifactId>kop-common-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.1</version> <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>de.itvsh.kop.eingangsadapter</groupId> <artifactId>parent</artifactId> - <version>1.11.0-SNAPSHOT</version> + <version>1.12.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Eingangs Adapter - Parent</name> diff --git a/router/pom.xml b/router/pom.xml index 2ab6d7b2d930744f2f89e930c90278d924b787d8..58f70937570ccd8b893d1dcc53553436d68fda28 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.12.0-SNAPSHOT</version> <relativePath>../</relativePath> </parent> diff --git a/semantik-adapter/pom.xml b/semantik-adapter/pom.xml index 87830d62e27f1888a091855d3f4b6eaab785d957..7fa39439270391dd2a238b1c0c2a428a091787ea 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.12.0-SNAPSHOT</version> </parent> <artifactId>semantik-adapter</artifactId> diff --git a/xta-adapter/pom.xml b/xta-adapter/pom.xml index 1ff8141f2256beaf9dc4b4b2b05364714992fbe5..2d9c5027fcd1e64001c77f363978a86b65f3d2fe 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.12.0-SNAPSHOT</version> </parent> <artifactId>xta-adapter</artifactId> <name>Eingangs Adapter - XTA</name>