Merge pull request 'release_1.1.10' (#14) from release_1.1.10 into ma…

…ster

Reviewed-on: https://gitea.intranda.com/intranda/goobi-vocabulary-server/pulls/14

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}|" \

module-core/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>io.goobi.vocabulary</groupId>
     <artifactId>vocabulary-server-core</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
     <name>Vocabulary-Server-Core</name>
     <description>Spring Boot based RESTful web service for vocabulary management</description>
     <packaging>jar</packaging>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>io.goobi.vocabulary</groupId>
             <artifactId>vocabulary-server-exchange</artifactId>
-            <version>1.1.9</version>
+            <version>1.1.10</version>
             <scope>compile</scope>
         </dependency>
 

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

module-exchange/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.goobi.vocabulary</groupId>
     <artifactId>vocabulary-server-exchange</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
     <name>Vocabulary Exchange</name>
     <description>Vocabulary data exchange classes</description>
     <packaging>jar</packaging>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.15.4</version>
+            <version>2.17.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.goobi.vocabulary</groupId>
     <artifactId>vocabulary-server</artifactId>
-    <version>1.1.9</version>
+    <version>1.1.10</version>
     <name>Vocabulary-Server</name>
     <packaging>pom</packaging>
     <description>RESTful webservice for vocabulary management</description>