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

PR for v1.5.2
kit-data-manager · Dec 15, 2023 · 1fcea5b · 1fcea5b
2 parents 90adf56 + 85d820e
commit 1fcea5b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,16 @@ Fixed
 
 Security
 
+## [1.5.2] - 2023-12-15
+Fixed
+* Fixed Docker build
+
+Security
+* Bump spring-boot to 3.2.0
+* Bump spring-cloud-starter-config to 4.1.0
+* Bump spring-cloud-starter-netflix-eureka-client to 4.1.0
+* Bump spring-cloud-gateway-mvc to 4.1.0
+
 ## [1.5.1] - 2023-12-11
 Fixed
 * Added ElasticConfiguration again to support indexing and search
@@ -196,7 +206,8 @@ Added
 
 - First public version
 
-[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.1...HEAD
+[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.2...HEAD
+[1.5.2]: https://github.com/kit-data-manager/base-repo/compare/v1.5.1...v1.5.2
 [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

diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ ARG SERVICE_ROOT_DIRECTORY_DEFAULT=/spring
 ####################################################
 # Building environment (java & git)
 ####################################################
-FROM openjdk:16-bullseye AS build-env-java
+FROM eclipse-temurin:17.0.9_9-jdk AS build-env-java
 LABEL maintainer=webmaster@datamanager.kit.edu
 LABEL stage=build-env
 
@@ -49,7 +49,7 @@ RUN bash ./build.sh $SERVICE_DIRECTORY
 ####################################################
 # Runtime environment 4 base-repo
 ####################################################
-FROM openjdk:16-bullseye AS run-service-base-repo
+FROM eclipse-temurin:17.0.9_9-jdk AS run-service-base-repo
 LABEL maintainer=webmaster@datamanager.kit.edu
 LABEL stage=run
 

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins { 
-      id 'org.springframework.boot' version '3.1.5'
+    id 'org.springframework.boot' version '3.2.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'
@@ -29,7 +29,7 @@ repositories {
 
 ext {
     set('javersVersion', "7.0.0")
-    set('springBootVersion', "3.1.0")
+    set('springBootVersion', "3.2.0")
     set('springDocVersion', "2.1.0")
     set('keycloakVersion', "19.0.0")
 
@@ -66,9 +66,9 @@ dependencies {
     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.8"
+    implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.0"
+    implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.0"
+    implementation "org.springframework.cloud:spring-cloud-gateway-mvc:4.1.0"
     implementation 'de.codecentric:spring-boot-admin-starter-client:3.1.8'
 
 
@@ -141,7 +141,7 @@ bootJar {
     archiveFileName = "${archiveBaseName.get()}.${archiveExtension.get()}"
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
-        attributes 'Main-Class': 'org.springframework.boot.loader.PropertiesLauncher'
+        attributes 'Main-Class': 'org.springframework.boot.loader.launch.PropertiesLauncher'
     }
     launchScript()
 }

diff --git a/config/application-default.properties b/config/application-default.properties
@@ -105,6 +105,8 @@ repo.search.enabled: false
 management.health.elasticsearch.enabled:false
 repo.search.url:http://localhost:9200
 repo.search.index:baserepo
+# Workaround for a potential issue with spring cloud 4.1.0 that broke the elastic search proxy
+spring.cloud.gateway.proxy.sensitive=content-length
 
 ###############################################################################
 # Logging settings

diff --git a/config/application-docker.properties b/config/application-docker.properties
@@ -48,6 +48,8 @@ repo.search.enabled: false
 management.health.elasticsearch.enabled:false
 repo.search.url:http://localhost:9200
 repo.search.index:baserepo
+# Workaround for a potential issue with spring cloud 4.1.0 that broke the elastic search proxy
+spring.cloud.gateway.proxy.sensitive=content-length
 
 repo.basepath:  file:///var/repository/ 
 repo.plugin.storage.date.pathPattern: @{year}/@{month}/@{day}