[maven-release-plugin] copy for tag karaf-2.2.0
git-svn-id: https://svn.apache.org/repos/asf/karaf/tags/karaf-2.2.0@1073745 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 32df571..b4ac182 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -97,6 +97,7 @@
* [KARAF-458] - Fix the karaf shell to look nice within Eclipse console
* [KARAF-472] - features-maven-plugin: TAB-characters in feature-repository lead to resolution-errors in add-features-to-repo
* [KARAF-480] - Minor ansi issue with admin:rename command
+ * [KARAF-481] - Karaf 2.2.x manuals do not get signature files created
** Improvement
* [KARAF-5] - [karaf] admin:create should support a -r, --rmi-registry-port option to allow the RMI registry port to be configured
diff --git a/manual/pom.xml b/manual/pom.xml
index c67eef4..8c94a19 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -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>
+ <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>
diff --git a/pom.xml b/pom.xml
index 2fc4ade..ffd2c51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
