Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.15.0 #216

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Release v1.15.0 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08b7368
Resolve snapshot dependencies (BOMs/parents)
bertfrees Jan 27, 2025
0b0102c
Disable modules that should not be released
bertfrees Jan 27, 2025
9288847
Fix pipeline1-adapter Makefile
bertfrees Jan 27, 2025
e502b0e
[maven-release-plugin] prepare release v1.15.0
bertfrees Jan 27, 2025
5c04938
[maven-release-plugin] prepare for next development iteration
bertfrees Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-bom</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>DAISY Pipeline 2 :: Framework BoM</name>
Expand Down Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>org.daisy.pipeline</groupId>
<artifactId>pipeline1-adapter</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.daisy.pipeline</groupId>
Expand All @@ -90,7 +90,7 @@
<dependency>
<groupId>org.daisy.pipeline</groupId>
<artifactId>webservice</artifactId>
<version>3.6.0-SNAPSHOT</version>
<version>3.6.0</version>
</dependency>
<dependency>
<groupId>org.daisy.pipeline</groupId>
Expand Down
2 changes: 1 addition & 1 deletion calabash-adapter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion framework-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>framework-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion framework-persistence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>framework-persistence</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion logging-appender/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules-registry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>DAISY Pipeline 2 :: Framework Parent POM</name>
Expand Down Expand Up @@ -110,7 +110,7 @@
<dependency>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-bom</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion persistence-derby/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion persistence-mysql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.daisy.pipeline</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pipeline1-adapter/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include ../../assembly/make/enable-java-shell.mk
include make/enable-java-shell.mk

PIPELINE1_VERSION := 20250106

Expand Down
2 changes: 2 additions & 0 deletions pipeline1-adapter/make/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/recipes/
.DS_Store
Binary file added pipeline1-adapter/make/bin/darwin_amd64/eval-java
View file
Open in desktop
Binary file not shown.
Binary file added pipeline1-adapter/make/bin/darwin_arm64/eval-java
View file
Open in desktop
Binary file not shown.
Binary file added pipeline1-adapter/make/bin/linux_amd64/eval-java
View file
Open in desktop
Binary file not shown.
Binary file added pipeline1-adapter/make/bin/linux_arm64/eval-java
View file
Open in desktop
Binary file not shown.
Binary file added pipeline1-adapter/make/bin/windows_amd64/eval-java.exe
View file
Open in desktop
Binary file not shown.
39 changes: 39 additions & 0 deletions pipeline1-adapter/make/enable-java-shell.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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());)
Binary file added pipeline1-adapter/make/eval_java.class
View file
Open in desktop
Binary file not shown.
Binary file added pipeline1-adapter/make/lib/jline-1.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added pipeline1-adapter/make/lib/lib/util$1.class
View file
Open in desktop
Binary file not shown.
Binary file added pipeline1-adapter/make/lib/lib/util$OS.class
View file
Open in desktop
Binary file not shown.
Binary file added pipeline1-adapter/make/lib/lib/util.class
View file
Open in desktop
Binary file not shown.
37 changes: 17 additions & 20 deletions pipeline1-adapter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent/</relativePath>
</parent>

<groupId>org.daisy.pipeline</groupId>
<artifactId>pipeline1-adapter</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>DAISY Pipeline 2 :: Pipeline 1 backend</name>
Expand Down Expand Up @@ -100,30 +100,27 @@
<configuration>
<tasks>
<exec executable="make" failonerror="true">
<arg value="src/main/resources/pipeline-${pipeline1.version}.zip"/>
<arg value="src/main/resources/pipeline-${pipeline1.version}.zip" />
</exec>
<unzip src="src/main/resources/pipeline-${pipeline1.version}.zip"
dest="${project.build.directory}/generated-resources/pipeline1">
<unzip src="src/main/resources/pipeline-${pipeline1.version}.zip" dest="${project.build.directory}/generated-resources/pipeline1">
<patternset>
<exclude name="pipeline-${pipeline1.version}/pipeline.sh"/>
<exclude name="pipeline-${pipeline1.version}/pipeline.bat"/>
<exclude name="pipeline-${pipeline1.version}/pipeline.user.properties"/>
<exclude name="pipeline-${pipeline1.version}/licenses/**"/>
<exclude name="pipeline-${pipeline1.version}/rmi/**"/>
<exclude name="pipeline-${pipeline1.version}/transformers/**"/>
<exclude name="pipeline-${pipeline1.version}/pipeline.sh" />
<exclude name="pipeline-${pipeline1.version}/pipeline.bat" />
<exclude name="pipeline-${pipeline1.version}/pipeline.user.properties" />
<exclude name="pipeline-${pipeline1.version}/licenses/**" />
<exclude name="pipeline-${pipeline1.version}/rmi/**" />
<exclude name="pipeline-${pipeline1.version}/transformers/**" />
</patternset>
<cutdirsmapper dirs="1"/>
<cutdirsmapper dirs="1" />
</unzip>
<unzip src="src/main/resources/pipeline-${pipeline1.version}.zip"
dest="${project.build.directory}/tmp/unzip-pipeline-${pipeline1.version}/">
<unzip src="src/main/resources/pipeline-${pipeline1.version}.zip" dest="${project.build.directory}/tmp/unzip-pipeline-${pipeline1.version}/">
<patternset>
<include name="pipeline-${pipeline1.version}/transformers/**"/>
<include name="pipeline-${pipeline1.version}/transformers/**" />
</patternset>
<cutdirsmapper dirs="1"/>
<cutdirsmapper dirs="1" />
</unzip>
<jar destfile="${project.build.directory}/generated-resources/pipeline1/transformers.jar"
basedir="${project.build.directory}/tmp/unzip-pipeline-${pipeline1.version}/transformers"/>
<delete dir="${project.build.directory}/tmp/unzip-pipeline-${pipeline1.version}"/>
<jar destfile="${project.build.directory}/generated-resources/pipeline1/transformers.jar" basedir="${project.build.directory}/tmp/unzip-pipeline-${pipeline1.version}/transformers" />
<delete dir="${project.build.directory}/tmp/unzip-pipeline-${pipeline1.version}" />
</tasks>
</configuration>
<goals>
Expand Down Expand Up @@ -169,4 +166,4 @@
</plugins>
</build>

</project>
</project>
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-aggregator</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>DAISY Pipeline 2 :: Framework Aggregator</name>
Expand Down
4 changes: 2 additions & 2 deletions saxon-adapter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down Expand Up @@ -242,4 +242,4 @@
</profile>
</profiles>

</project>
</project>
2 changes: 1 addition & 1 deletion utils/clientlib-java-jaxb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.daisy.pipeline</groupId>
Expand Down
2 changes: 1 addition & 1 deletion utils/xproc-engine-daisy-pipeline-logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion utils/xproc-engine-daisy-pipeline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions webservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

<artifactId>webservice</artifactId>
<version>3.6.0-SNAPSHOT</version>
<version>3.6.1-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>DAISY Pipeline 2 :: Web Service</name>
Expand Down
2 changes: 1 addition & 1 deletion woodstox-osgi-adapter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion xproc-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline</groupId>
<artifactId>framework-parent</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>1.15.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down