From 6e186b54a05b466d670887b73a85d3e1322f1e83 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Mon, 19 Jun 2023 23:27:06 +0200 Subject: [PATCH 1/8] Update java-shell-for-make to revision 2d24cb036c --- make/lib/util$1.class | Bin 2048 -> 2048 bytes make/lib/util.class | Bin 17600 -> 17636 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/make/lib/util$1.class b/make/lib/util$1.class index d8937620770615f7e97bd13b502c8b391fb8eeb9..ed1eac04d0d7356007ec8a64729bdc81ef1a60d1 100644 GIT binary patch delta 45 xcmZn=Xb{-2h>h{)h{a*CB~WGpm^{U91^{CR50C%= diff --git a/make/lib/util.class b/make/lib/util.class index b7d1fbc3f22ba1d77e255036f3933348439dc0d2..fc7523d0b9c7a861c8e0327ac253384d3ffd304a 100644 GIT binary patch delta 6485 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 From ebf72a07e1944e5e33ab3fa615f7ee0185295811 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 20 Jun 2023 16:15:29 +0200 Subject: [PATCH 2/8] Fix Docker build fixes commit 287b713 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 03d6adba..def13eb0 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,7 @@ ifndef DUMP_PROFILES mkdirs("target/docker"); \ exec("cp", "src/main/docker/Dockerfile", "target/docker/Dockerfile"); 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 From 069d62c215e3b4b99967be733c7548d41f5f1e65 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 20 Jun 2023 16:27:44 +0200 Subject: [PATCH 3/8] Log to STDOUT when run from Docker container fixup 2c6406fd80 --- Makefile | 1 + src/main/docker/Dockerfile | 1 + src/main/docker/logback.xml | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 src/main/docker/logback.xml diff --git a/Makefile b/Makefile index def13eb0..47e2f8d3 100644 --- a/Makefile +++ b/Makefile @@ -184,6 +184,7 @@ 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 3,$^)", "target/docker/jre"); exec(new File("target/docker"), \ diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 39f9fd66..13fc7de5 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,6 +1,7 @@ FROM debian:stretch 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 new file mode 100644 index 00000000..d31db884 --- /dev/null +++ b/src/main/docker/logback.xml @@ -0,0 +1,25 @@ + + + + + + %-5level %marker [%40.40logger{40}] %msg @%class{36}:%L#%M%n + + + + + + + + + + + + + + + + + + + From 83e7c4117c1be84b0ba9d97c97c1e00f93ea74a4 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 20 Jun 2023 16:52:12 +0200 Subject: [PATCH 4/8] Docker: update to debian:bookworm --- src/main/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 13fc7de5..ecaa0edb 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -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 From 3d33340926b10df03463a8d47a3e2584de4a0169 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 20 Jun 2023 18:18:10 +0200 Subject: [PATCH 5/8] Update to JDK 17.0.7+7 --- Makefile | 71 +++++++++++++++++++++------------------------------ build-jre.xml | 12 ++++----- 2 files changed, 35 insertions(+), 48 deletions(-) diff --git a/Makefile b/Makefile index 47e2f8d3..b4cd67f3 100644 --- a/Makefile +++ b/Makefile @@ -423,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)/$ build-jre-linux @@ -58,7 +58,7 @@ jdk.zipfs - src/main/jre/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8/jdk-11.0.13+8/jmods + src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7/jmods @@ -94,7 +94,7 @@ jdk.zipfs - src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7/jdk-17.0.3+7/Contents/Home/jmods + src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7/Contents/Home/jmods @@ -106,7 +106,7 @@ build-jre-win32 @@ -127,7 +127,7 @@ jdk.zipfs - src/main/jre/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.13_8/jdk-11.0.13+8/jmods + src/main/jre/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.7_7/jdk-17.0.7+7/jmods @@ -157,7 +157,7 @@ jdk.zipfs - src/main/jre/OpenJDK11U-jdk_x64_windows_hotspot_11.0.13_8/jdk-11.0.13+8/jmods + src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7/jmods From 4be3ad91160a58c83fa7389f2439a2de51062143 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 20 Jun 2023 18:25:40 +0200 Subject: [PATCH 6/8] Update to latest framework --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3438855..6ea63514 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ org.daisy.pipeline framework-bom - 1.14.12 + 1.14.13 pom import From ac2c633ff11c40e6a598aec9856fa83de0413fa4 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 27 Jun 2023 15:14:19 +0200 Subject: [PATCH 7/8] [maven-release-plugin] prepare release v1.14.14 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6ea63514..b6eca5ee 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.daisy.pipeline assembly - 1.14.14-SNAPSHOT + 1.14.14 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.14 2.1.7 From f5ede2b74483589affd085bd30e8d1250e03de6b Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 27 Jun 2023 15:14:20 +0200 Subject: [PATCH 8/8] [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 b6eca5ee..5ce51de8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.daisy.pipeline assembly - 1.14.14 + 1.14.15-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.14 + HEAD 2.1.7