Skip to content

Commit 3933416

Browse files
bertfreesbertfrees
committed
Resolve snapshot dependencies (BOMs/parents)
1 parent dedb21a commit 3933416

File tree

1 file changed

+75
-75
lines changed

1 file changed

+75
-75
lines changed

‎pom.xml‎

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
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>
@@ -52,35 +52,35 @@
5252
<dependency>
5353
<groupId>org.daisy.pipeline</groupId>
5454
<artifactId>framework-bom</artifactId>
55-
<version>1.11.1-SNAPSHOT</version>
55+
<version>1.11.1</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.daisy.pipeline.modules</groupId>
6161
<artifactId>scripts-bom</artifactId>
62-
<version>1.11.1-SNAPSHOT</version>
62+
<version>1.11.1</version>
6363
<type>pom</type>
6464
<scope>import</scope>
6565
</dependency>
6666
<dependency>
6767
<groupId>org.daisy.pipeline.modules</groupId>
6868
<artifactId>common-utils-bom</artifactId>
69-
<version>1.11.1-SNAPSHOT</version>
69+
<version>1.11.1</version>
7070
<type>pom</type>
7171
<scope>import</scope>
7272
</dependency>
7373
<dependency>
7474
<groupId>org.daisy.pipeline.modules</groupId>
7575
<artifactId>scripts-utils-bom</artifactId>
76-
<version>1.11.1-SNAPSHOT</version>
76+
<version>1.11.1</version>
7777
<type>pom</type>
7878
<scope>import</scope>
7979
</dependency>
8080
<dependency>
8181
<groupId>org.daisy.pipeline.modules.braille</groupId>
8282
<artifactId>braille-modules-bom</artifactId>
83-
<version>1.11.1-SNAPSHOT</version>
83+
<version>1.11.1</version>
8484
<type>pom</type>
8585
<scope>import</scope>
8686
</dependency>
@@ -94,7 +94,7 @@
9494
<dependency>
9595
<groupId>org.daisy.pipeline.modules</groupId>
9696
<artifactId>tts-modules-bom</artifactId>
97-
<version>1.11.1-SNAPSHOT</version>
97+
<version>1.11.1</version>
9898
<type>pom</type>
9999
<scope>import</scope>
100100
</dependency>
@@ -1257,10 +1257,10 @@
12571257
<configuration>
12581258
<target>
12591259
<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"/>
12641264
</java>
12651265
</target>
12661266
</configuration>
@@ -1302,7 +1302,7 @@
13021302
</goals>
13031303
</pluginExecutionFilter>
13041304
<action>
1305-
<ignore />
1305+
<ignore/>
13061306
</action>
13071307
</pluginExecution>
13081308
<pluginExecution>
@@ -1315,7 +1315,7 @@
13151315
</goals>
13161316
</pluginExecutionFilter>
13171317
<action>
1318-
<ignore />
1318+
<ignore/>
13191319
</action>
13201320
</pluginExecution>
13211321
</pluginExecutions>
@@ -1498,36 +1498,36 @@
14981498
</goals>
14991499
<configuration>
15001500
<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"/>
15021502
<fx:deploy outdir="${project.build.directory}/javapackager" outfile="dp2" nativeBundles="image">
15031503
<fx:application id="org.daisy.pipeline2" mainClass="org.apache.felix.main.Main" name="DAISY Pipeline 2" version="${project.version}">
15041504
</fx:application>
15051505
<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"/>
15071507
</fx:info>
15081508
<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"/>
15211521
</fx:platform>
15221522
<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"/>
15251525
<fx:fileset dir="${project.build.directory}/pipeline2-${project.version}_mac/daisy-pipeline">
1526-
<include name="**/*" />
1526+
<include name="**/*"/>
15271527
</fx:fileset>
15281528
</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}"/>
15311531
</fx:deploy>
15321532
</target>
15331533
</configuration>
@@ -2125,58 +2125,58 @@
21252125
<configuration>
21262126
<target>
21272127
<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}"/>
21352135
</java>
21362136
<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}"/>
21442144
</java>
21452145
<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}"/>
21532153
</java>
21542154
<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}"/>
21622162
</java>
21632163
<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}"/>
21712171
</java>
21722172
<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}"/>
21802180
</java>
21812181
</target>
21822182
</configuration>
@@ -3134,4 +3134,4 @@ rm -rf /opt/daisy-pipeline2/cli
31343134
<url>http://repository.springsource.com/maven/bundles/external</url>
31353135
</repository>
31363136
</repositories>
3137-
</project>
3137+
</project>

0 commit comments

Comments
 (0)