diff --git a/bom/pom.xml b/bom/pom.xml
index d351038c..cbe23cd7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -12,7 +12,7 @@
org.daisy.pipeline
framework-bom
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
pom
DAISY Pipeline 2 :: Framework BoM
@@ -80,7 +80,7 @@
org.daisy.pipeline
pipeline1-adapter
- 1.0.0-SNAPSHOT
+ 1.0.0
org.daisy.pipeline
@@ -90,7 +90,7 @@
org.daisy.pipeline
webservice
- 3.6.0-SNAPSHOT
+ 3.6.0
org.daisy.pipeline
diff --git a/calabash-adapter/pom.xml b/calabash-adapter/pom.xml
index ab33b8f2..fb964732 100644
--- a/calabash-adapter/pom.xml
+++ b/calabash-adapter/pom.xml
@@ -6,7 +6,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
diff --git a/common-utils/pom.xml b/common-utils/pom.xml
index 0e684a2e..22936e63 100644
--- a/common-utils/pom.xml
+++ b/common-utils/pom.xml
@@ -4,7 +4,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
diff --git a/framework-core/pom.xml b/framework-core/pom.xml
index 35b68ce9..e5200a2a 100644
--- a/framework-core/pom.xml
+++ b/framework-core/pom.xml
@@ -4,7 +4,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
framework-core
diff --git a/framework-persistence/pom.xml b/framework-persistence/pom.xml
index d03f57a5..175991e9 100644
--- a/framework-persistence/pom.xml
+++ b/framework-persistence/pom.xml
@@ -4,7 +4,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
framework-persistence
diff --git a/logging-appender/pom.xml b/logging-appender/pom.xml
index 57bcd90e..a6df450d 100644
--- a/logging-appender/pom.xml
+++ b/logging-appender/pom.xml
@@ -6,7 +6,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
diff --git a/modules-registry/pom.xml b/modules-registry/pom.xml
index a772fa1c..8987ab2f 100644
--- a/modules-registry/pom.xml
+++ b/modules-registry/pom.xml
@@ -6,7 +6,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
diff --git a/parent/pom.xml b/parent/pom.xml
index 0729cc7f..5f86ce37 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
pom
DAISY Pipeline 2 :: Framework Parent POM
@@ -110,7 +110,7 @@
org.daisy.pipeline
framework-bom
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
pom
import
diff --git a/persistence-derby/pom.xml b/persistence-derby/pom.xml
index b8e5eab6..8c909647 100644
--- a/persistence-derby/pom.xml
+++ b/persistence-derby/pom.xml
@@ -6,7 +6,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
diff --git a/persistence-mysql/pom.xml b/persistence-mysql/pom.xml
index 3a71b8c7..fbb68188 100644
--- a/persistence-mysql/pom.xml
+++ b/persistence-mysql/pom.xml
@@ -4,7 +4,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
org.daisy.pipeline
diff --git a/pipeline1-adapter/Makefile b/pipeline1-adapter/Makefile
index f3b88898..80dfef16 100644
--- a/pipeline1-adapter/Makefile
+++ b/pipeline1-adapter/Makefile
@@ -1,4 +1,4 @@
-include ../../assembly/make/enable-java-shell.mk
+include make/enable-java-shell.mk
PIPELINE1_VERSION := 20250106
diff --git a/pipeline1-adapter/make/.gitignore b/pipeline1-adapter/make/.gitignore
new file mode 100644
index 00000000..e82535b1
--- /dev/null
+++ b/pipeline1-adapter/make/.gitignore
@@ -0,0 +1,2 @@
+/recipes/
+.DS_Store
\ No newline at end of file
diff --git a/pipeline1-adapter/make/bin/darwin_amd64/eval-java b/pipeline1-adapter/make/bin/darwin_amd64/eval-java
new file mode 100755
index 00000000..ba6f2446
Binary files /dev/null and b/pipeline1-adapter/make/bin/darwin_amd64/eval-java differ
diff --git a/pipeline1-adapter/make/bin/darwin_arm64/eval-java b/pipeline1-adapter/make/bin/darwin_arm64/eval-java
new file mode 100755
index 00000000..1c85ed04
Binary files /dev/null and b/pipeline1-adapter/make/bin/darwin_arm64/eval-java differ
diff --git a/pipeline1-adapter/make/bin/linux_amd64/eval-java b/pipeline1-adapter/make/bin/linux_amd64/eval-java
new file mode 100755
index 00000000..7dcb27f3
Binary files /dev/null and b/pipeline1-adapter/make/bin/linux_amd64/eval-java differ
diff --git a/pipeline1-adapter/make/bin/linux_arm64/eval-java b/pipeline1-adapter/make/bin/linux_arm64/eval-java
new file mode 100755
index 00000000..6945ce0e
Binary files /dev/null and b/pipeline1-adapter/make/bin/linux_arm64/eval-java differ
diff --git a/pipeline1-adapter/make/bin/windows_amd64/eval-java.exe b/pipeline1-adapter/make/bin/windows_amd64/eval-java.exe
new file mode 100755
index 00000000..cce8d6b4
Binary files /dev/null and b/pipeline1-adapter/make/bin/windows_amd64/eval-java.exe differ
diff --git a/pipeline1-adapter/make/enable-java-shell.mk b/pipeline1-adapter/make/enable-java-shell.mk
new file mode 100644
index 00000000..80b7674e
--- /dev/null
+++ b/pipeline1-adapter/make/enable-java-shell.mk
@@ -0,0 +1,39 @@
+ifneq ($(firstword $(sort $(MAKE_VERSION) 3.82)), 3.82)
+$(error "GNU Make 3.82 is required to run this script")
+endif
+
+ifeq ($(OS),Windows_NT)
+SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/windows_amd64/eval-java.exe
+else
+UNAME_S := $(shell uname -s)
+UNAME_P := $(shell uname -p)
+ifeq ($(UNAME_S),Darwin)
+ifneq ($(filter arm%,$(UNAME_P))$(filter aarch%,$(UNAME_P)),)
+SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_arm64/eval-java
+else
+SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_amd64/eval-java
+endif
+else
+ifeq ($(UNAME_S),Linux)
+ifneq ($(filter arm%,$(UNAME_P))$(filter aarch%,$(UNAME_P)),)
+SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_arm64/eval-java
+else
+SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_amd64/eval-java
+endif
+else
+SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/windows_amd64/eval-java.exe
+endif
+endif
+endif
+.SHELLFLAGS :=
+
+JAVA_VERSION := $(shell println(getJavaVersion());)
+
+ifeq ($(JAVA_VERSION),)
+# probably because java not found or exited with a UnsupportedClassVersionError
+$(error "Java 8 is required to run this script")
+else ifeq ($(shell println($(JAVA_VERSION) >= 8);), false)
+$(error "Java 8 is required to run this script")
+endif
+
+OS := $(shell println(getOS());)
diff --git a/pipeline1-adapter/make/eval_java.class b/pipeline1-adapter/make/eval_java.class
new file mode 100644
index 00000000..e2f3b6a1
Binary files /dev/null and b/pipeline1-adapter/make/eval_java.class differ
diff --git a/pipeline1-adapter/make/lib/jline-1.0.jar b/pipeline1-adapter/make/lib/jline-1.0.jar
new file mode 100644
index 00000000..d2592796
Binary files /dev/null and b/pipeline1-adapter/make/lib/jline-1.0.jar differ
diff --git a/pipeline1-adapter/make/lib/lib/util$1.class b/pipeline1-adapter/make/lib/lib/util$1.class
new file mode 100644
index 00000000..85680586
Binary files /dev/null and b/pipeline1-adapter/make/lib/lib/util$1.class differ
diff --git a/pipeline1-adapter/make/lib/lib/util$OS.class b/pipeline1-adapter/make/lib/lib/util$OS.class
new file mode 100644
index 00000000..ef005dc0
Binary files /dev/null and b/pipeline1-adapter/make/lib/lib/util$OS.class differ
diff --git a/pipeline1-adapter/make/lib/lib/util.class b/pipeline1-adapter/make/lib/lib/util.class
new file mode 100644
index 00000000..b3b7bca3
Binary files /dev/null and b/pipeline1-adapter/make/lib/lib/util.class differ
diff --git a/pipeline1-adapter/pom.xml b/pipeline1-adapter/pom.xml
index b0b0526f..3dd89b04 100644
--- a/pipeline1-adapter/pom.xml
+++ b/pipeline1-adapter/pom.xml
@@ -6,13 +6,13 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent/
org.daisy.pipeline
pipeline1-adapter
- 1.0.0-SNAPSHOT
+ 1.0.1-SNAPSHOT
bundle
DAISY Pipeline 2 :: Pipeline 1 backend
@@ -100,30 +100,27 @@
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -169,4 +166,4 @@
-
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5449c32b..ffd2d4ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.daisy.pipeline
framework-aggregator
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
pom
DAISY Pipeline 2 :: Framework Aggregator
diff --git a/saxon-adapter/pom.xml b/saxon-adapter/pom.xml
index f2ec5c11..0cdb436c 100644
--- a/saxon-adapter/pom.xml
+++ b/saxon-adapter/pom.xml
@@ -6,7 +6,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
@@ -242,4 +242,4 @@
-
+
\ No newline at end of file
diff --git a/utils/clientlib-java-jaxb/pom.xml b/utils/clientlib-java-jaxb/pom.xml
index 5164f4ad..58beff64 100644
--- a/utils/clientlib-java-jaxb/pom.xml
+++ b/utils/clientlib-java-jaxb/pom.xml
@@ -4,7 +4,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../../parent
org.daisy.pipeline
diff --git a/utils/xproc-engine-daisy-pipeline-logging/pom.xml b/utils/xproc-engine-daisy-pipeline-logging/pom.xml
index 762b8d92..b847311f 100644
--- a/utils/xproc-engine-daisy-pipeline-logging/pom.xml
+++ b/utils/xproc-engine-daisy-pipeline-logging/pom.xml
@@ -6,7 +6,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../../parent
diff --git a/utils/xproc-engine-daisy-pipeline/pom.xml b/utils/xproc-engine-daisy-pipeline/pom.xml
index 728f21a0..92502a44 100644
--- a/utils/xproc-engine-daisy-pipeline/pom.xml
+++ b/utils/xproc-engine-daisy-pipeline/pom.xml
@@ -6,7 +6,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../../parent
diff --git a/webservice/pom.xml b/webservice/pom.xml
index d9f7940e..7cca9602 100644
--- a/webservice/pom.xml
+++ b/webservice/pom.xml
@@ -6,12 +6,12 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
webservice
- 3.6.0-SNAPSHOT
+ 3.6.1-SNAPSHOT
bundle
DAISY Pipeline 2 :: Web Service
diff --git a/woodstox-osgi-adapter/pom.xml b/woodstox-osgi-adapter/pom.xml
index 786477ff..9fe607b2 100644
--- a/woodstox-osgi-adapter/pom.xml
+++ b/woodstox-osgi-adapter/pom.xml
@@ -6,7 +6,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent
diff --git a/xproc-api/pom.xml b/xproc-api/pom.xml
index 3fa315c7..25cdb0d8 100644
--- a/xproc-api/pom.xml
+++ b/xproc-api/pom.xml
@@ -6,7 +6,7 @@
org.daisy.pipeline
framework-parent
- 1.15.0-SNAPSHOT
+ 1.15.1-SNAPSHOT
../parent