You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@camel.apache.org by Willem jiang <wi...@gmail.com> on 2013/02/05 02:11:28 UTC
Re: svn commit: r1442415 - in
/camel/trunk/apache-camel/src/main/descriptors: unix-bin.xml
windows-bin.xml
When we do the release, the project version doesn't has the SNAPSHOT words.
I doubt the change will cause some trouble when we do the actual release.
--
Willem Jiang
Red Hat, Inc.
FuseSource is now part of Red Hat
Web: http://www.fusesource.com | http://www.redhat.com
Blog: http://willemjiang.blogspot.com (http://willemjiang.blogspot.com/) (English)
http://jnn.iteye.com (http://jnn.javaeye.com/) (Chinese)
Twitter: willemjiang
Weibo: 姜宁willem
On Tuesday, February 5, 2013 at 6:51 AM, bvahdat@apache.org wrote:
> Author: bvahdat
> Date: Mon Feb 4 22:51:06 2013
> New Revision: 1442415
>
> URL: http://svn.apache.org/viewvc?rev=1442415&view=rev
> Log:
> Remove "SNAPSHOT" from the name of the generated HTML & PDF manual files.
>
> Modified:
> camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
> camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
>
> Modified: camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?rev=1442415&r1=1442414&r2=1442415&view=diff
> ==============================================================================
> --- camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
> +++ camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Mon Feb 4 22:51:06 2013
> @@ -55,16 +55,6 @@
> <lineEnding>unix</lineEnding>
> </fileSet>
>
> - <!-- copy the manual docs -->
> - <fileSet>
> - <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
> - <outputDirectory>/doc/manual</outputDirectory>
> - <includes>
> - <include>*.pdf</include>
> - <include>*.html</include>
> - </includes>
> - </fileSet>
> -
> <!-- copy the java docs -->
> <fileSet>
> <directory>${basedir}/target/javadoc/</directory>
> @@ -76,6 +66,19 @@
> </fileSets>
>
> <files>
> + <!-- copy the manual docs -->
> + <file>
> + <source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manual-${project.version}-SNAPSHOT.html</source>
> + <outputDirectory>/doc/manual</outputDirectory>
> + <fileMode>0444</fileMode>
> + <destName>camel-manual-${project.version}.html</destName>
> + </file>
> + <file>
> + <source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manual-${project.version}-SNAPSHOT.pdf</source>
> + <outputDirectory>/doc/manual</outputDirectory>
> + <fileMode>0444</fileMode>
> + <destName>camel-manual-${project.version}.pdf</destName>
> + </file>
> <!--filtering README.txt-->
> <file>
> <source>../examples/camel-example-reportincident-wssecurity/README.txt</source>
>
> Modified: camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?rev=1442415&r1=1442414&r2=1442415&view=diff
> ==============================================================================
> --- camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
> +++ camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Mon Feb 4 22:51:06 2013
> @@ -55,16 +55,6 @@
> <lineEnding>dos</lineEnding>
> </fileSet>
>
> - <!-- copy the manual docs -->
> - <fileSet>
> - <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
> - <outputDirectory>/doc/manual</outputDirectory>
> - <includes>
> - <include>*.pdf</include>
> - <include>*.html</include>
> - </includes>
> - </fileSet>
> -
> <!-- copy the java docs -->
> <fileSet>
> <directory>${basedir}/target/javadoc/</directory>
> @@ -76,6 +66,19 @@
> </fileSets>
>
> <files>
> + <!-- copy the manual docs -->
> + <file>
> + <source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manual-${project.version}-SNAPSHOT.html</source>
> + <outputDirectory>/doc/manual</outputDirectory>
> + <fileMode>0444</fileMode>
> + <destName>camel-manual-${project.version}.html</destName>
> + </file>
> + <file>
> + <source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manual-${project.version}-SNAPSHOT.pdf</source>
> + <outputDirectory>/doc/manual</outputDirectory>
> + <fileMode>0444</fileMode>
> + <destName>camel-manual-${project.version}.pdf</destName>
> + </file>
> <!--filtering README.txt-->
> <file>
> <source>../examples/camel-example-reportincident-wssecurity/README.txt</source>
Re: svn commit: r1442415 - in
/camel/trunk/apache-camel/src/main/descriptors: unix-bin.xml windows-bin.xml
Posted by Babak Vahdat <ba...@swissonline.ch>.
Hi Willem
That was only an EXPERIMENT of mine to get the current HTML/PDF docs issue
fixed. Up to now without success.
As the dryRun of release:prepare doesn't allow any outgoing changes on the
local workspace I had to COMMIT that change to see if that could help.
Please let me know if you're aware of a way of doing 'mvn release:prepare
-DdryRun=true' WITH some outgoing changes on the local workspace to see if
the that local change would fix a given build problem.
Anyway, I've already reverted that commit.
Babak
Am 05.02.13 02:11 schrieb "Willem jiang" unter <wi...@gmail.com>:
>When we do the release, the project version doesn't has the SNAPSHOT
>words.
>I doubt the change will cause some trouble when we do the actual release.
>
>
>--
>Willem Jiang
>
>Red Hat, Inc.
>FuseSource is now part of Red Hat
>Web: http://www.fusesource.com | http://www.redhat.com
>Blog: http://willemjiang.blogspot.com (http://willemjiang.blogspot.com/)
>(English)
> http://jnn.iteye.com (http://jnn.javaeye.com/) (Chinese)
>Twitter: willemjiang
>Weibo: 姜宁willem
>
>
>
>
>
>On Tuesday, February 5, 2013 at 6:51 AM, bvahdat@apache.org wrote:
>
>> Author: bvahdat
>> Date: Mon Feb 4 22:51:06 2013
>> New Revision: 1442415
>>
>> URL: http://svn.apache.org/viewvc?rev=1442415&view=rev
>> Log:
>> Remove "SNAPSHOT" from the name of the generated HTML & PDF manual
>>files.
>>
>> Modified:
>> camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
>> camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
>>
>> Modified: camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
>> URL:
>>http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptor
>>s/unix-bin.xml?rev=1442415&r1=1442414&r2=1442415&view=diff
>>
>>=========================================================================
>>=====
>> --- camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
>>(original)
>> +++ camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Mon Feb
>>4 22:51:06 2013
>> @@ -55,16 +55,6 @@
>> <lineEnding>unix</lineEnding>
>> </fileSet>
>>
>> - <!-- copy the manual docs -->
>> - <fileSet>
>> -
>><directory>${basedir}/../tooling/camel-manual/target/site/manual/</direct
>>ory>
>> - <outputDirectory>/doc/manual</outputDirectory>
>> - <includes>
>> - <include>*.pdf</include>
>> - <include>*.html</include>
>> - </includes>
>> - </fileSet>
>> -
>> <!-- copy the java docs -->
>> <fileSet>
>> <directory>${basedir}/target/javadoc/</directory>
>> @@ -76,6 +66,19 @@
>> </fileSets>
>>
>> <files>
>> + <!-- copy the manual docs -->
>> + <file>
>> +
>><source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manua
>>l-${project.version}-SNAPSHOT.html</source>
>> + <outputDirectory>/doc/manual</outputDirectory>
>> + <fileMode>0444</fileMode>
>> + <destName>camel-manual-${project.version}.html</destName>
>> + </file>
>> + <file>
>> +
>><source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manua
>>l-${project.version}-SNAPSHOT.pdf</source>
>> + <outputDirectory>/doc/manual</outputDirectory>
>> + <fileMode>0444</fileMode>
>> + <destName>camel-manual-${project.version}.pdf</destName>
>> + </file>
>> <!--filtering README.txt-->
>> <file>
>>
>><source>../examples/camel-example-reportincident-wssecurity/README.txt</s
>>ource>
>>
>> Modified: camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
>> URL:
>>http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptor
>>s/windows-bin.xml?rev=1442415&r1=1442414&r2=1442415&view=diff
>>
>>=========================================================================
>>=====
>> --- camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
>>(original)
>> +++ camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Mon
>>Feb 4 22:51:06 2013
>> @@ -55,16 +55,6 @@
>> <lineEnding>dos</lineEnding>
>> </fileSet>
>>
>> - <!-- copy the manual docs -->
>> - <fileSet>
>> -
>><directory>${basedir}/../tooling/camel-manual/target/site/manual/</direct
>>ory>
>> - <outputDirectory>/doc/manual</outputDirectory>
>> - <includes>
>> - <include>*.pdf</include>
>> - <include>*.html</include>
>> - </includes>
>> - </fileSet>
>> -
>> <!-- copy the java docs -->
>> <fileSet>
>> <directory>${basedir}/target/javadoc/</directory>
>> @@ -76,6 +66,19 @@
>> </fileSets>
>>
>> <files>
>> + <!-- copy the manual docs -->
>> + <file>
>> +
>><source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manua
>>l-${project.version}-SNAPSHOT.html</source>
>> + <outputDirectory>/doc/manual</outputDirectory>
>> + <fileMode>0444</fileMode>
>> + <destName>camel-manual-${project.version}.html</destName>
>> + </file>
>> + <file>
>> +
>><source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manua
>>l-${project.version}-SNAPSHOT.pdf</source>
>> + <outputDirectory>/doc/manual</outputDirectory>
>> + <fileMode>0444</fileMode>
>> + <destName>camel-manual-${project.version}.pdf</destName>
>> + </file>
>> <!--filtering README.txt-->
>> <file>
>>
>><source>../examples/camel-example-reportincident-wssecurity/README.txt</s
>>ource>
>
>
>