From 1d2df8607f2f4df9a976e751fdff6a56ddfaaa74 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 20 Sep 2023 09:12:29 +0200
Subject: [PATCH] OZG-3930 update elasticsearch configuration
---
pluto-server/pom.xml | 15 ++++++++++-----
.../ozg/pluto/common/search/SearchProperties.java | 3 +++
.../src/main/resources/application-local.yml | 3 +++
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/pluto-server/pom.xml b/pluto-server/pom.xml
index 9d6ba91b4..897c5588c 100644
--- a/pluto-server/pom.xml
+++ b/pluto-server/pom.xml
@@ -67,13 +67,13 @@
<artifactId>pluto-common</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>de.itvsh.ozg.mail</groupId>
<artifactId>mail-service</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>de.itvsh.ozg.pluto</groupId>
<artifactId>pluto-interface</artifactId>
@@ -132,7 +132,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
-
+ <dependency>
+ <!-- TODO: Remove when updated to spring boot 3 (currently used 1.1.6) -->
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.json</artifactId>
+ <version>2.0.1</version>
+ </dependency>
<!--only required for NachrichtenManager -->
<dependency>
@@ -267,13 +272,13 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-test</artifactId>
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/search/SearchProperties.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/search/SearchProperties.java
index b6ba7993c..f42bc178f 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/search/SearchProperties.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/search/SearchProperties.java
@@ -42,4 +42,7 @@ class SearchProperties {
private String index;
private Resource ca;
+ private String address;
+ private String username;
+ private String password;
}
diff --git a/pluto-server/src/main/resources/application-local.yml b/pluto-server/src/main/resources/application-local.yml
index 625bd2e2e..10f74d488 100644
--- a/pluto-server/src/main/resources/application-local.yml
+++ b/pluto-server/src/main/resources/application-local.yml
@@ -56,6 +56,9 @@ kop:
elasticsearch:
initEnabled: true
index: test-index
+ address: localhost:9200
+ username: elastic
+ password: password
notification:
mail-from: ea@ozg-sh.de
usermanager:
--
GitLab