|
5 | 5 | <groupId>org.daisy</groupId> |
6 | 6 | <artifactId>daisy</artifactId> |
7 | 7 | <version>2</version> |
8 | | - <relativePath/> |
| 8 | + <relativePath /> |
9 | 9 | </parent> |
10 | 10 | <groupId>org.daisy.pipeline</groupId> |
11 | 11 | <artifactId>assembly</artifactId> |
12 | | - <version>1.10.4-SNAPSHOT</version> |
| 12 | + <version>1.10.4</version> |
13 | 13 | <packaging>pom</packaging> |
14 | 14 | <name>DAISY Pipeline 2 :: Assembly</name> |
15 | 15 | <description>Builds the main distribution of the DAISY Pipeline 2.</description> |
16 | 16 | <scm> |
17 | 17 | <connection>scm:git:git@github.com:daisy-consortium/pipeline-assembly.git</connection> |
18 | 18 | <url>scm:git:git@github.com:daisy-consortium/pipeline-assembly.git</url> |
19 | 19 | <developerConnection>scm:git:git@github.com:daisy-consortium/pipeline-assembly.git</developerConnection> |
20 | | - <tag>HEAD</tag> |
| 20 | + <tag>v1.10.4</tag> |
21 | 21 | </scm> |
22 | 22 | <properties> |
23 | 23 | <cli.version>2.1.0</cli.version> |
|
1197 | 1197 | <configuration> |
1198 | 1198 | <target> |
1199 | 1199 | <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" /> |
1204 | 1204 | </java> |
1205 | 1205 | </target> |
1206 | 1206 | </configuration> |
|
1242 | 1242 | </goals> |
1243 | 1243 | </pluginExecutionFilter> |
1244 | 1244 | <action> |
1245 | | - <ignore/> |
| 1245 | + <ignore /> |
1246 | 1246 | </action> |
1247 | 1247 | </pluginExecution> |
1248 | 1248 | <pluginExecution> |
|
1255 | 1255 | </goals> |
1256 | 1256 | </pluginExecutionFilter> |
1257 | 1257 | <action> |
1258 | | - <ignore/> |
| 1258 | + <ignore /> |
1259 | 1259 | </action> |
1260 | 1260 | </pluginExecution> |
1261 | 1261 | </pluginExecutions> |
|
1438 | 1438 | </goals> |
1439 | 1439 | <configuration> |
1440 | 1440 | <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" /> |
1442 | 1442 | <fx:deploy outdir="${project.build.directory}/javapackager" outfile="dp2" nativeBundles="image"> |
1443 | 1443 | <fx:application id="org.daisy.pipeline2" mainClass="org.apache.felix.main.Main" name="DAISY Pipeline 2" version="${project.version}"> |
1444 | 1444 | </fx:application> |
1445 | 1445 | <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" /> |
1447 | 1447 | </fx:info> |
1448 | 1448 | <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" /> |
1461 | 1461 | </fx:platform> |
1462 | 1462 | <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" /> |
1465 | 1465 | <fx:fileset dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline"> |
1466 | | - <include name="**/*"/> |
| 1466 | + <include name="**/*" /> |
1467 | 1467 | </fx:fileset> |
1468 | 1468 | </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}" /> |
1471 | 1471 | </fx:deploy> |
1472 | 1472 | </target> |
1473 | 1473 | </configuration> |
|
1887 | 1887 | <configuration> |
1888 | 1888 | <target> |
1889 | 1889 | <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}" /> |
1897 | 1897 | </java> |
1898 | 1898 | <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}" /> |
1906 | 1906 | </java> |
1907 | 1907 | <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}" /> |
1915 | 1915 | </java> |
1916 | 1916 | <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}" /> |
1924 | 1924 | </java> |
1925 | 1925 | <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}" /> |
1933 | 1933 | </java> |
1934 | 1934 | <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}" /> |
1942 | 1942 | </java> |
1943 | 1943 | <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}" /> |
1951 | 1951 | </java> |
1952 | 1952 | <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}" /> |
1960 | 1960 | </java> |
1961 | 1961 | <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}" /> |
1969 | 1969 | </java> |
1970 | 1970 | </target> |
1971 | 1971 | </configuration> |
|
0 commit comments