From b9004f8ff8314059f65cbbd02cf7948330b02074 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Fri, 15 Nov 2024 15:46:31 +0100 Subject: [PATCH 1/5] version: set to version 1.1.10-SNAPSHOT --- module-core/pom.xml | 4 ++-- module-exchange/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module-core/pom.xml b/module-core/pom.xml index accb4e8..d5ef0c6 100644 --- a/module-core/pom.xml +++ b/module-core/pom.xml @@ -10,7 +10,7 @@ io.goobi.vocabulary vocabulary-server-core - 1.1.9 + 1.1.10-SNAPSHOT Vocabulary-Server-Core Spring Boot based RESTful web service for vocabulary management jar @@ -35,7 +35,7 @@ io.goobi.vocabulary vocabulary-server-exchange - 1.1.9 + 1.1.10-SNAPSHOT compile diff --git a/module-exchange/pom.xml b/module-exchange/pom.xml index 0b5c0cb..8316280 100644 --- a/module-exchange/pom.xml +++ b/module-exchange/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.goobi.vocabulary vocabulary-server-exchange - 1.1.9 + 1.1.10-SNAPSHOT Vocabulary Exchange Vocabulary data exchange classes jar diff --git a/pom.xml b/pom.xml index 4cafdf6..e7da50f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.goobi.vocabulary vocabulary-server - 1.1.9 + 1.1.10-SNAPSHOT Vocabulary-Server pom RESTful webservice for vocabulary management From ccbfc422fdc90406439faaf2c1081f206ee8da85 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Tue, 19 Nov 2024 12:02:47 +0100 Subject: [PATCH 2/5] update: jackson-dataformat-xml from 2.15.4 to 2.17.0 --- module-exchange/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-exchange/pom.xml b/module-exchange/pom.xml index 8316280..0d41459 100644 --- a/module-exchange/pom.xml +++ b/module-exchange/pom.xml @@ -34,7 +34,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.15.4 + 2.17.0 compile From 24e1f003f1439f264f0f78492b3cdab14e1621d0 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Thu, 21 Nov 2024 08:42:26 +0100 Subject: [PATCH 3/5] task: add proxy configuration template --- Dockerfile | 1 + module-core/src/main/resources/application.properties | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index 67cb59d..c07559d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ COPY module-core/target/vocabulary-server-core.jar /opt/digiverso/vocabulary/ COPY module-core/src/main/resources/application.properties /opt/digiverso/vocabulary/ RUN sed -re "s|^(server.port=).*|\1${VOCABULARY_SERVER_PORT}|" \ -e "s|^#?(security.token=).*|\1${VOCABULARY_SERVER_TOKEN}|" \ + -e "s|^#?(server.forward-headers-strategy.*)|\1|" \ -e "s|^(spring.datasource.username=).*|\1${VOCABULARY_DB_USER}|" \ -e "s|^(spring.datasource.password=).*|\1${VOCABULARY_DB_PASSWORD}|" \ -e "s|^(spring.datasource.url=).*|\1jdbc:mariadb://$VOCABULARY_DB_SERVER:3306/${VOCABULARY_DB_DATABASE}|" \ diff --git a/module-core/src/main/resources/application.properties b/module-core/src/main/resources/application.properties index d368c74..42a423d 100644 --- a/module-core/src/main/resources/application.properties +++ b/module-core/src/main/resources/application.properties @@ -10,6 +10,12 @@ # Control anonymous read operations. If set to false or not set, anonymous readers will not get access #security.anonymous.read-allowed=true +# Proxy / Gateway configuration +# If the vocabulary server is behind a proxy, it will possibly generate wrong URLs because it is called with an internal +# IP or hostname. This can be controlled by X-Forwarded-* Headers (e. g. X-Forwarded-Host: example.com). To enable this, +# uncomment the following line. +#server.forward-headers-strategy=framework + # Basic configuration # The port the vocabulary server should listen on server.port=8081 From eb68a5b66f7b6937df3d53439789e4106c61aa0b Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Thu, 21 Nov 2024 08:50:34 +0100 Subject: [PATCH 4/5] update: Spring boot from 3.3.3 to 3.3.5 --- module-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-core/pom.xml b/module-core/pom.xml index d5ef0c6..db9c454 100644 --- a/module-core/pom.xml +++ b/module-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.5 io.goobi.vocabulary From da720710d4a7996069dbf55f5ede2134dc6fd0b7 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Thu, 21 Nov 2024 08:57:22 +0100 Subject: [PATCH 5/5] release: 1.1.10 --- module-core/pom.xml | 4 ++-- module-exchange/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module-core/pom.xml b/module-core/pom.xml index db9c454..d779cf4 100644 --- a/module-core/pom.xml +++ b/module-core/pom.xml @@ -10,7 +10,7 @@ io.goobi.vocabulary vocabulary-server-core - 1.1.10-SNAPSHOT + 1.1.10 Vocabulary-Server-Core Spring Boot based RESTful web service for vocabulary management jar @@ -35,7 +35,7 @@ io.goobi.vocabulary vocabulary-server-exchange - 1.1.10-SNAPSHOT + 1.1.10 compile diff --git a/module-exchange/pom.xml b/module-exchange/pom.xml index 0d41459..7ca1a99 100644 --- a/module-exchange/pom.xml +++ b/module-exchange/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.goobi.vocabulary vocabulary-server-exchange - 1.1.10-SNAPSHOT + 1.1.10 Vocabulary Exchange Vocabulary data exchange classes jar diff --git a/pom.xml b/pom.xml index e7da50f..ad2b989 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.goobi.vocabulary vocabulary-server - 1.1.10-SNAPSHOT + 1.1.10 Vocabulary-Server pom RESTful webservice for vocabulary management