From ebadc06e777c3b5223c90475758f05225ecb2448 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Fri, 24 Nov 2023 14:10:06 +0100 Subject: [PATCH] start development hf 1.17.1 * integration of hf 1.16.3 --- bescheid-manager/pom.xml | 4 ++-- mail-service/pom.xml | 2 +- notification-manager/pom.xml | 2 +- pluto-command/pom.xml | 2 +- pluto-common/pom.xml | 2 +- pluto-interface/pom.xml | 2 +- pluto-server/pom.xml | 28 ++++++++++++++-------------- pluto-utils/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml index e9976ebd9..38c37fb33 100644 --- a/bescheid-manager/pom.xml +++ b/bescheid-manager/pom.xml @@ -12,10 +12,10 @@ <groupId>de.ozgcloud.bescheid</groupId> <artifactId>bescheid-manager</artifactId> <name>OZG-Cloud Bescheid Manager</name> - <version>1.3.0</version> + <version>1.3.1-SNAPSHOT</version> <properties> - <pluto.version>1.17.0</pluto.version> + <pluto.version>1.17.1-SNAPSHOT</pluto.version> </properties> <dependencies> diff --git a/mail-service/pom.xml b/mail-service/pom.xml index 9c927973c..08e634624 100644 --- a/mail-service/pom.xml +++ b/mail-service/pom.xml @@ -36,7 +36,7 @@ <groupId>de.itvsh.ozg.mail</groupId> <artifactId>mail-service</artifactId> - <version>1.17.0</version> + <version>1.17.1-SNAPSHOT</version> <name>KOP Vorgang Manager Mail Service</name> <properties> diff --git a/notification-manager/pom.xml b/notification-manager/pom.xml index 3492d5282..6d775f584 100644 --- a/notification-manager/pom.xml +++ b/notification-manager/pom.xml @@ -36,7 +36,7 @@ <groupId>de.itvsh.kop.notification</groupId> <artifactId>notification-manager</artifactId> <name>KOP Notification Manager</name> - <version>1.17.0</version> + <version>1.17.1-SNAPSHOT</version> <properties> <user-manager-interface.version>1.1.0</user-manager-interface.version> diff --git a/pluto-command/pom.xml b/pluto-command/pom.xml index 95d6e149d..9e65ed57a 100644 --- a/pluto-command/pom.xml +++ b/pluto-command/pom.xml @@ -11,7 +11,7 @@ <groupId>de.itvsh.ozg.pluto</groupId> <artifactId>pluto-command</artifactId> <name>Command Manager</name> - <version>1.17.0</version> + <version>1.17.1-SNAPSHOT</version> <properties> <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version> diff --git a/pluto-common/pom.xml b/pluto-common/pom.xml index 8af2557a7..702376b31 100644 --- a/pluto-common/pom.xml +++ b/pluto-common/pom.xml @@ -12,7 +12,7 @@ <groupId>de.itvsh.ozg.pluto</groupId> <artifactId>pluto-common</artifactId> - <version>1.17.0</version> + <version>1.17.1-SNAPSHOT</version> <name>OZG-Cloud Vorgang Manager Common</name> diff --git a/pluto-interface/pom.xml b/pluto-interface/pom.xml index 9d1947050..fafe4efb0 100644 --- a/pluto-interface/pom.xml +++ b/pluto-interface/pom.xml @@ -36,7 +36,7 @@ <groupId>de.itvsh.ozg.pluto</groupId> <artifactId>pluto-interface</artifactId> - <version>1.17.0</version> + <version>1.17.1-SNAPSHOT</version> <name>KOP Vorgang Manager gRPC Interface</name> <description>Interface (gRPC) for Pluto Server</description> diff --git a/pluto-server/pom.xml b/pluto-server/pom.xml index 4fcc8c071..867f31fb8 100644 --- a/pluto-server/pom.xml +++ b/pluto-server/pom.xml @@ -24,19 +24,21 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>de.itvsh.kop.common</groupId> <artifactId>kop-common-parent</artifactId> <version>2.3.1</version> - <relativePath/> + <relativePath /> </parent> <groupId>de.itvsh.ozg.pluto</groupId> <artifactId>pluto-server</artifactId> - <version>1.17.0</version> + <version>1.17.1-SNAPSHOT</version> <name>KOP Vorgang Manager (Pluto) Server</name> <description>Server Implementierung des VorgangManagers (Pluto)</description> @@ -49,9 +51,9 @@ <kop.license.version>1.3.0</kop.license.version> <kop.zufi.api.version>0.5.0</kop.zufi.api.version> - + <user-manager-interface.version>1.11.0</user-manager-interface.version> - <bescheid-manager.version>1.3.0</bescheid-manager.version> + <bescheid-manager.version>1.3.1-SNAPSHOT</bescheid-manager.version> <processor-manager.version>0.1.0</processor-manager.version> <ozgcloud-starter.version>0.3.0</ozgcloud-starter.version> @@ -154,7 +156,7 @@ <artifactId>spring-webmvc</artifactId> </dependency> - + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> @@ -256,7 +258,7 @@ <type>test-jar</type> <scope>test</scope> </dependency> - + <dependency> <groupId>de.ozgcloud.api-lib</groupId> <artifactId>ozg-cloud-spring-boot-starter</artifactId> @@ -342,19 +344,17 @@ <configuration> <mainClass>de.itvsh.ozg.pluto.PlutoServerApplication</mainClass> <image> - <!-- cann be removed when common-lib > 2.3.2--> - <builder>paketobuildpacks/builder-jammy-base</builder> - <env> - <BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"> </BPE_DELIM_JAVA_TOOL_OPTIONS> - <BPE_APPEND_JAVA_TOOL_OPTIONS>-Dfile.encoding=UTF-8</BPE_APPEND_JAVA_TOOL_OPTIONS> - </env> + <!-- cann be removed when common-lib > 2.3.2--> <builder>paketobuildpacks/builder-jammy-base</builder> + <env> + <BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"> </BPE_DELIM_JAVA_TOOL_OPTIONS> + <BPE_APPEND_JAVA_TOOL_OPTIONS>-Dfile.encoding=UTF-8</BPE_APPEND_JAVA_TOOL_OPTIONS> + </env> </image> <profiles> <profile>local</profile> <profile>a12proc</profile> </profiles> - </image> </configuration> </plugin> diff --git a/pluto-utils/pom.xml b/pluto-utils/pom.xml index f9150dc10..a7a40ab7e 100644 --- a/pluto-utils/pom.xml +++ b/pluto-utils/pom.xml @@ -37,7 +37,7 @@ <groupId>de.itvsh.ozg.pluto</groupId> <artifactId>pluto-utils</artifactId> <name>KOP Vorgang Manager (Pluto) Utils</name> - <version>1.17.0</version> + <version>1.17.1-SNAPSHOT</version> <properties> <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version> diff --git a/pom.xml b/pom.xml index c1b5535e5..072150e89 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.itvsh.ozg</groupId> <artifactId>pluto</artifactId> - <version>1.17.0</version> + <version>1.17.1-SNAPSHOT</version> <name>Pluto Parent</name> <packaging>pom</packaging> -- GitLab