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

PR for v1.5.7

Author: ThomasJejkal

.github/workflows/docker-publish.yml

@@ -37,7 +37,7 @@ jobs:
       # registry using the account and password that will publish the packages. 
       # Once published, the packages are scoped to the account defined here.
       - name: Log in to the Container registry
-        uses: docker/login-action@7ca345011ac4304463197fac0e56eab1bc7e6af0
+        uses: docker/login-action@327cd5a69de6c009b9ce71bce8395f28e651bf99
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -49,14 +49,14 @@ jobs:
       # and labels.
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@0de3687b53cd804b63dd87819f7bda043569ce4a
+        uses: docker/metadata-action@8e1d5461f02b7886d3c1a774bfbd873650445aa2
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
       # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
       # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
       - name: Build and push Docker image
-        uses: docker/build-push-action@5e99dacf67635c4f273e532b9266ddb609b3025a
+        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d
         with:
           context: .
           push: true

.github/workflows/gradle.yml

@@ -58,6 +58,6 @@ jobs:
     - name: Build with Gradle (JDK ${{ env.currentBuildVersion }})
       run: ./gradlew clean check jacocoTestReport
     - name: Codecov
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         files: ./build/reports/jacoco/test/jacocoTestReport.xml #optional

CHANGELOG.md

@@ -14,6 +14,37 @@ Fixed
 
 Security
 
+## [1.5.7] - 2025-01-17
+Fixed
+* Fixed ignored Elastic configuration in https://github.com/kit-data-manager/base-repo/pull/367
+
+Security
+* Update plugin io.freefair.lombok to v8.11 by @renovate in https://github.com/kit-data-manager/base-repo/pull/332
+* Update codecov/codecov-action action to v5 by @renovate in https://github.com/kit-data-manager/base-repo/pull/326
+* Update plugin io.freefair.maven-publish-java to v8.11 by @renovate in https://github.com/kit-data-manager/base-repo/pull/331
+* Update dependency org.javers:javers-core to v7.7.0 by @renovate in https://github.com/kit-data-manager/base-repo/pull/335
+* Update dependency org.springframework.restdocs:spring-restdocs-mockmvc to v3.0.3 by @renovate in https://github.com/kit-data-manager/base-repo/pull/338
+* Update plugin io.spring.dependency-management to v1.1.7 by @renovate in https://github.com/kit-data-manager/base-repo/pull/359
+* Update plugin org.asciidoctor.jvm.convert to v4.0.4 by @renovate in https://github.com/kit-data-manager/base-repo/pull/362
+* Update dependency gradle to v8.12 by @renovate in https://github.com/kit-data-manager/base-repo/pull/361
+* Update plugin net.researchgate.release to v3.1.0 by @renovate in https://github.com/kit-data-manager/base-repo/pull/364
+* Update docker/build-push-action digest to 67a2d40 by @renovate in https://github.com/kit-data-manager/base-repo/pull/366
+* Update dependency com.nimbusds:nimbus-jose-jwt to v10 by @renovate in https://github.com/kit-data-manager/base-repo/pull/365
+* Update dependency org.springframework:spring-messaging to v6.2.2 by @renovate in https://github.com/kit-data-manager/base-repo/pull/357
+* Update dependency org.springframework.cloud:spring-cloud-starter-netflix-eureka-client to v4.2.0 by @renovate in https://github.com/kit-data-manager/base-repo/pull/354
+* Update docker/metadata-action digest to 8e1d546 by @renovate in https://github.com/kit-data-manager/base-repo/pull/369
+* Update docker/login-action digest to 327cd5a by @renovate in https://github.com/kit-data-manager/base-repo/pull/368
+* Update dependency de.codecentric:spring-boot-admin-starter-client to v3.4.1 by @renovate in https://github.com/kit-data-manager/base-repo/pull/347
+* Update dependency org.springframework.cloud:spring-cloud-starter-config to v4.2.0 by @renovate in https://github.com/kit-data-manager/base-repo/pull/353
+* Update dependency org.springframework.cloud:spring-cloud-gateway-mvc to v4.2.0 by @renovate in https://github.com/kit-data-manager/base-repo/pull/352
+* Update springDocVersion to v2.8.3 by @renovate in https://github.com/kit-data-manager/base-repo/pull/344
+* Update plugin org.springframework.boot to v3.4.1 by @renovate in https://github.com/kit-data-manager/base-repo/pull/343
+* Update dependency org.springframework.data:spring-data-elasticsearch to v5.4.1 by @renovate in https://github.com/kit-data-manager/base-repo/pull/336
+* Update dependency org.postgresql:postgresql to v42.7.5 by @renovate in https://github.com/kit-data-manager/base-repo/pull/370
+* Update plugin org.owasp.dependencycheck to v12 by @renovate in https://github.com/kit-data-manager/base-repo/pull/371
+* Update dependency edu.kit.datamanager:service-base to v1.3.3
+* Update dependency edu.kit.datamanager:repo-core to v1.2.4
+
 ## [1.5.6] - 2024-11-10
 Added
 * Added configuration support for CORS, enhancing security and request handling.
@@ -277,7 +308,8 @@ Added
 
 - First public version
 
-[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.6...HEAD
+[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.7...HEAD
+[1.5.7]: https://github.com/kit-data-manager/base-repo/compare/v1.5.6...v1.5.7
 [1.5.6]: https://github.com/kit-data-manager/base-repo/compare/v1.5.5...v1.5.6
 [1.5.5]: https://github.com/kit-data-manager/base-repo/compare/v1.5.4...v1.5.5
 [1.5.4]: https://github.com/kit-data-manager/base-repo/compare/v1.5.3...v1.5.4

build.gradle

@@ -1,11 +1,11 @@
 plugins { 
-    id 'org.springframework.boot' version '3.3.5'
-    id 'io.spring.dependency-management' version '1.1.6'
-    id 'io.freefair.lombok' version '8.10.2'
-    id 'io.freefair.maven-publish-java' version '8.10.2'
-    id 'org.owasp.dependencycheck' version '11.1.0'
-    id 'org.asciidoctor.jvm.convert' version '4.0.3'
-    id 'net.researchgate.release' version '3.0.2'
+    id 'org.springframework.boot' version '3.4.1'
+    id 'io.spring.dependency-management' version '1.1.7'
+    id 'io.freefair.lombok' version '8.11'
+    id 'io.freefair.maven-publish-java' version '8.11'
+    id 'org.owasp.dependencycheck' version '12.0.0'
+    id 'org.asciidoctor.jvm.convert' version '4.0.4'
+    id 'net.researchgate.release' version '3.1.0'
     id 'com.gorylenko.gradle-git-properties' version '2.4.2'
     id 'java'
     id 'jacoco'
@@ -28,9 +28,9 @@ repositories {
 //}
 
 ext {
-    set('javersVersion', "7.6.3")
+    set('javersVersion', "7.7.0")
     set('springBootVersion', "3.2.1")
-    set('springDocVersion', "2.6.0")
+    set('springDocVersion', "2.8.3")
     set('keycloakVersion', "19.0.0")
 
     // directory for generated code snippets during tests
@@ -60,29 +60,29 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-mail"
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
-    implementation 'org.springframework.data:spring-data-elasticsearch:5.3.5'
+    implementation 'org.springframework.data:spring-data-elasticsearch:5.4.1'
 
-    implementation "org.springframework:spring-messaging:6.1.14"
+    implementation "org.springframework:spring-messaging:6.2.2"
 
     // cloud support
-    implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.3"
-    implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.3"
-    implementation "org.springframework.cloud:spring-cloud-gateway-mvc:4.1.5"
-    implementation 'de.codecentric:spring-boot-admin-starter-client:3.3.5'
+    implementation "org.springframework.cloud:spring-cloud-starter-config:4.2.0"
+    implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.2.0"
+    implementation "org.springframework.cloud:spring-cloud-gateway-mvc:4.2.0"
+    implementation 'de.codecentric:spring-boot-admin-starter-client:3.4.1'
 
     // springdoc
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion}"
     implementation "org.springdoc:springdoc-openapi-starter-common:${springDocVersion}"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-api:${springDocVersion}"
 
-    implementation "edu.kit.datamanager:repo-core:1.2.3"
-    implementation "edu.kit.datamanager:service-base:1.3.2"
+    implementation "edu.kit.datamanager:repo-core:1.2.4"
+    implementation "edu.kit.datamanager:service-base:1.3.3"
 
     //implementation "com.github.victools:jsonschema-generator:4.23.0"
 
     //Keycloak
     // implementation "org.keycloak:keycloak-spring-boot-starter:${keycloakVersion}"
-    implementation "com.nimbusds:nimbus-jose-jwt:9.46"
+    implementation "com.nimbusds:nimbus-jose-jwt:10.0.1"
    // implementation "io.jsonwebtoken:jjwt-api:0.11.5"
     //implementation "io.jsonwebtoken:jjwt-impl:0.11.5"
     //implementation "io.jsonwebtoken:jjwt-jackson:0.11.5"
@@ -97,11 +97,11 @@ dependencies {
     runtimeOnly    "org.apache.httpcomponents:httpclient:4.5.14"
 
      // driver for postgres
-    implementation "org.postgresql:postgresql:42.7.4"
+    implementation "org.postgresql:postgresql:42.7.5"
     //driver for h2
     implementation "com.h2database:h2:2.3.232"
 
-    testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:3.0.2"
+    testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:3.0.3"
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "org.springframework:spring-test"
     testImplementation "org.springframework.security:spring-security-test"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

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

@@ -18,6 +18,8 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import edu.kit.datamanager.configuration.SearchConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
@@ -30,16 +32,22 @@
  * @author jejkal
  */
 @Configuration
-@ConditionalOnProperty(prefix = "repo.search", name="enabled", havingValue = "true", matchIfMissing = false)
+@ConditionalOnProperty(prefix = "repo.search", name = "enabled", havingValue = "true", matchIfMissing = false)
 public class ElasticConfiguration extends ElasticsearchConfiguration {
 
+    @Autowired
+    private SearchConfiguration searchConfiguration;
 
     @Override
     public ClientConfiguration clientConfiguration() {
         //  HttpHeaders httpHeaders = new HttpHeaders();
         // httpHeaders.add("some-header", "on every request");
+        String connectTo = searchConfiguration.getUrl().toString();
+        connectTo = connectTo.substring(connectTo.lastIndexOf("://") + 3);
+        
         ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-                .connectedTo("localhost:9200", "localhost:9291")
+               // .connectedTo("localhost:9200", "localhost:9291")
+                .connectedTo(connectTo)
                 //.usingSsl()
                 //.withProxy("localhost:8888")
                 .withConnectTimeout(Duration.ofSeconds(5))

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

@@ -141,12 +141,7 @@ public CorsConfigurationSource  corsConfigurationSource() {
         config.setAllowedHeaders(Arrays.asList(applicationProperties.getAllowedHeaders()));
         config.setAllowedMethods(Arrays.asList(applicationProperties.getAllowedMethods()));
         config.setExposedHeaders(Arrays.asList(applicationProperties.getExposedHeaders()));
-        /*config.addAllowedOriginPattern("*");
-        config.setAllowedHeaders(Arrays.asList("*"));
-        config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
-        config.addExposedHeader("Content-Range");
-        config.addExposedHeader("ETag");
-        config.addExposedHeader("Link");*/
+
         final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
 
         source.registerCorsConfiguration("/**", config);