|
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.11.1-SNAPSHOT</version> |
| 12 | + <version>1.11.1</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.11.1</tag> |
21 | 21 | </scm> |
22 | 22 | <properties> |
23 | 23 | <cli.version>2.1.0</cli.version> |
|
1257 | 1257 | <configuration> |
1258 | 1258 | <target> |
1259 | 1259 | <java classname="net.sf.saxon.Transform" failonerror="true"> |
1260 | | - <arg value="${project.basedir}/target/tmp/effective-pom.xml"/> |
1261 | | - <arg value="${project.basedir}/src/main/xslt/pom-to-release.xslt"/> |
1262 | | - <arg value="time=${maven.build.timestamp}"/> |
1263 | | - <arg line="-o:${project.basedir}/target/release-descriptor/releaseDescriptor.xml"/> |
| 1260 | + <arg value="${project.basedir}/target/tmp/effective-pom.xml" /> |
| 1261 | + <arg value="${project.basedir}/src/main/xslt/pom-to-release.xslt" /> |
| 1262 | + <arg value="time=${maven.build.timestamp}" /> |
| 1263 | + <arg line="-o:${project.basedir}/target/release-descriptor/releaseDescriptor.xml" /> |
1264 | 1264 | </java> |
1265 | 1265 | </target> |
1266 | 1266 | </configuration> |
|
1302 | 1302 | </goals> |
1303 | 1303 | </pluginExecutionFilter> |
1304 | 1304 | <action> |
1305 | | - <ignore/> |
| 1305 | + <ignore /> |
1306 | 1306 | </action> |
1307 | 1307 | </pluginExecution> |
1308 | 1308 | <pluginExecution> |
|
1315 | 1315 | </goals> |
1316 | 1316 | </pluginExecutionFilter> |
1317 | 1317 | <action> |
1318 | | - <ignore/> |
| 1318 | + <ignore /> |
1319 | 1319 | </action> |
1320 | 1320 | </pluginExecution> |
1321 | 1321 | </pluginExecutions> |
|
1498 | 1498 | </goals> |
1499 | 1499 | <configuration> |
1500 | 1500 | <target xmlns:fx="javafx:com.sun.javafx.tools.ant"> |
1501 | | - <taskdef resource="com/sun/javafx/tools/ant/antlib.xml" uri="javafx:com.sun.javafx.tools.ant" classpath="${env.JAVA_HOME}/lib/ant-javafx.jar"/> |
| 1501 | + <taskdef resource="com/sun/javafx/tools/ant/antlib.xml" uri="javafx:com.sun.javafx.tools.ant" classpath="${env.JAVA_HOME}/lib/ant-javafx.jar" /> |
1502 | 1502 | <fx:deploy outdir="${project.build.directory}/javapackager" outfile="dp2" nativeBundles="image"> |
1503 | 1503 | <fx:application id="org.daisy.pipeline2" mainClass="org.apache.felix.main.Main" name="DAISY Pipeline 2" version="${project.version}"> |
1504 | 1504 | </fx:application> |
1505 | 1505 | <fx:info description="A tool for automated production of accessible digital publication" title="DAISY Pipeline 2" vendor="DAISY Consortium"> |
1506 | | - <fx:icon href="${project.basedir}/src/main/mac/pipeline-logo.icns"/> |
| 1506 | + <fx:icon href="${project.basedir}/src/main/mac/pipeline-logo.icns" /> |
1507 | 1507 | </fx:info> |
1508 | 1508 | <fx:platform j2se="8.0+"> |
1509 | | - <fx:jvmarg value="-Xms256M"/> |
1510 | | - <fx:jvmarg value="-Xmx1G"/> |
1511 | | - <fx:jvmarg value="-XX:PermSize=16M"/> |
1512 | | - <fx:jvmarg value="-XX:MaxPermSize=256M"/> |
1513 | | - <fx:property name="org.daisy.pipeline.main.mode" value="gui"/> |
1514 | | - <fx:property name="org.daisy.pipeline.home" value="."/> |
1515 | | - <fx:property name="org.daisy.pipeline.data" value="data"/> |
1516 | | - <fx:property name="org.daisy.pipeline.base" value="."/> |
1517 | | - <fx:property name="org.daisy.pipeline.ws.localfs" value="true"/> |
1518 | | - <fx:property name="org.daisy.pipeline.ws.authentication" value="false"/> |
1519 | | - <fx:property name="felix.config.properties" value="file:etc/config.properties"/> |
1520 | | - <fx:property name="felix.system.properties" value="file:etc/system.properties"/> |
| 1509 | + <fx:jvmarg value="-Xms256M" /> |
| 1510 | + <fx:jvmarg value="-Xmx1G" /> |
| 1511 | + <fx:jvmarg value="-XX:PermSize=16M" /> |
| 1512 | + <fx:jvmarg value="-XX:MaxPermSize=256M" /> |
| 1513 | + <fx:property name="org.daisy.pipeline.main.mode" value="gui" /> |
| 1514 | + <fx:property name="org.daisy.pipeline.home" value="." /> |
| 1515 | + <fx:property name="org.daisy.pipeline.data" value="data" /> |
| 1516 | + <fx:property name="org.daisy.pipeline.base" value="." /> |
| 1517 | + <fx:property name="org.daisy.pipeline.ws.localfs" value="true" /> |
| 1518 | + <fx:property name="org.daisy.pipeline.ws.authentication" value="false" /> |
| 1519 | + <fx:property name="felix.config.properties" value="file:etc/config.properties" /> |
| 1520 | + <fx:property name="felix.system.properties" value="file:etc/system.properties" /> |
1521 | 1521 | </fx:platform> |
1522 | 1522 | <fx:resources> |
1523 | | - <fx:fileset type="jar" dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline" includes="system/bootstrap/felix.jar"/> |
1524 | | - <fx:fileset type="license" os="osx" dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline" includes="NOTICE.txt"/> |
| 1523 | + <fx:fileset type="jar" dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline" includes="system/bootstrap/felix.jar" /> |
| 1524 | + <fx:fileset type="license" os="osx" dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline" includes="NOTICE.txt" /> |
1525 | 1525 | <fx:fileset dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline"> |
1526 | | - <include name="**/*"/> |
| 1526 | + <include name="**/*" /> |
1527 | 1527 | </fx:fileset> |
1528 | 1528 | </fx:resources> |
1529 | | - <fx:bundleArgument arg="mac.CFBundleIdentifier" value="org.daisy.pipeline2"/> |
1530 | | - <fx:bundleArgument arg="mac.CFBundleVersion" value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"/> |
| 1529 | + <fx:bundleArgument arg="mac.CFBundleIdentifier" value="org.daisy.pipeline2" /> |
| 1530 | + <fx:bundleArgument arg="mac.CFBundleVersion" value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" /> |
1531 | 1531 | </fx:deploy> |
1532 | 1532 | </target> |
1533 | 1533 | </configuration> |
|
2125 | 2125 | <configuration> |
2126 | 2126 | <target> |
2127 | 2127 | <java classname="net.sf.saxon.Transform" failonerror="true"> |
2128 | | - <arg value="${project.basedir}/target/tmp/effective-pom.xml"/> |
2129 | | - <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl"/> |
2130 | | - <arg value="id=copy-modules-linux-bundles"/> |
2131 | | - <arg value="startLevel=50"/> |
2132 | | - <arg value="dest=${project.baseUri}/target/generated-resources/etc"/> |
2133 | | - <arg value="prefix=modules"/> |
2134 | | - <arg value="localRepository=${settings.localRepository}"/> |
| 2128 | + <arg value="${project.basedir}/target/tmp/effective-pom.xml" /> |
| 2129 | + <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl" /> |
| 2130 | + <arg value="id=copy-modules-linux-bundles" /> |
| 2131 | + <arg value="startLevel=50" /> |
| 2132 | + <arg value="dest=${project.baseUri}/target/generated-resources/etc" /> |
| 2133 | + <arg value="prefix=modules" /> |
| 2134 | + <arg value="localRepository=${settings.localRepository}" /> |
2135 | 2135 | </java> |
2136 | 2136 | <java classname="net.sf.saxon.Transform" failonerror="true"> |
2137 | | - <arg value="${project.basedir}/target/tmp/effective-pom.xml"/> |
2138 | | - <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl"/> |
2139 | | - <arg value="id=copy-webservice-bundles"/> |
2140 | | - <arg value="startLevel=100"/> |
2141 | | - <arg value="dest=${project.baseUri}/target/generated-resources/etc/webservice"/> |
2142 | | - <arg value="prefix=frontend"/> |
2143 | | - <arg value="localRepository=${settings.localRepository}"/> |
| 2137 | + <arg value="${project.basedir}/target/tmp/effective-pom.xml" /> |
| 2138 | + <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl" /> |
| 2139 | + <arg value="id=copy-webservice-bundles" /> |
| 2140 | + <arg value="startLevel=100" /> |
| 2141 | + <arg value="dest=${project.baseUri}/target/generated-resources/etc/webservice" /> |
| 2142 | + <arg value="prefix=frontend" /> |
| 2143 | + <arg value="localRepository=${settings.localRepository}" /> |
2144 | 2144 | </java> |
2145 | 2145 | <java classname="net.sf.saxon.Transform" failonerror="true"> |
2146 | | - <arg value="${project.basedir}/target/tmp/effective-pom.xml"/> |
2147 | | - <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl"/> |
2148 | | - <arg value="id=copy-modules-mac-bundles"/> |
2149 | | - <arg value="startLevel=50"/> |
2150 | | - <arg value="dest=${project.baseUri}/target/generated-resources/etc"/> |
2151 | | - <arg value="prefix=modules"/> |
2152 | | - <arg value="localRepository=${settings.localRepository}"/> |
| 2146 | + <arg value="${project.basedir}/target/tmp/effective-pom.xml" /> |
| 2147 | + <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl" /> |
| 2148 | + <arg value="id=copy-modules-mac-bundles" /> |
| 2149 | + <arg value="startLevel=50" /> |
| 2150 | + <arg value="dest=${project.baseUri}/target/generated-resources/etc" /> |
| 2151 | + <arg value="prefix=modules" /> |
| 2152 | + <arg value="localRepository=${settings.localRepository}" /> |
2153 | 2153 | </java> |
2154 | 2154 | <java classname="net.sf.saxon.Transform" failonerror="true"> |
2155 | | - <arg value="${project.basedir}/target/tmp/effective-pom.xml"/> |
2156 | | - <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl"/> |
2157 | | - <arg value="id=copy-modules-win-bundles"/> |
2158 | | - <arg value="startLevel=50"/> |
2159 | | - <arg value="dest=${project.baseUri}/target/generated-resources/etc"/> |
2160 | | - <arg value="prefix=modules"/> |
2161 | | - <arg value="localRepository=${settings.localRepository}"/> |
| 2155 | + <arg value="${project.basedir}/target/tmp/effective-pom.xml" /> |
| 2156 | + <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl" /> |
| 2157 | + <arg value="id=copy-modules-win-bundles" /> |
| 2158 | + <arg value="startLevel=50" /> |
| 2159 | + <arg value="dest=${project.baseUri}/target/generated-resources/etc" /> |
| 2160 | + <arg value="prefix=modules" /> |
| 2161 | + <arg value="localRepository=${settings.localRepository}" /> |
2162 | 2162 | </java> |
2163 | 2163 | <java classname="net.sf.saxon.Transform" failonerror="true"> |
2164 | | - <arg value="${project.basedir}/target/tmp/effective-pom.xml"/> |
2165 | | - <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl"/> |
2166 | | - <arg value="id=copy-volatile-bundles"/> |
2167 | | - <arg value="startLevel=100"/> |
2168 | | - <arg value="dest=${project.baseUri}/target/generated-resources/etc/gui"/> |
2169 | | - <arg value="prefix=frontend"/> |
2170 | | - <arg value="localRepository=${settings.localRepository}"/> |
| 2164 | + <arg value="${project.basedir}/target/tmp/effective-pom.xml" /> |
| 2165 | + <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl" /> |
| 2166 | + <arg value="id=copy-volatile-bundles" /> |
| 2167 | + <arg value="startLevel=100" /> |
| 2168 | + <arg value="dest=${project.baseUri}/target/generated-resources/etc/gui" /> |
| 2169 | + <arg value="prefix=frontend" /> |
| 2170 | + <arg value="localRepository=${settings.localRepository}" /> |
2171 | 2171 | </java> |
2172 | 2172 | <java classname="net.sf.saxon.Transform" failonerror="true"> |
2173 | | - <arg value="${project.basedir}/target/tmp/effective-pom.xml"/> |
2174 | | - <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl"/> |
2175 | | - <arg value="id=copy-persistence-pipeline-bundles"/> |
2176 | | - <arg value="startLevel=100"/> |
2177 | | - <arg value="dest=${project.baseUri}/target/generated-resources/etc/webservice"/> |
2178 | | - <arg value="prefix=frontend"/> |
2179 | | - <arg value="localRepository=${settings.localRepository}"/> |
| 2173 | + <arg value="${project.basedir}/target/tmp/effective-pom.xml" /> |
| 2174 | + <arg value="${project.basedir}/src/main/xslt/pom-to-fileinstall-config.xsl" /> |
| 2175 | + <arg value="id=copy-persistence-pipeline-bundles" /> |
| 2176 | + <arg value="startLevel=100" /> |
| 2177 | + <arg value="dest=${project.baseUri}/target/generated-resources/etc/webservice" /> |
| 2178 | + <arg value="prefix=frontend" /> |
| 2179 | + <arg value="localRepository=${settings.localRepository}" /> |
2180 | 2180 | </java> |
2181 | 2181 | </target> |
2182 | 2182 | </configuration> |
|
0 commit comments