From 162d87dec7599a88e10dac8a2ba3a26284085751 Mon Sep 17 00:00:00 2001
From: Nic12345678 <162564162+Nic12345678@users.noreply.github.com>
Date: Tue, 10 Dec 2024 11:35:29 +0100
Subject: [PATCH 1/3] =?UTF-8?q?Service=20ist=20Teil=20von=20Docker-Compose?=
 =?UTF-8?q?=20und=20Port=20f=C3=BCr=20http-client=20korrigiert=20zu=208207?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stack/.env                                    |  6 +++++-
 stack/docker-compose.yml                      | 19 +++++++++++++++++++
 .../http.request/http-client.env.json         |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/stack/.env b/stack/.env
index c5d465d8c..6a0cf81cc 100644
--- a/stack/.env
+++ b/stack/.env
@@ -45,4 +45,8 @@ WLS_BASISDATEN_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/
 
 WLS_MONITORING_SERVICE_PROFILE=local,db-oracle
 WLS_MONITORING_SERVICE_DB_URL=jdbc:oracle:thin:@//wls-db-oracle:1521/XEPDB1
-WLS_MONITORING_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect
\ No newline at end of file
+WLS_MONITORING_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect
+
+WLS_WAHLVORSTAND_SERVICE_PROFILE=local,db-oracle
+WLS_WAHLVORSTAND_SERVICE_DB_URL=jdbc:oracle:thin:@//wls-db-oracle:1521/XEPDB1
+WLS_WAHLVORSTAND_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect
\ No newline at end of file
diff --git a/stack/docker-compose.yml b/stack/docker-compose.yml
index a5e671650..abdf37b3e 100644
--- a/stack/docker-compose.yml
+++ b/stack/docker-compose.yml
@@ -135,6 +135,25 @@ services:
       - services
       - keycloak
 
+  wls-wahlvorstand-service:
+    container_name: wls-wahlvorstand-service
+    image: ghcr.io/it-at-m/wahllokalsystem-wls-wahlvorstand-service:latest
+    depends_on:
+      - wls-db-oracle
+    env_file:
+      - .env
+    environment:
+      - SPRING_PROFILES_ACTIVE=${WLS_WAHLVORSTAND_SERVICE_PROFILE}
+      - SPRING_DATASOURCE_URL=${WLS_WAHLVORSTAND_SERVICE_DB_URL}
+      - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=${WLS_WAHLVORSTAND_SERVICE_KEYCLOAK_URL}/certs
+      - SECURITY_OAUTH2_RESOURCE_USER-INFO-URI=${WLS_WAHLVORSTAND_SERVICE_KEYCLOAK_URL}/userinfo
+      - SERVER_PORT=8080
+    ports:
+      - 8207:8080
+    networks:
+      - services
+      - keycloak
+
   wls-eai-service:
     container_name: wls-eai-service
     image: ghcr.io/it-at-m/wahllokalsystem-wls-eai-service:latest
diff --git a/wls-wahlvorstand-service/src/test/resources/http.request/http-client.env.json b/wls-wahlvorstand-service/src/test/resources/http.request/http-client.env.json
index d61747485..fe3b55f29 100644
--- a/wls-wahlvorstand-service/src/test/resources/http.request/http-client.env.json
+++ b/wls-wahlvorstand-service/src/test/resources/http.request/http-client.env.json
@@ -2,7 +2,7 @@
   "docker": {
     "token_type": "",
     "auth_token": "",
-    "WLS_WAHLVORSTAND_SERVICE_URL": "http://localhost:8201",
+    "WLS_WAHLVORSTAND_SERVICE_URL": "http://localhost:8207",
     "SSO_URL": "http://kubernetes.docker.internal:8100"
   },
   "nonDocker": {

From 2316faac6b8de26936a4bc5535911a5ee2371026 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:41:44 +0000
Subject: [PATCH 2/3] [maven-release-plugin] prepare release
 wls-wahlvorstand-service/0.1.0

---
 wls-wahlvorstand-service/pom.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/wls-wahlvorstand-service/pom.xml b/wls-wahlvorstand-service/pom.xml
index fce25f595..ccb6a0f40 100644
--- a/wls-wahlvorstand-service/pom.xml
+++ b/wls-wahlvorstand-service/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>de.muenchen.oss.wahllokalsystem</groupId>
     <artifactId>wls-wahlvorstand-service</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0</version>
     <name>wls_wahlvorstand_service</name>
 
     <properties>
@@ -301,7 +299,7 @@
         <url>https://github.com/it-at-m/Wahllokalsystem</url>
         <connection>scm:git:https://github.com/it-at-m/Wahllokalsystem.git</connection>
         <developerConnection>scm:git:https://github.com/it-at-m/Wahllokalsystem.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>wls-wahlvorstand-service/0.1.0</tag>
     </scm>
 
 
@@ -556,8 +554,8 @@
                         <eclipse>
                             <file>itm-java-codeformat/java_codestyle_formatter.xml</file>
                         </eclipse>
-                        <trimTrailingWhitespace/>
-                        <endWithNewline/>
+                        <trimTrailingWhitespace />
+                        <endWithNewline />
                     </java>
                 </configuration>
                 <executions>

From 19b5b2ce4c60423eb7f72a60e90779551dbde864 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:41:45 +0000
Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development
 iteration

---
 wls-wahlvorstand-service/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wls-wahlvorstand-service/pom.xml b/wls-wahlvorstand-service/pom.xml
index ccb6a0f40..36d8c105b 100644
--- a/wls-wahlvorstand-service/pom.xml
+++ b/wls-wahlvorstand-service/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>de.muenchen.oss.wahllokalsystem</groupId>
     <artifactId>wls-wahlvorstand-service</artifactId>
-    <version>0.1.0</version>
+    <version>0.2.0-SNAPSHOT</version>
     <name>wls_wahlvorstand_service</name>
 
     <properties>
@@ -299,7 +299,7 @@
         <url>https://github.com/it-at-m/Wahllokalsystem</url>
         <connection>scm:git:https://github.com/it-at-m/Wahllokalsystem.git</connection>
         <developerConnection>scm:git:https://github.com/it-at-m/Wahllokalsystem.git</developerConnection>
-        <tag>wls-wahlvorstand-service/0.1.0</tag>
+        <tag>HEAD</tag>
     </scm>