Skip to content
Snippets Groups Projects
Commit 03b3aa8e authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-6641-Vereinheitlichung-Postfach-Typbezeichnung-BayernId

parents 7108f200 a6764926
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId> <artifactId>alfa</artifactId>
<version>2.13.0-SNAPSHOT</version> <version>2.14.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId> <artifactId>alfa</artifactId>
<version>2.13.0-SNAPSHOT</version> <version>2.14.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfa-server</artifactId> <artifactId>alfa-server</artifactId>
......
...@@ -24,16 +24,14 @@ ...@@ -24,16 +24,14 @@
unter der Lizenz sind dem Lizenztext zu entnehmen. unter der Lizenz sind dem Lizenztext zu entnehmen.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId> <artifactId>alfa</artifactId>
<version>2.13.0-SNAPSHOT</version> <version>2.14.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfa-service</artifactId> <artifactId>alfa-service</artifactId>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<parent> <parent>
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId> <artifactId>alfa</artifactId>
<version>2.13.0-SNAPSHOT</version> <version>2.14.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfa-xdomea</artifactId> <artifactId>alfa-xdomea</artifactId>
......
...@@ -24,9 +24,7 @@ ...@@ -24,9 +24,7 @@
unter der Lizenz sind dem Lizenztext zu entnehmen. unter der Lizenz sind dem Lizenztext zu entnehmen.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <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">
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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
...@@ -37,7 +35,7 @@ ...@@ -37,7 +35,7 @@
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId> <artifactId>alfa</artifactId>
<version>2.13.0-SNAPSHOT</version> <version>2.14.0-SNAPSHOT</version>
<name>Alfa Parent</name> <name>Alfa Parent</name>
<packaging>pom</packaging> <packaging>pom</packaging>
...@@ -52,11 +50,11 @@ ...@@ -52,11 +50,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<vorgang-manager.version>2.8.0</vorgang-manager.version> <vorgang-manager.version>2.13.0</vorgang-manager.version>
<nachrichten-manager.version>2.7.0</nachrichten-manager.version> <nachrichten-manager.version>2.11.0</nachrichten-manager.version>
<ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version> <ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version>
<user-manager.version>2.2.0</user-manager.version> <user-manager.version>2.8.0</user-manager.version>
<zufi-manager.version>1.2.0</zufi-manager.version> <zufi-manager.version>1.3.0</zufi-manager.version>
<spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version> <spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version>
<!-- TODO: die Version über ozgcloud-common ziehen --> <!-- TODO: die Version über ozgcloud-common ziehen -->
......
...@@ -50,7 +50,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} ...@@ -50,7 +50,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}} {{- end -}}
{{- define "app.grpc_client_vorgang_manager_address" -}} {{- define "app.grpc_client_vorgang_manager_address" -}}
{{ printf "%s.%s:9090" ( coalesce .Values.vorgangManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{ printf "dns:///%s.%s:9090" ( coalesce .Values.vorgangManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end -}} {{- end -}}
{{- define "app.grpc_client_user-manager_address" -}} {{- define "app.grpc_client_user-manager_address" -}}
......
...@@ -48,7 +48,7 @@ tests: ...@@ -48,7 +48,7 @@ tests:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: grpc_client_vorgang-manager_address name: grpc_client_vorgang-manager_address
value: vorgang-manager.sh-helm-test:9090 value: dns:///vorgang-manager.sh-helm-test:9090
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
......
...@@ -46,4 +46,4 @@ tests: ...@@ -46,4 +46,4 @@ tests:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: grpc_client_vorgang-manager_address name: grpc_client_vorgang-manager_address
value: my-test-vorgang-manager-name.sh-helm-test:9090 value: dns:///my-test-vorgang-manager-name.sh-helm-test:9090
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment