From 4bf56d120624d2830e0cda79f3a8e3e165507492 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Sat, 10 Dec 2022 21:56:29 +0100 Subject: [PATCH 01/11] Rename base-{win,mac,linux}.xml to bin-{win,mac,linux}.xml --- .../assembly/components/{base-linux.xml => bin-linux.xml} | 0 src/main/assembly/components/{base-mac.xml => bin-mac.xml} | 0 src/main/assembly/components/{base-win.xml => bin-win.xml} | 0 src/main/assembly/dist-linux.xml | 2 +- src/main/assembly/dist-mac.xml | 2 +- src/main/assembly/dist-minimal.xml | 4 ++-- src/main/assembly/dist-win.xml | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename src/main/assembly/components/{base-linux.xml => bin-linux.xml} (100%) rename src/main/assembly/components/{base-mac.xml => bin-mac.xml} (100%) rename src/main/assembly/components/{base-win.xml => bin-win.xml} (100%) diff --git a/src/main/assembly/components/base-linux.xml b/src/main/assembly/components/bin-linux.xml similarity index 100% rename from src/main/assembly/components/base-linux.xml rename to src/main/assembly/components/bin-linux.xml diff --git a/src/main/assembly/components/base-mac.xml b/src/main/assembly/components/bin-mac.xml similarity index 100% rename from src/main/assembly/components/base-mac.xml rename to src/main/assembly/components/bin-mac.xml diff --git a/src/main/assembly/components/base-win.xml b/src/main/assembly/components/bin-win.xml similarity index 100% rename from src/main/assembly/components/base-win.xml rename to src/main/assembly/components/bin-win.xml diff --git a/src/main/assembly/dist-linux.xml b/src/main/assembly/dist-linux.xml index 27d2038c..cbdaf6c0 100644 --- a/src/main/assembly/dist-linux.xml +++ b/src/main/assembly/dist-linux.xml @@ -8,7 +8,7 @@ daisy-pipeline src/main/assembly/components/base.xml - src/main/assembly/components/base-linux.xml + src/main/assembly/components/bin-linux.xml src/main/assembly/components/jars.xml src/main/assembly/components/jars-linux.xml src/main/assembly/components/cli-linux.xml diff --git a/src/main/assembly/dist-mac.xml b/src/main/assembly/dist-mac.xml index 52d3ea24..5cb61040 100644 --- a/src/main/assembly/dist-mac.xml +++ b/src/main/assembly/dist-mac.xml @@ -8,7 +8,7 @@ daisy-pipeline src/main/assembly/components/base.xml - src/main/assembly/components/base-mac.xml + src/main/assembly/components/bin-mac.xml src/main/assembly/components/jars.xml src/main/assembly/components/jars-mac.xml src/main/assembly/components/cli-mac.xml diff --git a/src/main/assembly/dist-minimal.xml b/src/main/assembly/dist-minimal.xml index fc1600c9..2eb61d0b 100644 --- a/src/main/assembly/dist-minimal.xml +++ b/src/main/assembly/dist-minimal.xml @@ -8,8 +8,8 @@ daisy-pipeline src/main/assembly/components/base.xml - src/main/assembly/components/base-linux.xml - src/main/assembly/components/base-win.xml + src/main/assembly/components/bin-linux.xml + src/main/assembly/components/bin-win.xml src/main/assembly/components/updater-all.xml diff --git a/src/main/assembly/dist-win.xml b/src/main/assembly/dist-win.xml index ffd6bb8b..6dbd73c9 100644 --- a/src/main/assembly/dist-win.xml +++ b/src/main/assembly/dist-win.xml @@ -8,7 +8,7 @@ daisy-pipeline src/main/assembly/components/base.xml - src/main/assembly/components/base-win.xml + src/main/assembly/components/bin-win.xml src/main/assembly/components/jars.xml src/main/assembly/components/jars-win.xml src/main/assembly/components/cli-win.xml From 249e9adfc885d4d76b45c73d932a14f42975d0b7 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 19 Sep 2023 11:36:23 +0200 Subject: [PATCH 02/11] Update to latest framework and modules - logging-activator does not exist anymore - Remove some vulnerable dependencies - An encoding bug has been fixed --- pom.xml | 57 +++++++--------------------- src/main/resources/bin/pipeline2 | 2 +- src/main/resources/bin/pipeline2.bat | 4 +- 3 files changed, 15 insertions(+), 48 deletions(-) diff --git a/pom.xml b/pom.xml index 5ce51de8..17d7e575 100644 --- a/pom.xml +++ b/pom.xml @@ -69,14 +69,14 @@ org.daisy.pipeline framework-bom - 1.14.13 + 1.14.14 pom import org.daisy.pipeline.modules modules-bom - 1.14.14 + 1.14.15 pom import @@ -147,16 +147,6 @@ - - org.daisy.pipeline - logging-activator - - - * - * - - - org.daisy.pipeline modules-registry @@ -1356,26 +1346,6 @@ - - org.codehaus.jackson - jackson-core-asl - - - * - * - - - - - org.codehaus.jackson - jackson-mapper-asl - - - * - * - - - org.json json @@ -1819,10 +1789,6 @@ org.daisy.pipeline logging-appender - - org.daisy.pipeline - logging-activator - org.daisy.pipeline modules-registry @@ -2527,14 +2493,6 @@ org.apache.commons commons-compress - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - @@ -2569,6 +2527,17 @@ jing 20120724.0.0 + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/src/main/resources/bin/pipeline2 b/src/main/resources/bin/pipeline2 index cf4d8dfb..b198890c 100755 --- a/src/main/resources/bin/pipeline2 +++ b/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 diff --git a/src/main/resources/bin/pipeline2.bat b/src/main/resources/bin/pipeline2.bat index 051ca60a..d194e9fa 100755 --- a/src/main/resources/bin/pipeline2.bat +++ b/src/main/resources/bin/pipeline2.bat @@ -216,7 +216,7 @@ 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 @@ -224,8 +224,6 @@ goto :RUN_LOOP 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 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%" From fc93bad3efe3614c829c91b93b5eaec828926b7b Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Mon, 10 Jul 2023 11:23:08 +0200 Subject: [PATCH 03/11] Log JUL messages to stdout through logging.properties configuration file This is a (temporary) workaround because for some reason logging-activator does not work anymore (when used in the assembly). --- pom.xml | 16 ++++++++++++++-- src/main/deb/DEBIAN/conffiles | 1 + src/main/resources/bin/pipeline2 | 1 + src/main/resources/bin/pipeline2.bat | 1 + src/main/resources/etc/logging.properties | 7 +++++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/etc/logging.properties diff --git a/pom.xml b/pom.xml index 17d7e575..b8b52974 100644 --- a/pom.xml +++ b/pom.xml @@ -1868,10 +1868,16 @@ org.slf4j slf4j-api - + + org.slf4j jcl-over-slf4j @@ -3308,6 +3314,7 @@ felix.properties, logback.xml, + logging.properties, pipeline.properties @@ -3332,6 +3339,11 @@ src/main/resources/etc/logback.xml ${deb.pipeline.config}/logback.xml + + file + src/main/resources/etc/logging.properties + ${deb.pipeline.config}/logging.properties + link true diff --git a/src/main/deb/DEBIAN/conffiles b/src/main/deb/DEBIAN/conffiles index c3a92e8d..fedd11c6 100644 --- a/src/main/deb/DEBIAN/conffiles +++ b/src/main/deb/DEBIAN/conffiles @@ -1,2 +1,3 @@ ${deb.pipeline.config}/logback.xml +${deb.pipeline.config}/logging.properties /etc/default/daisy-pipeline2 \ No newline at end of file diff --git a/src/main/resources/bin/pipeline2 b/src/main/resources/bin/pipeline2 index b198890c..b0c41400 100755 --- a/src/main/resources/bin/pipeline2 +++ b/src/main/resources/bin/pipeline2 @@ -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 diff --git a/src/main/resources/bin/pipeline2.bat b/src/main/resources/bin/pipeline2.bat index d194e9fa..e4e46a2c 100755 --- a/src/main/resources/bin/pipeline2.bat +++ b/src/main/resources/bin/pipeline2.bat @@ -224,6 +224,7 @@ goto :RUN_LOOP rem Logback configuration file set SYSTEM_PROPS=%SYSTEM_PROPS% -Dlogback.configurationFile="file:%PIPELINE2_HOME:\=/%/etc/logback.xml" + 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%" diff --git a/src/main/resources/etc/logging.properties b/src/main/resources/etc/logging.properties new file mode 100644 index 00000000..aeef676f --- /dev/null +++ b/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 From 4a158d7e5c3be0d692f4528578624dc4877defe1 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Wed, 20 Sep 2023 12:05:34 +0200 Subject: [PATCH 04/11] Add tts-adapter-azure (and update to modules 1.14.16) --- pom.xml | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8b52974..f19425b6 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ org.daisy.pipeline.modules modules-bom - 1.14.15 + 1.14.16 pom import @@ -976,6 +976,16 @@ + + org.daisy.pipeline.modules + tts-adapter-azure + + + * + * + + + org.daisy.pipeline.modules tts-adapter-cereproc @@ -1346,6 +1356,16 @@ + + com.microsoft.cognitiveservices.speech + client-sdk + + + * + * + + + org.json json @@ -2340,6 +2360,10 @@ org.daisy.pipeline.modules tts-adapter-acapela + + org.daisy.pipeline.modules + tts-adapter-azure + org.daisy.pipeline.modules tts-adapter-cereproc @@ -2499,6 +2523,15 @@ org.apache.commons commons-compress + + + com.microsoft.cognitiveservices.speech + client-sdk + From f216659e8fc1e05a664edccb0774727beb85673a Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Fri, 13 Oct 2023 16:59:17 +0200 Subject: [PATCH 05/11] Update to framework 1.14.15 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f19425b6..0cd85a0d 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ org.daisy.pipeline framework-bom - 1.14.14 + 1.14.15 pom import From 8b986da20ce07cf2b8b5a4b68eb26fca062c74e7 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Thu, 21 Sep 2023 18:43:46 +0200 Subject: [PATCH 06/11] Add "snapshots" profile to .mvn/settings.xml It can be enabled in cases where you want to pull snapshot artifacts from the OSS Sonatype snapshots repo. --- .mvn/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.mvn/settings.xml b/.mvn/settings.xml index f486db5f..f523b5b4 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -29,8 +29,30 @@ + + snapshots + + false + + + + sonatype-snapshots + OSS Sonatype repo (snapshots) + https://oss.sonatype.org/content/repositories/snapshots/ + + false + + + true + always + warn + + + + central-https + From f0b49836da807b208858efbb5dc41940e941437b Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Sun, 8 Oct 2023 14:32:59 +0200 Subject: [PATCH 07/11] Release notes --- NEWS.md | 28 ++++++++++++++++++++++++++++ src/main/resources/README.txt | 6 +++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index b895d780..b85511b2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,31 @@ +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 +- 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 =========================== diff --git a/src/main/resources/README.txt b/src/main/resources/README.txt index c526298e..10740fae 100644 --- a/src/main/resources/README.txt +++ b/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 ------------------------------------------------------------------------------ From dec970add576a3ac4974ce788794a902f505294a Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 17 Oct 2023 13:11:14 +0200 Subject: [PATCH 08/11] Don't disable jul-to-slf4j because it breaks OSGi support This reverts commit fc93bad --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0cd85a0d..d5fa875e 100644 --- a/pom.xml +++ b/pom.xml @@ -1894,10 +1894,10 @@ assembly. (It does work in unit tests.) As a workaround, log JUL messages to stdout through the logging.properties configuration file. --> - + org.slf4j jcl-over-slf4j From 2aa065853884abd068acbe5e082e8ab602218540 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 17 Oct 2023 17:21:51 +0200 Subject: [PATCH 09/11] Update to modules 1.14.17 --- NEWS.md | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index b85511b2..5c1a8444 100644 --- a/NEWS.md +++ b/NEWS.md @@ -15,6 +15,7 @@ Changes in release v1.14.15 - **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) diff --git a/pom.xml b/pom.xml index d5fa875e..c3bbf80a 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ org.daisy.pipeline.modules modules-bom - 1.14.16 + 1.14.17 pom import From 06aef9f589098524f66eca76b556bebccb36e18f Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Fri, 20 Oct 2023 21:47:49 +0200 Subject: [PATCH 10/11] [maven-release-plugin] prepare release v1.14.15 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c3bbf80a..6f29f2f4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.daisy.pipeline assembly - 1.14.15-SNAPSHOT + 1.14.15 pom DAISY Pipeline 2 :: Assembly Builds the main distribution of the DAISY Pipeline 2. @@ -17,7 +17,7 @@ scm:git:git@github.com:daisy/pipeline-assembly.git scm:git:git@github.com:daisy/pipeline-assembly.git scm:git:git@github.com:daisy/pipeline-assembly.git - HEAD + v1.14.15 2.1.7 From 58144c87343c87fbacedead4f0cd0fd67d916080 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Fri, 20 Oct 2023 21:47:49 +0200 Subject: [PATCH 11/11] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6f29f2f4..ad6d16a3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.daisy.pipeline assembly - 1.14.15 + 1.14.16-SNAPSHOT pom DAISY Pipeline 2 :: Assembly Builds the main distribution of the DAISY Pipeline 2. @@ -17,7 +17,7 @@ scm:git:git@github.com:daisy/pipeline-assembly.git scm:git:git@github.com:daisy/pipeline-assembly.git scm:git:git@github.com:daisy/pipeline-assembly.git - v1.14.15 + HEAD 2.1.7