Merge release 1.14.14

daisy · Jul 4, 2023 · 3d60471 · 3d60471
2 parents e9a2694 + f5ede2b
commit 3d60471
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 52 deletions.
diff --git a/Makefile b/Makefile
@@ -184,8 +184,9 @@ docker : mvn -Pwithout-osgi \
 ifndef DUMP_PROFILES
 	mkdirs("target/docker");                                                                        \
 	exec("cp", "src/main/docker/Dockerfile", "target/docker/Dockerfile");
+	exec("cp", "src/main/docker/logback.xml", "target/docker/logback.xml");
 	exec("cp", "-r", "target/assembly-$(assembly/VERSION)-linux/daisy-pipeline", "target/docker/");
-	exec("cp", "-r", "$(word 4,$^)", "target/docker/jre");
+	exec("cp", "-r", "$(word 3,$^)", "target/docker/jre");
 	exec(new File("target/docker"),                                                                 \
 	     "$(DOCKER)", "build", "-t", "daisyorg/pipeline:latest-snapshot", ".");
 endif
@@ -422,27 +423,21 @@ endif
 -Pbuild-jre-mac -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64 : mvn # to make sure they are run after other profiles
 
 ifeq ($(OS), MACOSX)
--Pbuild-jre-mac                                       : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7/jdk-17.0.3+7
-ifndef DUMP_PROFILES
-	rm("target/classes");                                \
-	exec(env("JAVA_HOME", "$(CURDIR)/$</Contents/Home"), \
-	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
-endif
--Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64 : src/main/jre/OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8/jdk-11.0.13+8
+-Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64 -Pbuild-jre-mac : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
 	rm("target/classes");                                \
 	exec(env("JAVA_HOME", "$(CURDIR)/$</Contents/Home"), \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
 endif
 else ifeq ($(OS), WINDOWS)
--Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64 : src/main/jre/OpenJDK11U-jdk_x64_windows_hotspot_11.0.13_8/jdk-11.0.13+8
+-Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64                 : src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
 	rm("target/classes");                                \
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
 endif
 else
--Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64 : src/main/jre/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8/jdk-11.0.13+8
+-Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64                 : src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
 	rm("target/classes");                                \
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
@@ -451,51 +446,44 @@ endif
 endif
 
 # for dependencies to jmods
--Pbuild-jre-mac   : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7/jdk-17.0.3+7
--Pbuild-jre-linux : src/main/jre/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8/jdk-11.0.13+8
--Pbuild-jre-win64 : src/main/jre/OpenJDK11U-jdk_x64_windows_hotspot_11.0.13_8/jdk-11.0.13+8
--Pbuild-jre-win32 : src/main/jre/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.13_8/jdk-11.0.13+8
+-Pbuild-jre-mac   : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7
+-Pbuild-jre-linux : src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7
+-Pbuild-jre-win64 : src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7
+-Pbuild-jre-win32 : src/main/jre/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.7_7/jdk-17.0.7+7
 
 # JDKs
 
-src/main/jre/OpenJDK11U-jdk_x64_windows_hotspot_11.0.13_8/jdk-11.0.13+8 \
-src/main/jre/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.13_8/jdk-11.0.13+8 : %/jdk-11.0.13+8 : %.zip
+src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7 \
+src/main/jre/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.7_7/jdk-17.0.7+7 : %/jdk-17.0.7+7 : %.zip
 	mkdirs("$(dir $@)"); \
 	unzip(new File("$<"), new File("$(dir $@)"));
 
 ifneq ($(OS), WINDOWS)
-src/main/jre/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8/jdk-11.0.13+8 : %/jdk-11.0.13+8 : | %.tar.gz
-	mkdirs("$(dir $@)");                                                                                       \
-	exec("tar", "-zxvf", "src/main/jre/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz", "-C", "$(dir $@)/");
-src/main/jre/OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8/jdk-11.0.13+8 : %/jdk-11.0.13+8 : | %.tar.gz
-	mkdirs("$(dir $@)");                                                                                       \
-	exec("tar", "-zxvf", "src/main/jre/OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz", "-C", "$(dir $@)/");
-src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7/jdk-17.0.3+7   : %/jdk-17.0.3+7 : | %.tar.gz
-	mkdirs("$(dir $@)");                                                                                       \
-	exec("tar", "-zxvf", "src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7.tar.gz", "-C", "$(dir $@)/");
+src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7 : %/jdk-17.0.7+7 : | %.tar.gz
+	mkdirs("$(dir $@)"); \
+	exec("tar", "-zxvf", "src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz", "-C", "$(dir $@)/");
+src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7   : %/jdk-17.0.7+7 : | %.tar.gz
+	mkdirs("$(dir $@)"); \
+	exec("tar", "-zxvf", "src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz", "-C", "$(dir $@)/");
 endif
 
-.INTERMEDIATE : src/main/jre/OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz
-.INTERMEDIATE : src/main/jre/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz
-.INTERMEDIATE : src/main/jre/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.13_8.zip
-.INTERMEDIATE : src/main/jre/OpenJDK11U-jdk_x64_windows_hotspot_11.0.13_8.zip
-
-src/main/jre/OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz \
-src/main/jre/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz \
-src/main/jre/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.13_8.zip \
-src/main/jre/OpenJDK11U-jdk_x64_windows_hotspot_11.0.13_8.zip :
-	mkdirs("$(dir $@)");                                                                                           \
-	copy(new URL("https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/$(notdir $@)"), \
-	     new File("$@"));
-src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7.tar.gz :
+.INTERMEDIATE : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz
+.INTERMEDIATE : src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
+.INTERMEDIATE : src/main/jre/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.7_7.zip
+.INTERMEDIATE : src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7.zip
+
+src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz \
+src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz \
+src/main/jre/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.7_7.zip \
+src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7.zip :
 	mkdirs("$(dir $@)");                                                                                          \
-	copy(new URL("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3%2B7/$(notdir $@)"), \
+	copy(new URL("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/$(notdir $@)"), \
 	     new File("$@"));
 
 .PHONY : clean-jdk
 clean : clean-jdk
 clean-jdk :
-	rm("src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7/jdk-17.0.3+7");          \
-	rm("src/main/jre/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8/jdk-11.0.13+8");      \
-	rm("src/main/jre/OpenJDK11U-jdk_x64_windows_hotspot_11.0.13_8/jdk-11.0.13+8");    \
-	rm("src/main/jre/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.13_8/jdk-11.0.13+8");
+	rm("src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7");        \
+	rm("src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7");      \
+	rm("src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7");    \
+	rm("src/main/jre/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.7_7/jdk-17.0.7+7");
diff --git a/build-jre.xml b/build-jre.xml
@@ -31,7 +31,7 @@
     <profile>
       <id>build-jre-linux</id>
       <!--
-          this profile needs to be run with JDK 11
+          this profile needs to be run with JDK 17
       -->
       <build>
         <plugins>
@@ -58,7 +58,7 @@
                     <addModule>jdk.zipfs</addModule>
                   </addModules>
                   <modulePaths>
-                    <modulePath>src/main/jre/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8/jdk-11.0.13+8/jmods</modulePath>
+                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
                   </modulePaths>
                 </configuration>
               </execution>
@@ -94,7 +94,7 @@
                     <addModule>jdk.zipfs</addModule>
                   </addModules>
                   <modulePaths>
-                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7/jdk-17.0.3+7/Contents/Home/jmods</modulePath>
+                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7/Contents/Home/jmods</modulePath>
                   </modulePaths>
                 </configuration>
               </execution>
@@ -106,7 +106,7 @@
     <profile>
       <id>build-jre-win32</id>
       <!--
-          this profile needs to be run with JDK 11
+          this profile needs to be run with JDK 17
       -->
       <build>
         <plugins>
@@ -127,7 +127,7 @@
                     <addModule>jdk.zipfs</addModule>
                   </addModules>
                   <modulePaths>
-                    <modulePath>src/main/jre/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.13_8/jdk-11.0.13+8/jmods</modulePath>
+                    <modulePath>src/main/jre/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
                   </modulePaths>
                 </configuration>
               </execution>
@@ -157,7 +157,7 @@
                     <addModule>jdk.zipfs</addModule>
                   </addModules>
                   <modulePaths>
-                    <modulePath>src/main/jre/OpenJDK11U-jdk_x64_windows_hotspot_11.0.13_8/jdk-11.0.13+8/jmods</modulePath>
+                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
                   </modulePaths>
                 </configuration>
               </execution>

diff --git a/make/lib/util$1.class b/make/lib/util$1.class
diff --git a/make/lib/util.class b/make/lib/util.class
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.daisy.pipeline</groupId>
   <artifactId>assembly</artifactId>
-  <version>1.14.14-SNAPSHOT</version>
+  <version>1.14.15-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>DAISY Pipeline 2 :: Assembly</name>
   <description>Builds the main distribution of the DAISY Pipeline 2.</description>
@@ -69,7 +69,7 @@
       <dependency>
         <groupId>org.daisy.pipeline</groupId>
         <artifactId>framework-bom</artifactId>
-        <version>1.14.12</version>
+        <version>1.14.13</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -1,6 +1,7 @@
-FROM debian:stretch
+FROM debian:bookworm
 LABEL maintainer="DAISY Consortium (http://www.daisy.org/)"
 ADD daisy-pipeline /opt/daisy-pipeline2
+ADD logback.xml /opt/daisy-pipeline2/etc/logback.xml
 ADD jre /opt/daisy-pipeline2/jre
 ENV JAVA_HOME=/opt/daisy-pipeline2/jre
 ENV PIPELINE2_WS_LOCALFS=false \

diff --git a/src/main/docker/logback.xml b/src/main/docker/logback.xml
@@ -0,0 +1,25 @@
+<configuration debug="false">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="org.daisy.pipeline.logging.OSGIFilter"/>
+    <encoder>
+      <Pattern>%-5level %marker [%40.40logger{40}] %msg   @%class{36}:%L#%M%n</Pattern>
+    </encoder>
+  </appender>
+
+  <include resource="org/daisy/pipeline/logging/jul-to-slf4j.xml"/>
+  <include resource="org/daisy/pipeline/logging/appenders.xml">
+    <!-- JOB and JOB_FILE appenders-->
+  </include>
+
+  <root level="DEBUG">
+    <appender-ref ref="STDOUT"/>
+    <appender-ref ref="JOB_FILE"/>
+    <appender-ref ref="JOB"/>
+  </root>
+  <logger name="com.xmlcalabash" level="INFO"/>
+  <logger name="org.eclipse.jetty.util.log" level="INFO" />
+  <logger name="cz.vutbr.web" level="WARN"/>
+  <logger name="org.daisy.braille.css" level="WARN"/>
+
+</configuration>