Merge branch 'develop'

intranda · Mar 18, 2024 · 93758a8 · 93758a8
2 parents ecd4d5c + 144a104
commit 93758a8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/cache@v1
@@ -19,13 +19,13 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
 
-    - name: Set up Java 11
-      uses: actions/setup-java@v2
+    - name: Set up Java 17
+      uses: actions/setup-java@v4
       with:
-        distribution: 'zulu'
-        java-version: '11'
+        distribution: 'temurin'
+        java-version: '17'
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       name: Checkout Goobi viewer Theme Reference
 
     - name: Create viewer.war

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.6-jdk-11 AS BUILD
+FROM maven:3-eclipse-temurin-17 AS BUILD
 
 LABEL org.opencontainers.image.authors="Matthias Geerdsen <matthias.geerdsen@intranda.com>"
 LABEL org.opencontainers.image.source="https://github.com/intranda/goobi-viewer-theme-reference"
@@ -12,7 +12,7 @@ WORKDIR /viewer
 RUN echo $build; if [ "$build" = "true" ]; then mvn -f goobi-viewer-theme-reference/pom.xml clean package; elif [ -f "/viewer/goobi-viewer-theme-reference/target/viewer.war" ]; then echo "using existing viewer.war"; else echo "not supposed to build, but no viewer.war found either"; exit 1; fi 
 
 # Build actual application container
-FROM tomcat:9-jre11-openjdk-bullseye as ASSEMBLE
+FROM tomcat:9-jre17-temurin-jammy as ASSEMBLE
 
 ENV DB_SERVER viewer-db
 ENV DB_PORT 3306
@@ -24,11 +24,13 @@ ENV VIEWER_DOMAIN localhost
 ENV TOMCAT_SAMESITECOOKIES strict
 
 RUN sed -i 's|main$|main contrib|' /etc/apt/sources.list
+RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
 RUN apt-get update && \
 	apt-get -y install git \
 	  gettext-base \
 	  ttf-mscorefonts-installer \
-	  libopenjp2-7 && \
+	  libopenjp2-7 \
+	  unzip && \
 	apt-get -y clean && \
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
 	rm -rf ${CATALINA_HOME}/webapps/*

diff --git a/goobi-viewer-theme-reference/WebContent/resources/themes/reference/javascript/dev/custom.js b/goobi-viewer-theme-reference/WebContent/resources/themes/reference/javascript/dev/custom.js
@@ -5,9 +5,6 @@
  * Method to set the content height to a min-height, equal to the viewport height.
  */
 function setContentHeight() {
-    // var pageHeaderTopHeight = $( '#pageHeaderTop' ).outerHeight();
-    // var pageHeaderBottomHeight = $( '#pageHeaderBottom' ).outerHeight();
-    // var pageNavigationHeight = $( '#pageNavigation' ).outerHeight();
 
     var pageHeaderHeight = $('.page-header__spacer').outerHeight();
     var pageWrapperHeight = $( '#pageContent' ).outerHeight();

diff --git a/...iewer-theme-reference/WebContent/resources/themes/reference/javascript/dist/custom.min.js b/...iewer-theme-reference/WebContent/resources/themes/reference/javascript/dist/custom.min.js
@@ -5,9 +5,6 @@
  * Method to set the content height to a min-height, equal to the viewport height.
  */
 function setContentHeight() {
-    // var pageHeaderTopHeight = $( '#pageHeaderTop' ).outerHeight();
-    // var pageHeaderBottomHeight = $( '#pageHeaderBottom' ).outerHeight();
-    // var pageNavigationHeight = $( '#pageNavigation' ).outerHeight();
 
     var pageHeaderHeight = $('.page-header__spacer').outerHeight();
     var pageWrapperHeight = $( '#pageContent' ).outerHeight();

diff --git a/goobi-viewer-theme-reference/pom.xml b/goobi-viewer-theme-reference/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.goobi.viewer.theme</groupId>
 	<artifactId>theme-reference</artifactId>
-	<version>24.01.1</version>
+	<version>24.02-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
@@ -43,18 +43,18 @@
 		<dependency>
 			<groupId>io.goobi.viewer</groupId>
 			<artifactId>viewer-core</artifactId>
-			<version>24.01.1</version>
+			<version>24.02-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.goobi.viewer</groupId>
 			<artifactId>viewer-core-config</artifactId>
-			<version>24.01</version>
+			<version>24.02-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.goobi.viewer</groupId>
 			<artifactId>viewer-connector</artifactId>
-			<version>24.01</version>
+			<version>24.02-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -72,7 +72,7 @@
 				<dependency>
 					<groupId>io.goobi.viewer.module</groupId>
 					<artifactId>module-crowdsourcing</artifactId>
-					<version>24.01</version>
+					<version>24.02-SNAPSHOT</version>
 				</dependency>
 			</dependencies>
 		</profile>