You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/02/23 07:05:22 UTC
svn commit: r1073613 - in /karaf/branches/karaf-2.2.x: manual/pom.xml pom.xml
Author: gnodet
Date: Wed Feb 23 06:05:21 2011
New Revision: 1073613
URL: http://svn.apache.org/viewvc?rev=1073613&view=rev
Log:
[KARAF-481] Karaf 2.2.x manuals do not get signature files created
Modified:
karaf/branches/karaf-2.2.x/manual/pom.xml
karaf/branches/karaf-2.2.x/pom.xml
Modified: karaf/branches/karaf-2.2.x/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/manual/pom.xml?rev=1073613&r1=1073612&r2=1073613&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/manual/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/manual/pom.xml Wed Feb 23 06:05:21 2011
@@ -34,7 +34,6 @@
<packaging>war</packaging>
<properties>
- <must-succeed>false</must-succeed>
<manual.dir>${project.build.directory}/manual</manual.dir>
<manual>${manual.dir}/manual-${project.version}</manual>
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
@@ -146,25 +145,6 @@
</sources>
</configuration>
</execution>
- <execution>
- <id>attach-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${manual}.pdf</file>
- <type>pdf</type>
- </artifact>
- <artifact>
- <file>${manual}.html</file>
- <type>html</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -298,8 +278,9 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
+ <version>1.6</version>
<executions>
<execution>
<id>create-manual</id>
@@ -309,35 +290,17 @@
</goals>
<configuration>
<tasks>
- <taskdef name="trycatch" classname="net.sf.antcontrib.logic.TryCatchTask" classpathref="maven.plugin.classpath" />
- <mkdir dir="${manual.dir}" />
- <move file="${project.build.directory}/sitegen/manual.html" tofile="${manual}.html" />
- <trycatch property="error">
- <try>
- <echo message="Generating PDF using Prince XML (http://www.princexml.com/)" />
- <exec executable="prince">
- <arg value="${manual}.html" />
- <arg value="${manual}.pdf" />
- <arg value="--log" />
- <arg value="${project.build.directory}/prince.log" />
- </exec>
- </try>
- <catch>
- <if>
- <equals arg1="${must-succeed}" arg2="true" />
- <then>
- <echo>ERROR: ${error}</echo>
- <fail>${error}</fail>
- </then>
- <else>
- <echo>ERROR: ${error}</echo>
- <echo>Falling back to dummy manuals</echo>
- <copy file="src/fallback/manual.html" tofile="${manual}.html" />
- <copy file="src/fallback/manual.pdf" tofile="${manual}.pdf" />
- </else>
- </if>
- </catch>
- </trycatch>
+ <mkdir dir="${manual.dir}"/>
+ <move file="${project.build.directory}/sitegen/manual.html" tofile="${manual}.html"/>
+ <echo message="Generating PDF using Prince XML (http://www.princexml.com/)"/>
+ <exec executable="prince">
+ <arg value="${manual}.html"/>
+ <arg value="${manual}.pdf"/>
+ <arg value="--log"/>
+ <arg value="${project.build.directory}/prince.log"/>
+ </exec>
+ <attachartifact file="${manual}.html" type="html"/>
+ <attachartifact file="${manual}.pdf" type="pdf"/>
</tasks>
</configuration>
</execution>
@@ -442,12 +405,6 @@
<scalate.mode>development</scalate.mode>
</properties>
</profile>
- <profile>
- <id>release</id>
- <properties>
- <must-succeed>true</must-succeed>
- </properties>
- </profile>
</profiles>
</project>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1073613&r1=1073612&r2=1073613&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Wed Feb 23 06:05:21 2011
@@ -1114,24 +1114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <dependencies>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- </dependency>
- <dependency>
- <groupId>org.ccil.cowan.tagsoup</groupId>
- <artifactId>tagsoup</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
+ <version>1.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>