diff --git a/alfa-client/pom.xml b/alfa-client/pom.xml
index ff5f7dbcd74d4b0da799600761d92b4c17701aed..749de0ce431fc3265f961096d0e6be52b076f714 100644
--- a/alfa-client/pom.xml
+++ b/alfa-client/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/alfa-server/pom.xml b/alfa-server/pom.xml
index 2c47d00f114c27eecc621ded19a977e0fd197d84..16ad87f6af7d8e386c0783420b1564e44bc56673 100644
--- a/alfa-server/pom.xml
+++ b/alfa-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-server</artifactId>
diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index e252a956e8b46e0e628b324265608759ecf24d0d..8e01183819421bd9d69fcba0427b4f807237e119 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-service</artifactId>
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java
index 9c79a7378ad5930330cb812b245510d9b03cbcfe..243449c554994202a0c93bf761cf01d23279b561 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadService.java
@@ -79,11 +79,12 @@ class LandesnetzInfoReadService {
}
Set<String> readFile(InputStream fileInputStream) {
- var fileScanner = new Scanner(fileInputStream, StandardCharsets.UTF_8);
- while (fileScanner.hasNextLine()) {
- String line = fileScanner.nextLine();
- if (isStartOfSection(line)) {
- return readSection(fileScanner);
+ try(var fileScanner = new Scanner(fileInputStream, StandardCharsets.UTF_8)){
+ while (fileScanner.hasNextLine()) {
+ var line = fileScanner.nextLine();
+ if (isStartOfSection(line)) {
+ return readSection(fileScanner);
+ }
}
}
return Collections.emptySet();
@@ -94,9 +95,9 @@ class LandesnetzInfoReadService {
}
Set<String> readSection(Scanner sectionScanner) {
- Set<String> result = new HashSet<>();
+ var result = new HashSet<String>();
while (sectionScanner.hasNextLine()) {
- String line = sectionScanner.nextLine();
+ var line = sectionScanner.nextLine();
if (isEndOfSection(line)) {
return Collections.unmodifiableSet(result);
}
diff --git a/alfa-service/src/main/resources/files/mailertable.txt b/alfa-service/src/main/resources/files/mailertable.txt
index 85c9ebe4ad79ae90972977788a46ff3237f5f1b9..7358aae2d522f9792ba60289e7dde9e75e56556b 100644
--- a/alfa-service/src/main/resources/files/mailertable.txt
+++ b/alfa-service/src/main/resources/files/mailertable.txt
@@ -26,6 +26,7 @@ vhs-servicezentrum.berlin.de esmtp:[mail.berlin.testa-de.net]
#################################################################################
mgm-cp.com esmtp:[mx.landsh.doi-de.net]
mgm-tp.com esmtp:[mx.landsh.doi-de.net]
+dataport.de esmtp:[mx.landsh.doi-de.net]
#
############################## Ende Schleswig-Holstein ###########################
#
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java
index 9abac84b05d5495e1f22a601e4f6cf7c6eefe2c5..c046b79d7efb55a2be2afe95ef8d184e614ac310 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java
@@ -187,7 +187,7 @@ class LandesnetzInfoReadServiceTest {
void shouldReadFileIfExist() {
var parsedDomainList = service.readFile(TEXT_INPUT_STREAM);
- assertThat(parsedDomainList).hasSize(2);
+ assertThat(parsedDomainList).hasSize(3);
}
@Test
diff --git a/alfa-xdomea/pom.xml b/alfa-xdomea/pom.xml
index f7daf6c8a81e34dd5a3469225c0ad03aa8ce3ec6..8f5d2c08a3647c90e5905617eed3eee3778e4a3a 100644
--- a/alfa-xdomea/pom.xml
+++ b/alfa-xdomea/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-xdomea</artifactId>
diff --git a/pom.xml b/pom.xml
index 09c0fdf8b3f4cfc61ba2b6eca6180082bbe595f6..b782bc03dbaaa38dffec4294e07a05e255fdba32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,12 +31,12 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0</version>
</parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>Alfa Parent</name>
<packaging>pom</packaging>
@@ -51,9 +51,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version>
- <ozgcloud-common-pdf.version>3.0.0-SNAPSHOT</ozgcloud-common-pdf.version>
- <user-manager.version>2.0.0-SNAPSHOT</user-manager.version>
+ <vorgang-manager.version>2.0.0</vorgang-manager.version>
+ <ozgcloud-common-pdf.version>3.0.0</ozgcloud-common-pdf.version>
+ <user-manager.version>2.0.0</user-manager.version>
<!-- TODO: die Version über ozgcloud-common ziehen -->
<jjwt.version>0.11.5</jjwt.version>
diff --git a/src/main/helm/questions.yml b/src/main/helm/questions.yml
deleted file mode 100644
index 253a9c80f58edc2b3acb4b712f3264119a00a1c2..0000000000000000000000000000000000000000
--- a/src/main/helm/questions.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
-# Ministerpräsidenten des Landes Schleswig-Holstein
-# Staatskanzlei
-# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
-#
-# Lizenziert unter der EUPL, Version 1.2 oder - sobald
-# diese von der Europäischen Kommission genehmigt wurden -
-# Folgeversionen der EUPL ("Lizenz");
-# Sie dürfen dieses Werk ausschließlich gemäß
-# dieser Lizenz nutzen.
-# Eine Kopie der Lizenz finden Sie hier:
-#
-# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
-#
-# Sofern nicht durch anwendbare Rechtsvorschriften
-# gefordert oder in schriftlicher Form vereinbart, wird
-# die unter der Lizenz verbreitete Software "so wie sie
-# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
-# ausdrücklich oder stillschweigend - verbreitet.
-# Die sprachspezifischen Genehmigungen und Beschränkungen
-# unter der Lizenz sind dem Lizenztext zu entnehmen.
-#
-
-questions:
- - variable: image.tag
- default: latest
- type: string
- label: The deployed version tag
- group: "Container"
- - variable: replicaCount
- group: "Container"
- type: string
- default: "2"
- label: "Deployment Replica count"
- - variable: env.overrideSpringProfiles
- type: string
- label: "Override Spring boot profile"
- group: "Container"
- - variable: ozgcloud.bundesland
- group: "OZGCLOUD"
- label: Bundesland
- type: string
- required: true
- - variable: ozgcloud.bezeichner
- group: "OZGCLOUD"
- label: "Bezeichner"
- type: string
- required: true
- - variable: ozgcloud.environment
- group: "OZGCLOUD"
- label: "Environment"
- type: string
- required: true
- - variable: vorgangManagerName
- group: "Other"
- type: string
- default: "vorgang-manager"
- label: "Name of the vorgang-manager deployment in the namespace"
- - variable: sso.role_einheitlicher_ansprechpartner
- group: "Other"
- type: boolean
- default: false
- label: "Add role for EA"
- - variable: sso.displayName
- group: "Other"
- type: string
- default: ""
- label: "The custom display name to write on top of the login page. Defaults to 'Realm für <app.name>', Works on initial Install only."
- - variable: sso.apiPassword
- group: "Other"
- type: string
- default: " "
- label: "SSO API User Password"
- - variable: useKeycloakNamespace
- group: "Other"
- type: boolean
- default: false
- label: "Use keycloak namespace for keycloak templates"
\ No newline at end of file