Skip to content

Commit 188fc87

Browse files
committed
[maven-release-plugin] prepare release v1.10.4
1 parent de1d1d7 commit 188fc87

File tree

1 file changed

+91
-91
lines changed

1 file changed

+91
-91
lines changed

pom.xml

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
<groupId>org.daisy</groupId>
66
<artifactId>daisy</artifactId>
77
<version>2</version>
8-
<relativePath/>
8+
<relativePath />
99
</parent>
1010
<groupId>org.daisy.pipeline</groupId>
1111
<artifactId>assembly</artifactId>
12-
<version>1.10.4-SNAPSHOT</version>
12+
<version>1.10.4</version>
1313
<packaging>pom</packaging>
1414
<name>DAISY Pipeline 2 :: Assembly</name>
1515
<description>Builds the main distribution of the DAISY Pipeline 2.</description>
1616
<scm>
1717
<connection>scm:git:git@github.com:daisy-consortium/pipeline-assembly.git</connection>
1818
<url>scm:git:git@github.com:daisy-consortium/pipeline-assembly.git</url>
1919
<developerConnection>scm:git:git@github.com:daisy-consortium/pipeline-assembly.git</developerConnection>
20-
<tag>HEAD</tag>
20+
<tag>v1.10.4</tag>
2121
</scm>
2222
<properties>
2323
<cli.version>2.1.0</cli.version>
@@ -1197,10 +1197,10 @@
11971197
<configuration>
11981198
<target>
11991199
<java classname="net.sf.saxon.Transform">
1200-
<arg value="target/tmp/effective-pom.xml"/>
1201-
<arg value="src/main/xslt/pom-to-release.xslt"/>
1202-
<arg value="time=${maven.build.timestamp}"/>
1203-
<arg line="-o:./target/release-descriptor/releaseDescriptor.xml"/>
1200+
<arg value="target/tmp/effective-pom.xml" />
1201+
<arg value="src/main/xslt/pom-to-release.xslt" />
1202+
<arg value="time=${maven.build.timestamp}" />
1203+
<arg line="-o:./target/release-descriptor/releaseDescriptor.xml" />
12041204
</java>
12051205
</target>
12061206
</configuration>
@@ -1242,7 +1242,7 @@
12421242
</goals>
12431243
</pluginExecutionFilter>
12441244
<action>
1245-
<ignore/>
1245+
<ignore />
12461246
</action>
12471247
</pluginExecution>
12481248
<pluginExecution>
@@ -1255,7 +1255,7 @@
12551255
</goals>
12561256
</pluginExecutionFilter>
12571257
<action>
1258-
<ignore/>
1258+
<ignore />
12591259
</action>
12601260
</pluginExecution>
12611261
</pluginExecutions>
@@ -1438,36 +1438,36 @@
14381438
</goals>
14391439
<configuration>
14401440
<target xmlns:fx="javafx:com.sun.javafx.tools.ant">
1441-
<taskdef resource="com/sun/javafx/tools/ant/antlib.xml" uri="javafx:com.sun.javafx.tools.ant" classpath="${env.JAVA_HOME}/lib/ant-javafx.jar"/>
1441+
<taskdef resource="com/sun/javafx/tools/ant/antlib.xml" uri="javafx:com.sun.javafx.tools.ant" classpath="${env.JAVA_HOME}/lib/ant-javafx.jar" />
14421442
<fx:deploy outdir="${project.build.directory}/javapackager" outfile="dp2" nativeBundles="image">
14431443
<fx:application id="org.daisy.pipeline2" mainClass="org.apache.felix.main.Main" name="DAISY Pipeline 2" version="${project.version}">
14441444
</fx:application>
14451445
<fx:info description="A tool for automated production of accessible digital publication" title="DAISY Pipeline 2" vendor="DAISY Consortium">
1446-
<fx:icon href="${project.basedir}/src/main/mac/pipeline-logo.icns"/>
1446+
<fx:icon href="${project.basedir}/src/main/mac/pipeline-logo.icns" />
14471447
</fx:info>
14481448
<fx:platform j2se="8.0+">
1449-
<fx:jvmarg value="-Xms256M"/>
1450-
<fx:jvmarg value="-Xmx1G"/>
1451-
<fx:jvmarg value="-XX:PermSize=16M"/>
1452-
<fx:jvmarg value="-XX:MaxPermSize=256M"/>
1453-
<fx:property name="org.daisy.pipeline.main.mode" value="gui"/>
1454-
<fx:property name="org.daisy.pipeline.home" value="."/>
1455-
<fx:property name="org.daisy.pipeline.data" value="data"/>
1456-
<fx:property name="org.daisy.pipeline.base" value="."/>
1457-
<fx:property name="org.daisy.pipeline.ws.localfs" value="true"/>
1458-
<fx:property name="org.daisy.pipeline.ws.authentication" value="false"/>
1459-
<fx:property name="felix.config.properties" value="file:etc/config.properties"/>
1460-
<fx:property name="felix.system.properties" value="file:etc/system.properties"/>
1449+
<fx:jvmarg value="-Xms256M" />
1450+
<fx:jvmarg value="-Xmx1G" />
1451+
<fx:jvmarg value="-XX:PermSize=16M" />
1452+
<fx:jvmarg value="-XX:MaxPermSize=256M" />
1453+
<fx:property name="org.daisy.pipeline.main.mode" value="gui" />
1454+
<fx:property name="org.daisy.pipeline.home" value="." />
1455+
<fx:property name="org.daisy.pipeline.data" value="data" />
1456+
<fx:property name="org.daisy.pipeline.base" value="." />
1457+
<fx:property name="org.daisy.pipeline.ws.localfs" value="true" />
1458+
<fx:property name="org.daisy.pipeline.ws.authentication" value="false" />
1459+
<fx:property name="felix.config.properties" value="file:etc/config.properties" />
1460+
<fx:property name="felix.system.properties" value="file:etc/system.properties" />
14611461
</fx:platform>
14621462
<fx:resources>
1463-
<fx:fileset type="jar" dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline" includes="system/bootstrap/felix.jar"/>
1464-
<fx:fileset type="license" os="osx" dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline" includes="NOTICE.txt"/>
1463+
<fx:fileset type="jar" dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline" includes="system/bootstrap/felix.jar" />
1464+
<fx:fileset type="license" os="osx" dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline" includes="NOTICE.txt" />
14651465
<fx:fileset dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline">
1466-
<include name="**/*"/>
1466+
<include name="**/*" />
14671467
</fx:fileset>
14681468
</fx:resources>
1469-
<fx:bundleArgument arg="mac.CFBundleIdentifier" value="org.daisy.pipeline2"/>
1470-
<fx:bundleArgument arg="mac.CFBundleVersion" value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"/>
1469+
<fx:bundleArgument arg="mac.CFBundleIdentifier" value="org.daisy.pipeline2" />
1470+
<fx:bundleArgument arg="mac.CFBundleVersion" value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" />
14711471
</fx:deploy>
14721472
</target>
14731473
</configuration>
@@ -1887,85 +1887,85 @@
18871887
<configuration>
18881888
<target>
18891889
<java classname="net.sf.saxon.Transform">
1890-
<arg value="target/tmp/effective-pom.xml"/>
1891-
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl"/>
1892-
<arg value="id=copy-pipeline-bundles"/>
1893-
<arg value="startLevel=30"/>
1894-
<arg value="dest=${project.baseUri}/target/generated-resources/etc"/>
1895-
<arg value="prefix=pipeline"/>
1896-
<arg value="localRepository=${settings.localRepository}"/>
1890+
<arg value="target/tmp/effective-pom.xml" />
1891+
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
1892+
<arg value="id=copy-pipeline-bundles" />
1893+
<arg value="startLevel=30" />
1894+
<arg value="dest=${project.baseUri}/target/generated-resources/etc" />
1895+
<arg value="prefix=pipeline" />
1896+
<arg value="localRepository=${settings.localRepository}" />
18971897
</java>
18981898
<java classname="net.sf.saxon.Transform">
1899-
<arg value="target/tmp/effective-pom.xml"/>
1900-
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl"/>
1901-
<arg value="id=copy-pipeline-modules"/>
1902-
<arg value="startLevel=50"/>
1903-
<arg value="dest=${project.baseUri}/target/generated-resources/etc"/>
1904-
<arg value="prefix=modules"/>
1905-
<arg value="localRepository=${settings.localRepository}"/>
1899+
<arg value="target/tmp/effective-pom.xml" />
1900+
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
1901+
<arg value="id=copy-pipeline-modules" />
1902+
<arg value="startLevel=50" />
1903+
<arg value="dest=${project.baseUri}/target/generated-resources/etc" />
1904+
<arg value="prefix=modules" />
1905+
<arg value="localRepository=${settings.localRepository}" />
19061906
</java>
19071907
<java classname="net.sf.saxon.Transform">
1908-
<arg value="target/tmp/effective-pom.xml"/>
1909-
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl"/>
1910-
<arg value="id=copy-pipeline-modules-linux"/>
1911-
<arg value="startLevel=50"/>
1912-
<arg value="dest=${project.baseUri}/target/generated-resources/etc"/>
1913-
<arg value="prefix=modules"/>
1914-
<arg value="localRepository=${settings.localRepository}"/>
1908+
<arg value="target/tmp/effective-pom.xml" />
1909+
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
1910+
<arg value="id=copy-pipeline-modules-linux" />
1911+
<arg value="startLevel=50" />
1912+
<arg value="dest=${project.baseUri}/target/generated-resources/etc" />
1913+
<arg value="prefix=modules" />
1914+
<arg value="localRepository=${settings.localRepository}" />
19151915
</java>
19161916
<java classname="net.sf.saxon.Transform">
1917-
<arg value="target/tmp/effective-pom.xml"/>
1918-
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl"/>
1919-
<arg value="id=copy-frontend"/>
1920-
<arg value="startLevel=100"/>
1921-
<arg value="dest=${project.baseUri}/target/generated-resources/etc/webservice"/>
1922-
<arg value="prefix=frontend"/>
1923-
<arg value="localRepository=${settings.localRepository}"/>
1917+
<arg value="target/tmp/effective-pom.xml" />
1918+
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
1919+
<arg value="id=copy-frontend" />
1920+
<arg value="startLevel=100" />
1921+
<arg value="dest=${project.baseUri}/target/generated-resources/etc/webservice" />
1922+
<arg value="prefix=frontend" />
1923+
<arg value="localRepository=${settings.localRepository}" />
19241924
</java>
19251925
<java classname="net.sf.saxon.Transform">
1926-
<arg value="target/tmp/effective-pom.xml"/>
1927-
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl"/>
1928-
<arg value="id=copy-pipeline-modules-mac"/>
1929-
<arg value="startLevel=50"/>
1930-
<arg value="dest=${project.baseUri}/target/generated-resources/etc"/>
1931-
<arg value="prefix=modules"/>
1932-
<arg value="localRepository=${settings.localRepository}"/>
1926+
<arg value="target/tmp/effective-pom.xml" />
1927+
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
1928+
<arg value="id=copy-pipeline-modules-mac" />
1929+
<arg value="startLevel=50" />
1930+
<arg value="dest=${project.baseUri}/target/generated-resources/etc" />
1931+
<arg value="prefix=modules" />
1932+
<arg value="localRepository=${settings.localRepository}" />
19331933
</java>
19341934
<java classname="net.sf.saxon.Transform">
1935-
<arg value="target/tmp/effective-pom.xml"/>
1936-
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl"/>
1937-
<arg value="id=copy-pipeline-modules-win"/>
1938-
<arg value="startLevel=50"/>
1939-
<arg value="dest=${project.baseUri}/target/generated-resources/etc"/>
1940-
<arg value="prefix=modules"/>
1941-
<arg value="localRepository=${settings.localRepository}"/>
1935+
<arg value="target/tmp/effective-pom.xml" />
1936+
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
1937+
<arg value="id=copy-pipeline-modules-win" />
1938+
<arg value="startLevel=50" />
1939+
<arg value="dest=${project.baseUri}/target/generated-resources/etc" />
1940+
<arg value="prefix=modules" />
1941+
<arg value="localRepository=${settings.localRepository}" />
19421942
</java>
19431943
<java classname="net.sf.saxon.Transform">
1944-
<arg value="target/tmp/effective-pom.xml"/>
1945-
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl"/>
1946-
<arg value="id=copy-gui"/>
1947-
<arg value="startLevel=100"/>
1948-
<arg value="dest=${project.baseUri}/target/generated-resources/etc/gui"/>
1949-
<arg value="prefix=frontend"/>
1950-
<arg value="localRepository=${settings.localRepository}"/>
1944+
<arg value="target/tmp/effective-pom.xml" />
1945+
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
1946+
<arg value="id=copy-gui" />
1947+
<arg value="startLevel=100" />
1948+
<arg value="dest=${project.baseUri}/target/generated-resources/etc/gui" />
1949+
<arg value="prefix=frontend" />
1950+
<arg value="localRepository=${settings.localRepository}" />
19511951
</java>
19521952
<java classname="net.sf.saxon.Transform">
1953-
<arg value="target/tmp/effective-pom.xml"/>
1954-
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl"/>
1955-
<arg value="id=copy-volatile-pipeline-bundles"/>
1956-
<arg value="startLevel=100"/>
1957-
<arg value="dest=${project.baseUri}/target/generated-resources/etc/gui"/>
1958-
<arg value="prefix=frontend"/>
1959-
<arg value="localRepository=${settings.localRepository}"/>
1953+
<arg value="target/tmp/effective-pom.xml" />
1954+
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
1955+
<arg value="id=copy-volatile-pipeline-bundles" />
1956+
<arg value="startLevel=100" />
1957+
<arg value="dest=${project.baseUri}/target/generated-resources/etc/gui" />
1958+
<arg value="prefix=frontend" />
1959+
<arg value="localRepository=${settings.localRepository}" />
19601960
</java>
19611961
<java classname="net.sf.saxon.Transform">
1962-
<arg value="target/tmp/effective-pom.xml"/>
1963-
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl"/>
1964-
<arg value="id=copy-persistence-pipeline-bundles"/>
1965-
<arg value="startLevel=100"/>
1966-
<arg value="dest=${project.baseUri}/target/generated-resources/etc/webservice"/>
1967-
<arg value="prefix=frontend"/>
1968-
<arg value="localRepository=${settings.localRepository}"/>
1962+
<arg value="target/tmp/effective-pom.xml" />
1963+
<arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
1964+
<arg value="id=copy-persistence-pipeline-bundles" />
1965+
<arg value="startLevel=100" />
1966+
<arg value="dest=${project.baseUri}/target/generated-resources/etc/webservice" />
1967+
<arg value="prefix=frontend" />
1968+
<arg value="localRepository=${settings.localRepository}" />
19691969
</java>
19701970
</target>
19711971
</configuration>

0 commit comments

Comments
 (0)