Merge pull request #179 from kit-data-manager/development

PR for v1.5.1

Author: ThomasJejkal

CHANGELOG.md

@@ -12,6 +12,18 @@ Fixed
 
 Security
 
+## [1.5.1] - 2023-12-11
+Fixed
+* Added ElasticConfiguration again to support indexing and search
+
+Security
+* Bump spring-cloud-gateway-mvc to 4.0.8
+* Bump spring-restdocs-mockmvc to 3.0.1
+* Bump nimbus-jose-jwt to 9.37.3
+* Bump dependency-management to 1.1.4
+* Bump spring-messaging to 6.1.1
+* Bump postgresql to 42.7.1
+
 ## [1.5.0] - 2023-12-03
 Changed
 * Upgrade to Spring Boot 3
@@ -184,7 +196,8 @@ Added
 
 - First public version
 
-[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.0...HEAD
+[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.1...HEAD
+[1.5.1]: https://github.com/kit-data-manager/base-repo/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/kit-data-manager/base-repo/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/kit-data-manager/base-repo/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/kit-data-manager/base-repo/compare/v1.2.0...v1.3.0

build.gradle

@@ -1,6 +1,6 @@
 plugins { 
       id 'org.springframework.boot' version '3.1.5'
-    id 'io.spring.dependency-management' version '1.1.0'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'io.freefair.lombok' version '8.4'
     id 'io.freefair.maven-publish-java' version '8.4'
     id 'org.owasp.dependencycheck' version '9.0.2'
@@ -61,14 +61,14 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation 'org.springframework.data:spring-data-elasticsearch:5.2.0'
 
-    implementation "org.springframework:spring-messaging:6.1.0"
+    implementation "org.springframework:spring-messaging:6.1.1"
     implementation "org.springframework.security:spring-security-web:6.2.0"
     implementation "org.springframework.security:spring-security-config:6.2.0"
 
     // cloud support
     implementation "org.springframework.cloud:spring-cloud-starter-config:4.0.4"
     implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.0.3"
-    implementation "org.springframework.cloud:spring-cloud-gateway-mvc:4.0.6"
+    implementation "org.springframework.cloud:spring-cloud-gateway-mvc:4.0.8"
     implementation 'de.codecentric:spring-boot-admin-starter-client:3.1.8'
 
 
@@ -84,7 +84,7 @@ dependencies {
 
     //Keycloak
     // implementation "org.keycloak:keycloak-spring-boot-starter:${keycloakVersion}"
-    implementation "com.nimbusds:nimbus-jose-jwt:9.37"
+    implementation "com.nimbusds:nimbus-jose-jwt:9.37.3"
    // implementation "io.jsonwebtoken:jjwt-api:0.11.5"
     //implementation "io.jsonwebtoken:jjwt-impl:0.11.5"
     //implementation "io.jsonwebtoken:jjwt-jackson:0.11.5"
@@ -99,11 +99,11 @@ dependencies {
     runtimeOnly    "org.apache.httpcomponents:httpclient:4.5.14"
 
      // driver for postgres
-    implementation "org.postgresql:postgresql:42.7.0"
+    implementation "org.postgresql:postgresql:42.7.1"
     //driver for h2
     implementation "com.h2database:h2:2.2.224"
 
-    testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:3.0.0"
+    testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:3.0.1"
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "org.springframework:spring-test"
     testImplementation "org.springframework.security:spring-security-test"

src/main/java/edu/kit/datamanager/repo/configuration/ElasticConfiguration.java

@@ -15,16 +15,26 @@
  */
 package edu.kit.datamanager.repo.configuration;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.elasticsearch.client.ClientConfiguration;
+import org.springframework.data.elasticsearch.client.elc.ElasticsearchClients;
+import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration;
+import org.springframework.data.elasticsearch.support.HttpHeaders;
+
 /**
  *
  * @author jejkal
  */
-//@Configuration
-//@ConditionalOnProperty(prefix = "repo.search", name="enabled", havingValue = "true", matchIfMissing = false)
-public class ElasticConfiguration{// extends ElasticsearchConfiguration {
+@Configuration
+@ConditionalOnProperty(prefix = "repo.search", name="enabled", havingValue = "true", matchIfMissing = false)
+public class ElasticConfiguration extends ElasticsearchConfiguration {
 
 
- /*   @Override
+    @Override
     public ClientConfiguration clientConfiguration() {
         //  HttpHeaders httpHeaders = new HttpHeaders();
         // httpHeaders.add("some-header", "on every request");
@@ -47,5 +57,5 @@ public ClientConfiguration clientConfiguration() {
                         }))
                 .build();
         return clientConfiguration;
-    }*/
+    }
 }