diff --git a/pluto-server/pom.xml b/pluto-server/pom.xml index 9d6ba91b4db305fa149c84edbd2419586a4c18e7..897c5588ca87da79bf2f53622f2811f78ffe3918 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 b6ba7993ca7eeadf3360eaa66bdcb47c2e6c4330..f42bc178f5f93b0943054a13334f1f7122ffdc23 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 625bd2e2e76aec5d29a9fc8f4c29cb1514d9e7c5..10f74d4886a3672bb1f8b229291d671a1e37879e 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: