git subrepo pull assembly

subrepo: subdir: "assembly" merged: "1de452d110" upstream: origin: "[email protected]:daisy/pipeline-assembly.git" branch: "master" commit: "81a326cfd6" git-subrepo: version: "0.3.1" origin: "???" commit: "???"
daisy · Jan 27, 2025 · a53a140 · a53a140
1 parent a46ebe3
commit a53a140
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 21 deletions.
diff --git a/assembly/.gitrepo b/assembly/.gitrepo
@@ -6,6 +6,6 @@
 [subrepo]
 	remote = [email protected]:daisy/pipeline-assembly.git
 	branch = master
-	commit = 69a859f57e3ef5693f72e33eb5154490890843bf
-	parent = 2077c566e615658c4f952d96f5fc3446e8aa0c21
+	commit = 81a326cfd681d95142cac4ac9cac59965be05b78
+	parent = 0287d6baa1f3f6d848c5d02126c9d0be26774e89
 	cmdver = 0.3.1
diff --git a/assembly/Makefile b/assembly/Makefile
@@ -125,7 +125,7 @@ ifeq ($(OS), MACOSX)
 	        "mac/*.liblouis-utils-*-mac.jar/native/macosx/*/liblouis.dylib",                                    \
 	        "mac/*.liblouis-utils-*-mac.jar/native/macosx/*/liblouisutdml/file2brl",                            \
 	        "mac/*.liblouis-utils-*-mac.jar/native/macosx/*/liblouisutdml/*.dylib",                             \
-	        "*.tts-adapter-acapela-3.1.5.jar/jnaerator-0.11-p1.jar/com/sun/jna/darwin/libjnidispatch.jnilib"    \
+	        "*.tts-adapter-acapela-*.jar/jnaerator-*.jar/com/sun/jna/darwin/libjnidispatch.jnilib"              \
 	    })                                                                                                      \
 	        paths.add("target/jars/common/" + p);                                                               \
 	    while (!paths.isEmpty()) {                                                                              \
@@ -250,13 +250,15 @@ ifneq ($(OS), WINDOWS)
 # Note that when `docker' is enabled together with other targets, it is as if --without-osgi was also specified.
 docker : mvn -Pwithout-osgi \
          jre/target/maven-jlink/classifiers/linux \
+         jre/target/maven-jlink/classifiers/linux-arm64 \
          target/assembly-$(assembly/VERSION)-linux/daisy-pipeline/bin/pipeline2
 ifndef DUMP_PROFILES
-	mkdirs("target/docker");                                                                           \
+	mkdirs("target/docker/jre");                                                                       \
 	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 3,$^)", "target/docker/jre");
+	exec("cp", "-r", "$(word 3,$^)", "target/docker/jre/amd64");
+	exec("cp", "-r", "$(word 4,$^)", "target/docker/jre/arm64");
 	exec("$(DOCKER)", "buildx", "create", "--use", "--name=mybuilder",                                 \
 	                                      "--driver", "docker-container",                              \
 	                                      "--driver-opt", "image=moby/buildkit:buildx-stable-1");
@@ -310,6 +312,7 @@ endif
 
 jre/target/maven-jlink/classifiers/mac                                 : mvn -Pbuild-jre-mac
 jre/target/maven-jlink/classifiers/linux                               : mvn -Pbuild-jre-linux
+jre/target/maven-jlink/classifiers/linux-arm64                         : mvn -Pbuild-jre-linux-arm64
 
 target/assembly-$(assembly/VERSION)-mac/daisy-pipeline/bin/pipeline2   : mvn -Pcopy-artifacts \
                                                                              -Pgenerate-release-descriptor \
@@ -368,6 +371,7 @@ clean :
 # generate-release-descriptor                  generate-effective-pom
 #                                              generate-release-descriptor
 # build-jre-linux                                                                                                   jlink-linux
+# build-jre-linux-arm64                                                                                             jlink-linux-arm64
 # build-jre-win32                                                                                                   jlink-win32
 # build-jre-win64                                                                                                   jlink-win64
 # build-jre-mac                                                                                                     jlink-mac
@@ -502,34 +506,35 @@ endif
 # profiles that are run separately because need to be run with specific JDKs, because they should not be
 # installed, and because they require a pom without dependencies
 
-.PHONY : -Pbuild-jre-mac -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64
--Pbuild-jre-mac -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64 : mvn # to make sure they are run after other profiles
+.PHONY : -Pbuild-jre-mac -Pbuild-jre-linux -Pbuild-jre-linux-arm64 -Pbuild-jre-win32 -Pbuild-jre-win64
+-Pbuild-jre-mac -Pbuild-jre-linux -Pbuild-jre-linux-arm64 -Pbuild-jre-win32 -Pbuild-jre-win64 : mvn # to make sure they are run after other profiles
 
 ifeq ($(OS), MACOSX)
--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
+-Pbuild-jre-linux -Pbuild-jre-linux-arm64 -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
 	exec(env("JAVA_HOME", "$(CURDIR)/$</Contents/Home"), \
 	     "$(MVN)", "-f", "jre/build.xml", "jlink:jlink", "$@");
 endif
 else ifeq ($(OS), WINDOWS)
--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
+-Pbuild-jre-linux -Pbuild-jre-linux-arm64 -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
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
 	     "$(MVN)", "-f", "jre/build.xml", "jlink:jlink", "$@");
 endif
 else
--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
+-Pbuild-jre-linux -Pbuild-jre-linux-arm64-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
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
 	     "$(MVN)", "-f", "jre/build.xml", "jlink:jlink", "$@");
 endif
 endif
 
 # for dependencies to jmods
--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
+-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-linux-arm64 : src/main/jre/OpenJDK17U-jdk_aarch64_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
 
@@ -542,18 +547,23 @@ ifneq ($(OS), WINDOWS)
 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_aarch64_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_aarch64_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/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_aarch64_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_aarch64_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 $@)");                                                                                          \
@@ -565,5 +575,6 @@ clean : clean-jdk
 clean-jdk :
 	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_aarch64_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/assembly/NEWS.md b/assembly/NEWS.md
@@ -1,3 +1,18 @@
+Changes in release v1.15.0
+===========================
+
+## Framework
+
+- **NEW** Experimental Pipeline 1 backend with selected Pipeline 1 scripts
+
+## Modules
+
+- **NEW** Pipeline 1 scripts (proof-of-concept for now; more scripts will be made available in upcoming releases)
+  - DTBook to Latex
+- **NEW** `org.daisy.pipeline.tts.config` setting now supports either a file path or an XML string
+- Changes to braille production scripts, see release notes of braille modules [v1.15.0](https://github.com/daisy/pipeline-modules/blob/master/braille/NEWS.md#v1150)
+- Various bugfixes and improvements
+
 Changes in release v1.14.21
 ===========================
 

diff --git a/assembly/jre/build.xml b/assembly/jre/build.xml
@@ -66,6 +66,33 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>build-jre-linux-arm64</id>
+      <!--
+          this profile needs to be run with JDK 17
+      -->
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-jlink-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-cli</id> <!-- run directly from Makefile -->
+                <goals>
+                  <goal>jlink</goal>
+                </goals>
+                <configuration>
+                  <classifier>linux-arm64</classifier>
+                  <modulePaths>
+                    <modulePath>src/main/jre/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
+                  </modulePaths>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>build-jre-mac</id>
       <!--

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.daisy.pipeline</groupId>
   <artifactId>assembly</artifactId>
-  <version>1.14.22-SNAPSHOT</version>
+  <version>1.15.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>DAISY Pipeline 2 :: Assembly</name>
   <description>Builds the main distribution of the DAISY Pipeline 2.</description>
@@ -69,14 +69,14 @@
       <dependency>
         <groupId>org.daisy.pipeline</groupId>
         <artifactId>framework-bom</artifactId>
-        <version>1.14.21</version>
+        <version>1.15.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.daisy.pipeline.modules</groupId>
         <artifactId>modules-bom</artifactId>
-        <version>1.14.30</version>
+        <version>1.15.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -157,6 +157,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.daisy.pipeline</groupId>
+      <artifactId>pipeline1-adapter</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.daisy.pipeline</groupId>
       <artifactId>saxon-adapter</artifactId>
@@ -307,6 +317,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>io.github.bmuskalla</groupId>
+      <artifactId>scoped-system-properties</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
@@ -1963,6 +1983,14 @@
             <configuration>
               <outputDirectory>${project.build.directory}/jars/no-osgi</outputDirectory>
               <artifactItems>
+                <artifactItem>
+                  <groupId>org.daisy.pipeline</groupId>
+                  <artifactId>pipeline1-adapter</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>io.github.bmuskalla</groupId>
+                  <artifactId>scoped-system-properties</artifactId>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.daisy.pipeline</groupId>
                   <artifactId>ds-to-spi-runtime</artifactId>

diff --git a/assembly/src/main/docker/Dockerfile b/assembly/src/main/docker/Dockerfile
@@ -2,7 +2,8 @@ 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
+ARG TARGETARCH
+ADD jre/$TARGETARCH /opt/daisy-pipeline2/jre
 ENV JAVA_HOME=/opt/daisy-pipeline2/jre
 ENV PIPELINE2_WS_LOCALFS=false \
     PIPELINE2_WS_AUTHENTICATION=true \

diff --git a/assembly/src/main/resources/README.txt b/assembly/src/main/resources/README.txt
@@ -1,4 +1,4 @@
-              DAISY Pipeline 2 - 1.14.21 - January 6, 2024
+              DAISY Pipeline 2 - 1.15.0 - January 27, 2024
 ==============================================================================
 
 
@@ -72,10 +72,10 @@ The package includes:
 3. Release Notes
 ------------------------------------------------------------------------------
 
-The package includes the 1.14.21 version of the project.
+The package includes the 1.15.0 version of the project.
 
 See the release notes on this page:
-  https://github.com/daisy/pipeline-assembly/blob/master/NEWS.md#changes-in-release-v11421
+  https://github.com/daisy/pipeline-assembly/blob/master/NEWS.md#changes-in-release-v1150
 
 4. Prerequisites
 ------------------------------------------------------------------------------

diff --git a/assembly/src/main/resources/etc/logback.xml b/assembly/src/main/resources/etc/logback.xml
@@ -38,5 +38,6 @@
   <logger name="org.eclipse.jetty.util.log" level="INFO" />
   <logger name="cz.vutbr.web" level="WARN"/>
   <logger name="org.daisy.braille.css" level="WARN"/>
+  <logger name="com.sun.jna.internal" level="INFO"/>
 
 </configuration>