Merge release 1.14.15

.mvn/settings.xml

@@ -29,8 +29,30 @@
 				</pluginRepository>
 			</pluginRepositories>
 		</profile>
+		<profile>
+			<id>snapshots</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>sonatype-snapshots</id>
+					<name>OSS Sonatype repo (snapshots)</name>
+					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+					<snapshots>
+						<enabled>true</enabled>
+						<updatePolicy>always</updatePolicy>
+						<checksumPolicy>warn</checksumPolicy>
+					</snapshots>
+				</repository>
+			</repositories>
+		</profile>
 	</profiles>
 	<activeProfiles>
 		<activeProfile>central-https</activeProfile>
+		<!-- <activeProfile>snapshots</activeProfile> -->
 	</activeProfiles>
 </settings>

NEWS.md

@@ -1,3 +1,32 @@
+Changes in release v1.14.15
+===========================
+
+## Framework
+
+- **FIX** Some vulnerable dependencies were eliminated
+- Bugfixes
+
+## Modules
+
+- **NEW** Support for Microsoft Azure Cognitive Speech Services
+- **NEW** Options for the DAISY 3 and DAISY 2.02 MegaVoice multi-level scripts to choose the player
+  type and book folder level.
+- **FIX** Better support for HTML with other encodings than UTF-8
+- **FIX** Retain master.smil if present in a DAISY 2.02 publication
+- **FIX** Preserve indentation and DOCTYPE declaration of documents in a DAISY 2.02 publication
+- **FIX** Better marking of page breaks in EPUB 3 output
+- **FIX** Issues in SAPI adapter
+- Other bugfixes
+- Changes to braille production scripts, see [release notes of braille modules v1.14.14](https://github.com/daisy/pipeline-modules/blob/master/braille/NEWS.md#v11414)
+
+Backwards incompatibility note: some script options were renamed. Please check the [script
+documentation](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/) and update your client
+code if needed.
+
+## Details
+
+See [all the closed issues of this release](https://github.com/orgs/daisy/projects/2).
+
 Changes in release v1.14.14
 ===========================
 

pom.xml

@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.daisy.pipeline</groupId>
   <artifactId>assembly</artifactId>
-  <version>1.14.15-SNAPSHOT</version>
+  <version>1.14.16-SNAPSHOT</version>
   <packaging>pom</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.13</version>
+        <version>1.14.15</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.daisy.pipeline.modules</groupId>
         <artifactId>modules-bom</artifactId>
-        <version>1.14.14</version>
+        <version>1.14.17</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -147,16 +147,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.daisy.pipeline</groupId>
-      <artifactId>logging-activator</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.daisy.pipeline</groupId>
       <artifactId>modules-registry</artifactId>
@@ -986,6 +976,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.daisy.pipeline.modules</groupId>
+      <artifactId>tts-adapter-azure</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.daisy.pipeline.modules</groupId>
       <artifactId>tts-adapter-cereproc</artifactId>
@@ -1357,18 +1357,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
+      <groupId>com.microsoft.cognitiveservices.speech</groupId>
+      <artifactId>client-sdk</artifactId>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
@@ -1819,10 +1809,6 @@
                   <groupId>org.daisy.pipeline</groupId>
                   <artifactId>logging-appender</artifactId>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>org.daisy.pipeline</groupId>
-                  <artifactId>logging-activator</artifactId>
-                </artifactItem>
                 <artifactItem>
                   <groupId>org.daisy.pipeline</groupId>
                   <artifactId>modules-registry</artifactId>
@@ -1902,6 +1888,12 @@
                   <groupId>org.slf4j</groupId>
                   <artifactId>slf4j-api</artifactId>
                 </artifactItem>
+                <!--
+                    Disabled because for some reason (and it's not because logging-activator was
+                    merged into common-utils) it does not work anymore when used in the
+                    assembly. (It does work in unit tests.) As a workaround, log JUL messages to
+                    stdout through the logging.properties configuration file.
+                -->
                 <artifactItem>
                   <groupId>org.slf4j</groupId>
                   <artifactId>jul-to-slf4j</artifactId>
@@ -2368,6 +2360,10 @@
                   <groupId>org.daisy.pipeline.modules</groupId>
                   <artifactId>tts-adapter-acapela</artifactId>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.daisy.pipeline.modules</groupId>
+                  <artifactId>tts-adapter-azure</artifactId>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.daisy.pipeline.modules</groupId>
                   <artifactId>tts-adapter-cereproc</artifactId>
@@ -2527,13 +2523,14 @@
                   <groupId>org.apache.commons</groupId>
                   <artifactId>commons-compress</artifactId>
                 </artifactItem>
+                <!--
+                    for tts-adapter-azure
+
+                    FIXME: does not work with OSGi
+                -->
                 <artifactItem>
-                  <groupId>org.codehaus.jackson</groupId>
-                  <artifactId>jackson-core-asl</artifactId>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.codehaus.jackson</groupId>
-                  <artifactId>jackson-mapper-asl</artifactId>
+                  <groupId>com.microsoft.cognitiveservices.speech</groupId>
+                  <artifactId>client-sdk</artifactId>
                 </artifactItem>
                 <!--
                     for tts-adapter-google
@@ -2569,6 +2566,17 @@
                   <artifactId>jing</artifactId>
                   <version>20120724.0.0</version>
                 </artifactItem>
+                <!--
+                    epubcheck requires jackson even though we don't use JSON reporting
+                -->
+                <artifactItem>
+                  <groupId>org.codehaus.jackson</groupId>
+                  <artifactId>jackson-core-asl</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.codehaus.jackson</groupId>
+                  <artifactId>jackson-mapper-asl</artifactId>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -3339,6 +3347,7 @@
                       <excludes>
                         felix.properties,
                         logback.xml,
+                        logging.properties,
                         pipeline.properties
                       </excludes>
                       <mapper>
@@ -3363,6 +3372,11 @@
                       <src>src/main/resources/etc/logback.xml</src>
                       <dst>${deb.pipeline.config}/logback.xml</dst>
                     </data>
+                    <data>
+                      <type>file</type>
+                      <src>src/main/resources/etc/logging.properties</src>
+                      <dst>${deb.pipeline.config}/logging.properties</dst>
+                    </data>
                     <data>
                       <type>link</type>
                       <symlink>true</symlink>

src/main/assembly/dist-linux.xml

@@ -8,7 +8,7 @@
   <baseDirectory>daisy-pipeline</baseDirectory>
   <componentDescriptors>
       <componentDescriptor>src/main/assembly/components/base.xml</componentDescriptor>
-      <componentDescriptor>src/main/assembly/components/base-linux.xml</componentDescriptor>
+      <componentDescriptor>src/main/assembly/components/bin-linux.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/jars.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/jars-linux.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/cli-linux.xml</componentDescriptor>

src/main/assembly/dist-mac.xml

@@ -8,7 +8,7 @@
   <baseDirectory>daisy-pipeline</baseDirectory>
   <componentDescriptors>
       <componentDescriptor>src/main/assembly/components/base.xml</componentDescriptor>
-      <componentDescriptor>src/main/assembly/components/base-mac.xml</componentDescriptor>
+      <componentDescriptor>src/main/assembly/components/bin-mac.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/jars.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/jars-mac.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/cli-mac.xml</componentDescriptor>

src/main/assembly/dist-minimal.xml

@@ -8,8 +8,8 @@
   <baseDirectory>daisy-pipeline</baseDirectory>
   <componentDescriptors>
       <componentDescriptor>src/main/assembly/components/base.xml</componentDescriptor>
-      <componentDescriptor>src/main/assembly/components/base-linux.xml</componentDescriptor> <!-- same as mac -->
-      <componentDescriptor>src/main/assembly/components/base-win.xml</componentDescriptor>
+      <componentDescriptor>src/main/assembly/components/bin-linux.xml</componentDescriptor> <!-- same as mac -->
+      <componentDescriptor>src/main/assembly/components/bin-win.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/updater-all.xml</componentDescriptor>
   </componentDescriptors>
 </assembly>

src/main/assembly/dist-win.xml

@@ -8,7 +8,7 @@
   <baseDirectory>daisy-pipeline</baseDirectory>
   <componentDescriptors>
       <componentDescriptor>src/main/assembly/components/base.xml</componentDescriptor>
-      <componentDescriptor>src/main/assembly/components/base-win.xml</componentDescriptor>
+      <componentDescriptor>src/main/assembly/components/bin-win.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/jars.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/jars-win.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/cli-win.xml</componentDescriptor>

src/main/deb/DEBIAN/conffiles

@@ -1,2 +1,3 @@
 ${deb.pipeline.config}/logback.xml
+${deb.pipeline.config}/logging.properties
 /etc/default/daisy-pipeline2

src/main/resources/README.txt

@@ -1,4 +1,4 @@
-              DAISY Pipeline 2 - 1.14.14 - June 27, 2023
+              DAISY Pipeline 2 - 1.14.15 - October 20, 2023
 ==============================================================================
 
 
@@ -72,10 +72,10 @@ The package includes:
 3. Release Notes
 ------------------------------------------------------------------------------
 
-The package includes the 1.14.14 version of the project.
+The package includes the 1.14.15 version of the project.
 
 See the release notes on this page:
-  https://github.com/daisy/pipeline-assembly/blob/master/NEWS.md#changes-in-release-v11414
+  https://github.com/daisy/pipeline-assembly/blob/master/NEWS.md#changes-in-release-v11415
 
 4. Prerequisites
 ------------------------------------------------------------------------------

src/main/resources/bin/pipeline2

@@ -464,7 +464,7 @@ run() {
             CLASSPATH="$CLASSPATH:system/simple-api"
         fi
         if [ "$MODE" = "webservice" ]; then
-            MAIN=org.daisy.pipeline.webservice.impl.PipelineWebService
+            MAIN=org.daisy.pipeline.webservice.restlet.impl.PipelineWebService
         else
             MAIN=SimpleAPI
         fi
@@ -492,6 +492,7 @@ run() {
 
     # Logback configuration file
     SYSTEM_PROPS="${SYSTEM_PROPS} -Dlogback.configurationFile=\"file:${PIPELINE2_CONFIG}/logback.xml\""
+    SYSTEM_PROPS="${SYSTEM_PROPS} -Djava.util.logging.config.file=${PIPELINE2_CONFIG}/logging.properties"
 
     # to make ${org.daisy.pipeline.data} available in felix.properties (for felix.cache.rootdir)
     if [ "$ENABLE_OSGI" = "true" ]; then

src/main/resources/bin/pipeline2.bat

@@ -216,16 +216,15 @@ goto :RUN_LOOP
                 rem )
             )
         )
-        set MAIN=org.daisy.pipeline.webservice.impl.PipelineWebService
+        set MAIN=org.daisy.pipeline.webservice.restlet.impl.PipelineWebService
     )
 
     rem Execute the Java Virtual Machine
     cd "%PIPELINE2_HOME%"
 
     rem Logback configuration file
     set SYSTEM_PROPS=%SYSTEM_PROPS% -Dlogback.configurationFile="file:%PIPELINE2_HOME:\=/%/etc/logback.xml"
-    rem Workaround for encoding bugs on Windows
-    set SYSTEM_PROPS=%SYSTEM_PROPS% -Dfile.encoding=UTF8
+    set SYSTEM_PROPS=%SYSTEM_PROPS% -Djava.util.logging.config.file="%PIPELINE2_HOME:\=/%/etc/logging.properties"
     rem to make ${org.daisy.pipeline.data} available in felix.properties (for felix.cache.rootdir)
     if %ENABLE_OSGI% == true (
         set SYSTEM_PROPS=%SYSTEM_PROPS% -Dorg.daisy.pipeline.data="%PIPELINE2_DATA%"

src/main/resources/etc/logging.properties

@@ -0,0 +1,7 @@
+handlers= java.util.logging.ConsoleHandler
+.level= FINE
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+org.restlet.level = SEVERE
+com.sun.jna.level = INFO
+sun.rmi.level = INFO