You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/02/01 21:44:39 UTC
svn commit: r1239311 - in /httpcomponents/httpclient/branches/4.1.x: pom.xml
src/main/assembly/bin.xml src/main/assembly/osgi-bin.xml
Author: olegk
Date: Wed Feb 1 20:44:39 2012
New Revision: 1239311
URL: http://svn.apache.org/viewvc?rev=1239311&view=rev
Log:
Updated project parent pom version to 5; simplified site content and assembly generation
Modified:
httpcomponents/httpclient/branches/4.1.x/pom.xml
httpcomponents/httpclient/branches/4.1.x/src/main/assembly/bin.xml
httpcomponents/httpclient/branches/4.1.x/src/main/assembly/osgi-bin.xml
Modified: httpcomponents/httpclient/branches/4.1.x/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/pom.xml?rev=1239311&r1=1239310&r2=1239311&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/pom.xml (original)
+++ httpcomponents/httpclient/branches/4.1.x/pom.xml Wed Feb 1 20:44:39 2012
@@ -28,7 +28,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.apache.httpcomponents</groupId>
- <version>4.1.1</version>
+ <version>5</version>
<relativePath>../project/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -147,7 +147,18 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javadoc-aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <phase>pre-site</phase>
+ </execution>
+ </executions>
<configuration>
+ <!-- reduce console output. Can override with -Dquiet=false -->
+ <quiet>true</quiet>
<source>1.5</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
@@ -200,6 +211,16 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>tutorial-site</id>
+ <goals>
+ <goal>generate-html</goal>
+ <goal>generate-pdf</goal>
+ </goals>
+ <phase>pre-site</phase>
+ </execution>
+ </executions>
<configuration>
<includes>index.xml</includes>
<chunkedOutput>true</chunkedOutput>
@@ -214,13 +235,14 @@
</entity>
</entities>
<postProcess>
- <copy todir="target/site/tutorial">
- <fileset dir="target/docbkx">
+ <copy todir="target/site/tutorial/html"
+ failonerror="false">
+ <fileset dir="target/docbkx/html/index">
<include name="**/*.html" />
- <include name="**/*.pdf" />
</fileset>
</copy>
- <copy todir="target/site/tutorial/html">
+ <copy todir="target/site/tutorial/html"
+ failonerror="false">
<fileset dir="src/docbkx/resources">
<include name="**/*.css" />
<include name="**/*.png" />
@@ -228,7 +250,9 @@
<include name="**/*.jpg" />
</fileset>
</copy>
- <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" failonerror="false" />
+ <copy file="target/docbkx/pdf/index.pdf"
+ tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf"
+ failonerror="false"/>
</postProcess>
</configuration>
</plugin>
Modified: httpcomponents/httpclient/branches/4.1.x/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/src/main/assembly/bin.xml?rev=1239311&r1=1239310&r2=1239311&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/src/main/assembly/bin.xml (original)
+++ httpcomponents/httpclient/branches/4.1.x/src/main/assembly/bin.xml Wed Feb 1 20:44:39 2012
@@ -69,18 +69,10 @@
<directory>target/site/apidocs</directory>
<outputDirectory>javadoc</outputDirectory>
</fileSet>
- <!-- Tutorial (HTML) -->
+ <!-- Tutorial -->
<fileSet>
- <directory>target/docbkx/html</directory>
- <outputDirectory>tutorial/html</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/docbkx/resources/css</directory>
- <outputDirectory>tutorial/html/css</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/docbkx/resources/images</directory>
- <outputDirectory>tutorial/html/images</outputDirectory>
+ <directory>target/site/tutorial</directory>
+ <outputDirectory>tutorial</outputDirectory>
</fileSet>
<!-- Base module -->
<fileSet>
@@ -99,12 +91,4 @@
</includes>
</fileSet>
</fileSets>
- <files>
- <!-- Tutorial (PDF) -->
- <file>
- <source>target/docbkx/pdf/index.pdf</source>
- <outputDirectory>tutorial/pdf</outputDirectory>
- <destName>httpclient-tutorial.pdf</destName>
- </file>
- </files>
</assembly>
Modified: httpcomponents/httpclient/branches/4.1.x/src/main/assembly/osgi-bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/src/main/assembly/osgi-bin.xml?rev=1239311&r1=1239310&r2=1239311&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/src/main/assembly/osgi-bin.xml (original)
+++ httpcomponents/httpclient/branches/4.1.x/src/main/assembly/osgi-bin.xml Wed Feb 1 20:44:39 2012
@@ -56,18 +56,10 @@
<directory>target/site/apidocs</directory>
<outputDirectory>javadoc</outputDirectory>
</fileSet>
- <!-- Tutorial (HTML) -->
+ <!-- Tutorial -->
<fileSet>
- <directory>target/docbkx/html</directory>
- <outputDirectory>tutorial/html</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/docbkx/resources/css</directory>
- <outputDirectory>tutorial/html/css</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/docbkx/resources/images</directory>
- <outputDirectory>tutorial/html/images</outputDirectory>
+ <directory>target/site/tutorial</directory>
+ <outputDirectory>tutorial</outputDirectory>
</fileSet>
<!-- Base module -->
<fileSet>
@@ -86,12 +78,4 @@
</includes>
</fileSet>
</fileSets>
- <files>
- <!-- Tutorial (PDF) -->
- <file>
- <source>target/docbkx/pdf/index.pdf</source>
- <outputDirectory>tutorial/pdf</outputDirectory>
- <destName>httpclient-tutorial.pdf</destName>
- </file>
- </files>
</assembly>