You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bu...@apache.org on 2014/01/05 00:18:53 UTC
svn commit: r892797 - in /websites/production/camel/content:
cache/main.pageCache release-guide.html
Author: buildbot
Date: Sat Jan 4 23:18:53 2014
New Revision: 892797
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/release-guide.html
Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.
Modified: websites/production/camel/content/release-guide.html
==============================================================================
--- websites/production/camel/content/release-guide.html (original)
+++ websites/production/camel/content/release-guide.html Sat Jan 4 23:18:53 2014
@@ -85,30 +85,11 @@
<tbody>
<tr>
<td valign="top" width="100%">
-<div class="wiki-content maincontent"><h1 id="ReleaseGuide-HowtocreateandannounceaCamelrelease.">How to create and announce a Camel release.</h1>
-
-<p>This release guide is based on the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">General guide for releasing Maven-based projects at Apache</a>, so be sure to check it out before continuing and meet all prerequisites. </p>
-
-<p><strong>Note</strong>: Make sure that you are using <strong>JDK 6</strong>. However for releasing Camel 2.12.0 onwards better use <strong>JDK 7</strong>, this for the sake of the new <a shape="rect" class="external-link" href="http://camel.apache.org/endpoint-annotations.html">HTML documentation feature</a> which doesn't work properly because of misbehaving annotation processing in <strong>JDK 6</strong>.</p>
-
-<h2 id="ReleaseGuide-Prerequisites">Prerequisites</h2>
-
-<p>To prepare or perform a release you MUST BE at least an Apache Camel committer.</p>
-<ul><li>The artifacts for each and every release must be SIGNED; your public key should be added to the KEYS file</li><li>Your public key must also be cross-signed by other Apache committers (this can be done at key signing parties at ApacheCon for instance)</li><li>Make sure you have the correct maven configuration in <code>~/.m2/settings.xml</code></li><li>From Camel 2.10 onwards we will require to use Maven [3.0.2,3.1.0)</li><li>From Camel 2.11 onwards we will require to use Maven [3.0.4,3.1.0]</li><li>You may want to get familiar with the release settings in the parent apache POM.</li><li>Make sure you have installed <a shape="rect" class="external-link" href="http://www.princexml.com/" rel="nofollow">Prince</a> to be able to generate the Camel manual</li><li>Add your Prince installation <code>bin</code> directory to your <code>PATH</code> variable:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-PATH=$PATH:/usr/local/bin/prince
+<div class="wiki-content maincontent"><h1 id="ReleaseGuide-HowtocreateandannounceaCamelrelease.">How to create and announce a Camel release.</h1><p>This release guide is based on the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">General guide for releasing Maven-based projects at Apache</a>, so be sure to check it out before continuing and meet all prerequisites.</p><p><strong>Note</strong>: Make sure that you are using <strong>JDK 6</strong>. However for releasing Camel 2.12.0 onwards better use <strong>JDK 7</strong>, this for the sake of the new <a shape="rect" class="external-link" href="http://camel.apache.org/endpoint-annotations.html">HTML documentation feature</a> which doesn't work properly because of misbehaving annotation processing in <strong>JDK 6</strong>.</p><h2 id="ReleaseGuide-Prerequisites">Prerequisites</h2><p>To prepare or perform a release you MUST BE at least an Apache Camel committer.</p><ul><li>The
artifacts for each and every release must be SIGNED; your public key should be added to the KEYS file</li><li>Your public key must also be cross-signed by other Apache committers (this can be done at key signing parties at ApacheCon for instance)</li><li>Make sure you have the correct maven configuration in <code>~/.m2/settings.xml</code></li><li>From Camel 2.10 onwards we will require to use Maven [3.0.2,3.1.0)</li><li>From Camel 2.11 onwards we will require to use Maven [3.0.4,3.1.0]</li><li>You may want to get familiar with the release settings in the parent apache POM.</li><li>Make sure you have installed <a shape="rect" class="external-link" href="http://www.princexml.com/" rel="nofollow">Prince</a> to be able to generate the Camel manual</li><li><p>Add your Prince installation <code>bin</code> directory to your <code>PATH</code> variable:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[PATH=$PATH:/usr/local/bin/prince
]]></script>
-</div></div></li></ul>
-
-
-<h2 id="ReleaseGuide-Maven2Setup">Maven 2 Setup</h2>
-
-<p>Before you deploy anything to the maven repository using Maven 2, you should configure your ~/.m2/settings.xml file so that the file permissions of the deployed artifacts are group writable. If you do not do this, other developers will not able to overwrite your SNAPSHOT releases with newer versions. The settings follow the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/committer-settings.html">guidelines </a> used by the Maven project. Please pay particular attention to the <a shape="rect" class="external-link" href="http://maven.apache.org/guides/mini/guide-encryption.html">password encryption recommendations</a>.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-<settings>
+</div></div></li></ul><h2 id="ReleaseGuide-Maven2Setup">Maven 2 Setup</h2><p>Before you deploy anything to the maven repository using Maven 2, you should configure your ~/.m2/settings.xml file so that the file permissions of the deployed artifacts are group writable. If you do not do this, other developers will not able to overwrite your SNAPSHOT releases with newer versions. The settings follow the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/committer-settings.html">guidelines </a> used by the Maven project. Please pay particular attention to the <a shape="rect" class="external-link" href="http://maven.apache.org/guides/mini/guide-encryption.html">password encryption recommendations</a>.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[<settings>
...
<servers>
<!-- Per http://maven.apache.org/developers/committer-settings.html -->
@@ -156,133 +137,65 @@ PATH=$PATH:/usr/local/bin/prince
...
</settings>
]]></script>
-</div></div>
-
-<p>It is also essential that you configure your umask to 2 on people.apache.org for non-interactive login. You can do that by including the snipped below in your <code>.profile</code>.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-umask 002
+</div></div><p>It is also essential that you configure your umask to 2 on people.apache.org for non-interactive login. You can do that by including the snipped below in your <code>.profile</code>.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[umask 002
]]></script>
-</div></div>
-
-
-<h3 id="ReleaseGuide-CreatingtheCamelRelease">Creating the Camel Release</h3>
-
-<p>The release plugin will prompt for a release version, tag and next release version. Use a three digit release version of the form: 2.x.x and for the tag use a string of the form: camel-2.x.x. The next version string should use the two digit from: 2.x-SNAPSHOT as this can be consistent for future SNAPSHOT releases.</p>
-
-<ol><li>Grab the latest source from Git
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-git clone https://git-wip-us.apache.org/repos/asf/camel.git
+</div></div><h3 id="ReleaseGuide-CreatingtheCamelRelease">Creating the Camel Release</h3><p>The release plugin will prompt for a release version, tag and next release version. Use a three digit release version of the form: 2.x.x and for the tag use a string of the form: camel-2.x.x. The next version string should use the two digit from: 2.x-SNAPSHOT as this can be consistent for future SNAPSHOT releases.</p><ol><li><p>Grab the latest source from Git</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[git clone https://git-wip-us.apache.org/repos/asf/camel.git
cd camel
]]></script>
-</div></div></li><li>Verify headers with <a shape="rect" class="external-link" href="http://incubator.apache.org/rat/apache-rat-plugin/usage.html">rat</a>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-mvn -e org.apache.rat:apache-rat-plugin:check
+</div></div></li><li><p>Verify headers with <a shape="rect" class="external-link" href="http://incubator.apache.org/rat/apache-rat-plugin/usage.html">rat</a></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[mvn -e org.apache.rat:apache-rat-plugin:check
grep -e ' !?????' target/rat.txt -- will show any files without licenses
]]></script>
-</div></div>
- <div class="aui-message hint shadowed information-macro">
+</div></div> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
-
-<p>Because of <a shape="rect" class="external-link" href="http://jira.codehaus.org/browse/MRELEASE-812" rel="nofollow">MRELEASE-812</a>, you should use the following setting:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-LANG='en_US.UTF-8'
+ <p>Because of <a shape="rect" class="external-link" href="http://jira.codehaus.org/browse/MRELEASE-812" rel="nofollow">MRELEASE-812</a>, you should use the following setting:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[LANG='en_US.UTF-8'
]]></script>
</div></div>
</div>
</div>
-</li><li>Do a release dry run to check for problems
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-mvn release:prepare -DdryRun=true
+</li><li><p>Do a release dry run to check for problems</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[mvn release:prepare -DdryRun=true
]]></script>
-</div></div>
-Check that you are happy with the results. The poms for the proposed tags will be in pom.xml.tag. Check also the generated signature files:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-cmueller$ gpg camel-core/target/camel-core-2.7.5-SNAPSHOT.jar.asc
+</div></div><p>Check that you are happy with the results. The poms for the proposed tags will be in pom.xml.tag. Check also the generated signature files:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[cmueller$ gpg camel-core/target/camel-core-2.7.5-SNAPSHOT.jar.asc
gpg: Signature made Tue Jan 10 20:50:27 2012 CET using RSA key ID 2A239C2C
gpg: Good signature from "Christian Mueller (CODE SIGNING KEY) <cmueller@apache.org>"
]]></script>
-</div></div>
-When you like the results, clean up:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-mvn release:clean
-]]></script>
-</div></div></li><li>Prepare the release
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-mvn release:prepare
+</div></div><p>When you like the results, clean up:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[mvn release:clean
]]></script>
-</div></div>
-This will create the tag in svn and leave various stuff around locally to direct the perform phase.
- <div class="aui-message hint shadowed information-macro">
+</div></div></li><li><p>Prepare the release</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[mvn release:prepare
+]]></script>
+</div></div><p>This will create the tag in svn and leave various stuff around locally to direct the perform phase.</p> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
-
-<p><strong>Note:</strong> If you're located in Europe then release:prepare may fail with '<em>Unable to tag SCM</em>' and '<em>svn: No such revision X</em>'. Wait 10 seconds and run</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-mvn release:prepare
+ <p><strong>Note:</strong> If you're located in Europe then release:prepare may fail with '<em>Unable to tag SCM</em>' and '<em>svn: No such revision X</em>'. Wait 10 seconds and run</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[mvn release:prepare
]]></script>
-</div></div>
-<p>again.</p>
+</div></div><p>again.</p>
</div>
</div>
-</li><li>Perform the release to the staging repo
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-mvn release:perform
+</li><li><p>Perform the release to the staging repo</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[mvn release:perform
]]></script>
-</div></div></li><li>Close the staging repository<br clear="none">
-Quote from the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">Maven release guide for Apache projects</a>
-<blockquote><p> Login to <a shape="rect" class="external-link" href="https://repository.apache.org">https://repository.apache.org</a> using your Apache LDAP credentials. Click on "Staging Repositories". Then select "org.apache.camel-xxx" in the list of repositories, where xxx represents your username and ip. Click "Close" on the tool bar above. This will close the repository from future deployments and make it available for others to view. If you are staging multiple releases together, skip this step until you have staged everything. Enter the name and version of the artifact being released in the "Description" field and then click "Close". This will make it easier to identify it later.</p></blockquote>
-See the image in the original guide for more info.</li><li>Verify staged artifacts<br clear="none">
-Quote from the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">original guide</a>
-<blockquote>
-<p>If you click on your repository, a tree view will appear below. You can then browse the contents to ensure the artifacts are as you expect them. Pay particular attention to the existence of *.asc (signature) files. If the you don't like the content of the repository, right click your repository and choose "Drop". You can then rollback your release and repeat the process.<br clear="none">
-Note the repository URL, you will need this in your vote email.</p></blockquote></li></ol>
-
-
-<h2 id="ReleaseGuide-TestingtheCamelReleaseCandidate">Testing the Camel Release Candidate</h2>
-
-<p>When folks need to test out a release candidate, the jars will not have been uploaded to the central Maven repo. This means that the example programs which use Maven will not automatically work and you need to follow the <a shape="rect" href="testing-a-release-candidate.html">Testing a release candidate</a> guidelines.<br clear="none">
-Afterwards send out the VOTE for this release candidate to the dev@ mailing list.</p>
-
-<h2 id="ReleaseGuide-Manuallyupdatingfiles">Manually updating files</h2>
-
-<p>The <code>pom.xml</code> files in <code>etc</code>, <code>tests/camel-itest-karaf</code>, <code>tests/camel-itest-osgi</code>, <code>tests/camel-itest-performance</code> and <code>tests/camel-performance</code> need to be manually updated with the Camel version number in the <code><parent></code> tag. </p>
-
-<h2 id="ReleaseGuide-AnnouncingtheCamelRelease">Announcing the Camel Release</h2>
-<p>If the VOTE pass, </p>
-
-<ol><li>Close it by sending the RESULT to the mailing list.</li><li>Promote the artifacts to the central repo. For this login to <a shape="rect" class="external-link" href="https://repository.apache.org">https://repository.apache.org</a> using your Apache LDAP credentials. Click on "Staging Repositories". Select "org.apache.camel-xxx" in the list of repositories, where xxx represents your username and ip. Click "Release" on the tool bar above. This will promote all artifacts to the central maven repo. Enter the name and version of the artifact being released in the "Description" field and then click "Release". This will make it easier to identify it later.</li><li>Perform a <a shape="rect" class="external-link" href="https://issues.apache.org/jira/plugins/servlet/project-config/CAMEL/versions">release in JIRA</a> and create a new release version in JIRA</li><li>There should be already a release notes page in the <a shape="rect" href="in-progress.html">In Progress</a> folder (if not
create one based on the <a shape="rect" href="camel-xyz-release-template.html">Camel x.y.z Release (template)</a>). Edit it and change the number of fixed issues and update its parent to be the <a shape="rect" href="download.html">Download</a> page. Now would be a good time to create a new release notes page for the next release based on the template mentioned before. It is useful and simpler to keep it up to date during the development cycle.</li><li>Copy the newly deployed distribution to Apache website:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-cd ${CAMEL_ROOT_DIR}/etc/scripts
+</div></div></li><li>Close the staging repository<br clear="none"> Quote from the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">Maven release guide for Apache projects</a><blockquote><p>Login to <a shape="rect" class="external-link" href="https://repository.apache.org">https://repository.apache.org</a> using your Apache LDAP credentials. Click on "Staging Repositories". Then select "org.apache.camel-xxx" in the list of repositories, where xxx represents your username and ip. Click "Close" on the tool bar above. This will close the repository from future deployments and make it available for others to view. If you are staging multiple releases together, skip this step until you have staged everything. Enter the name and version of the artifact being released in the "Description" field and then click "Close". This will make it easier to identify it later.</p></blockquote>See the image in the original guide for more info.</l
i><li>Verify staged artifacts<br clear="none"> Quote from the <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">original guide</a><blockquote><p>If you click on your repository, a tree view will appear below. You can then browse the contents to ensure the artifacts are as you expect them. Pay particular attention to the existence of *.asc (signature) files. If the you don't like the content of the repository, right click your repository and choose "Drop". You can then rollback your release and repeat the process.<br clear="none"> Note the repository URL, you will need this in your vote email.</p></blockquote></li></ol><h2 id="ReleaseGuide-TestingtheCamelReleaseCandidate">Testing the Camel Release Candidate</h2><p>When folks need to test out a release candidate, the jars will not have been uploaded to the central Maven repo. This means that the example programs which use Maven will not automatically work and you need to follow
the <a shape="rect" href="testing-a-release-candidate.html">Testing a release candidate</a> guidelines.<br clear="none"> Afterwards send out the VOTE for this release candidate to the dev@ mailing list.</p><h2 id="ReleaseGuide-Manuallyupdatingfiles">Manually updating files</h2><p>The <code>pom.xml</code> files in <code>etc</code>, <code>tests/camel-itest-karaf</code>, <code>tests/camel-itest-osgi</code>, <code>tests/camel-itest-performance</code> and <code>tests/camel-performance</code> need to be manually updated with the Camel version number in the <code><parent></code> tag.</p><h2 id="ReleaseGuide-AnnouncingtheCamelRelease">Announcing the Camel Release</h2><p>If the VOTE pass,</p><ol><li>Close it by sending the RESULT to the mailing list.</li><li>Promote the artifacts to the central repo. For this login to <a shape="rect" class="external-link" href="https://repository.apache.org">https://repository.apache.org</a> using your Apache LDAP credentials. Click on "Staging Reposi
tories". Select "org.apache.camel-xxx" in the list of repositories, where xxx represents your username and ip. Click "Release" on the tool bar above. This will promote all artifacts to the central maven repo. Enter the name and version of the artifact being released in the "Description" field and then click "Release". This will make it easier to identify it later.</li><li>Perform a <a shape="rect" class="external-link" href="https://issues.apache.org/jira/plugins/servlet/project-config/CAMEL/versions">release in JIRA</a> and create a new release version in JIRA</li><li>There should be already a release notes page in the <a shape="rect" href="in-progress.html">In Progress</a> folder (if not create one based on the <a shape="rect" href="camel-xyz-release-template.html">Camel x.y.z Release (template)</a>). Edit it and change the number of fixed issues and update its parent to be the <a shape="rect" href="download.html">Download</a> page. Now would be a good time to create a new release
notes page for the next release based on the template mentioned before. It is useful and simpler to keep it up to date during the development cycle.</li><li><p>Copy the newly deployed distribution to Apache website:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[cd ${CAMEL_ROOT_DIR}/etc/scripts
release-distro.sh <Camel version>
]]></script>
-</div></div>
-Check the console output and finish this step manually after checking the artifacts.</li><li>Copy the KEYS file by ssh into /www/www.apache.org/dist/camel/apache-camel/ on people.apache.org <strong>if</strong> you changed it</li><li>Update the <a shape="rect" href="download.html">Download</a> page to refer to the latest release distributions (search & replace the version numbers mostly)</li><li>Upload the newly deployed schema and the manual to Apache:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-cd ${CAMEL_ROOT_DIR}/etc/scripts
+</div></div><p>Check the console output and finish this step manually after checking the artifacts.</p></li><li>Copy the KEYS file by ssh into /www/www.apache.org/dist/camel/apache-camel/ on people.apache.org <strong>if</strong> you changed it</li><li>Update the <a shape="rect" href="download.html">Download</a> page to refer to the latest release distributions (search & replace the version numbers mostly)</li><li><p>Upload the newly deployed schema and the manual to Apache:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[cd ${CAMEL_ROOT_DIR}/etc/scripts
release-website.sh <Camel version>
]]></script>
-</div></div>
-Check the console output and finish this step manually after checking the artifacts.</li><li>Upload the javadocs to Apache, you need to checkout the files from "https://svn.apache.org/repos/infra/websites/production/camel/content/maven/"
- <div class="aui-message hint shadowed information-macro">
+</div></div><p>Check the console output and finish this step manually after checking the artifacts.</p></li><li><p>Upload the javadocs to Apache, you need to checkout the files from "https://svn.apache.org/repos/infra/websites/production/camel/content/maven/"</p> <div class="aui-message hint shadowed information-macro">
<p class="title">Using SVN the first time on people.apache.org</p>
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
-
-<p>To be able to perform a checkout on people.apache.org from svn.apache.org, you have to trust the server certificate:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
+ <p>To be able to perform a checkout on people.apache.org from svn.apache.org, you have to trust the server certificate:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
<pre>svn list "https://svn.apache.org/repos/infra/websites/production/camel/content"
Error validating server certificate for 'https://svn.apache.org:443':
The certificate is not issued by a trusted authority. Use the fingerprint to validate the certificate manually!
@@ -296,57 +209,22 @@ Certificate information:
</div></div>
</div>
</div>
-
- <ol><li>Copy $<code>CAMEL_ROOT</code>/trunk/etc/scripts/release-website.sh to your home directory on people.apache.org</li><li>Execute this script, e.g: ./release-website.sh 2.10.0
- <ol><li>It will download the XML Schema files and the Camel manual for the given release version</li><li>At the end you have to commit these changes manually to SVN (simply follow the instructions)</li></ol>
- </li></ol>
- </li><li>Update the <a shape="rect" href="xml-reference.html">Xml Reference</a> page with a link to the XSD's</li><li>Update the <a shape="rect" href="manual.html">Manual</a> page with a link to the PDF/HTML <strong>if</strong> it's a new major/minor version</li><li>Mail the <a shape="rect" class="external-link" href="mailto:dev@camel.apache.org" rel="nofollow">dev</a>, <a shape="rect" class="external-link" href="mailto:user@camel.apache.org" rel="nofollow">user</a> & <a shape="rect" class="external-link" href="mailto:announce@apache.org" rel="nofollow">announce</a> lists</li><li><a shape="rect" href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=CAMEL">Post</a> a news entry in the wiki which <strong>links to the release page</strong> so folks can download it!</li><li>perform a full export of the Camel WIKI sites to see your blog on the Camel index site. To do this, you have to remove the main.pageCache file in the content/cache sub directory:
- <ol><li>execute: svn rm <a shape="rect" class="external-link" href="https://svn.apache.org/repos/infra/websites/production/camel/content/cache/main.pageCache">https://svn.apache.org/repos/infra/websites/production/camel/content/cache/main.pageCache</a></li></ol>
- </li><li>Add the release version number to the following <code>spring.schemas</code> file located in <code>src/main/resources/META-INF</code> directory of the following components:<br clear="none">
- camel-cxf<br clear="none">
- camel-spring<br clear="none">
- camel-spring-integration<br clear="none">
- camel-spring-security</li><li>Have a beer! <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"></li></ol>
-
-
-<h2 id="ReleaseGuide-Createanewmaintenancebranch">Create a new maintenance branch </h2>
-<p>When we finish the major version release, we need to create a maintenance branch to holds the bug fixes. Here are the steps for it.</p>
-<ol><li>Create a branch from trunk remotely
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-svn copy -m "create camel 2.10.x fix branch" https://svn.apache.org/repos/asf/camel/trunk/ https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
-]]></script>
-</div></div></li></ol>
-
-
-<ol><li>Check out the remote branch in a new directory
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-svn checkout https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
-]]></script>
-</div></div></li></ol>
-
-
-<ol><li>Initialize merge tracking for the new branch
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-cd camel-2.10.x
+<ol><li>Copy $<code>CAMEL_ROOT</code>/trunk/etc/scripts/release-website.sh to your home directory on people.apache.org</li><li>Execute this script, e.g: ./release-website.sh 2.10.0<ol><li>It will download the XML Schema files and the Camel manual for the given release version</li><li>At the end you have to commit these changes manually to SVN (simply follow the instructions)</li></ol></li></ol></li><li>Update the <a shape="rect" href="xml-reference.html">Xml Reference</a> page with a link to the XSD's</li><li>Update the <a shape="rect" href="manual.html">Manual</a> page with a link to the PDF/HTML <strong>if</strong> it's a new major/minor version</li><li>Mail the <a shape="rect" class="external-link" href="mailto:dev@camel.apache.org" rel="nofollow">dev</a>, <a shape="rect" class="external-link" href="mailto:user@camel.apache.org" rel="nofollow">user</a> & <a shape="rect" class="external-link" href="mailto:announce@apache.org" rel="nofollow">announce</a> lists</li><li><a shape=
"rect" href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=CAMEL">Post</a> a news entry in the wiki which <strong>links to the release page</strong> so folks can download it!</li><li>perform a full export of the Camel WIKI sites to see your blog on the Camel index site. To do this, you have to remove the main.pageCache file in the content/cache sub directory:<ol><li>execute: svn rm <a shape="rect" class="external-link" href="https://svn.apache.org/repos/infra/websites/production/camel/content/cache/main.pageCache">https://svn.apache.org/repos/infra/websites/production/camel/content/cache/main.pageCache</a></li></ol></li><li>Add the release version number to the following <code>spring.schemas</code> file located in <code>src/main/resources/META-INF</code> directory of the following components:<br clear="none"> camel-cxf<br clear="none"> camel-spring<br clear="none"> camel-spring-integration<br clear="none"> camel-spring-security</li><li>Have a beer! <img cl
ass="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"></li></ol><h2 id="ReleaseGuide-Createanewmaintenancebranch">Create a new maintenance branch</h2><p>When we finish the major version release, we need to create a maintenance branch to holds the bug fixes. Here are the steps for it.</p><ol><li><p>Create a branch from trunk remotely</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[svn copy -m "create camel 2.10.x fix branch" https://svn.apache.org/repos/asf/camel/trunk/ https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
+]]></script>
+</div></div></li></ol><ol><li><p>Check out the remote branch in a new directory</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[svn checkout https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
+]]></script>
+</div></div></li></ol><ol><li><p>Initialize merge tracking for the new branch</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[cd camel-2.10.x
svnmerge.py init -f commit.txt https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
svn ci -F commit.txt
]]></script>
-</div></div></li></ol>
-
-
-<ol><li>Update the version number for the next patch release
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-find ./ -name pom.xml |xargs perl -pi -e 's/2.11-SNAPSHOT/2.10.x-SNAPSHOT/g'
+</div></div></li></ol><ol><li><p>Update the version number for the next patch release</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[find ./ -name pom.xml |xargs perl -pi -e 's/2.11-SNAPSHOT/2.10.x-SNAPSHOT/g'
svn ci -m "Update the pom version for next patch release"
]]></script>
-</div></div></li></ol>
-
-
-<ol><li>Set up a new continuous integration build, if we release a new major/minor version: <a shape="rect" class="external-link" href="https://builds.apache.org/view/A-D/view/Camel/">https://builds.apache.org/view/A-D/view/Camel/</a></li></ol></div>
+</div></div></li></ol><ol><li>Set up a new continuous integration build, if we release a new major/minor version: <a shape="rect" class="external-link" href="https://builds.apache.org/view/A-D/view/Camel/">https://builds.apache.org/view/A-D/view/Camel/</a></li></ol></div>
</td>
<td valign="top">
<div class="navigation">