This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.4.x by this push:
new 78a69c1 Reorder the release guide section (#3930) (#3931)
78a69c1 is described below
commit 78a69c1fb6306b031101a8710ea45bf86abc4a45
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 17 16:31:29 2020 +0200
Reorder the release guide section (#3930) (#3931)
Co-authored-by: Andrea Cosentino <anco...@gmail.com>
---
.../modules/ROOT/pages/release-guide.adoc | 79 ++++++++++++----------
1 file changed, 43 insertions(+), 36 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/release-guide.adoc
b/docs/user-manual/modules/ROOT/pages/release-guide.adoc
index 1d8635a..040537b 100644
--- a/docs/user-manual/modules/ROOT/pages/release-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/release-guide.adoc
@@ -248,48 +248,14 @@ If the you don't like the content of the repository,
right click your repository
You can then rollback your release and repeat the process.
Note the repository URL, you will need this in your vote email.
-[[ReleaseGuide-PublishingTheRelease-Camel]]
-== Publishing the Release
-
-. Once the release has been voted:
+. Once the release has been voted
* Login to https://repository.apache.org 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.
+your username and ip.
Click "Release" on the tool bar above.
This will release the artifacts.
-. Perform a release in JIRA:
-
-* Release the version in JIRA:
https://issues.apache.org/jira/plugins/servlet/project-config/CAMEL/versions
-
-. Copy distribution to Apache website:
-
- cd ${CAMEL_ROOT_DIR}/etc/scripts
- ./release-distro.sh <Camel version>
-
-. Remove the old distribution version from the Apache webstie:
-
- svn rm
https://dist.apache.org/repos/dist/release/camel/apache-camel/OLD_CAMEL_VERSION
-m "Removed the old release"
-
-. Upload the new schema files (and the manual):
-
- cd ${CAMEL_ROOT_DIR}/etc/scripts
- ./release-website.sh <Camel version>
-
-. Merge the release branch back into the corresponding base branch (e.g. merge
`release/3.2.0` into `camel-3.2.x`)
-
- git checkout BASE_BRANCH
- git pull
- git merge --no-ff release/VERSION
- git push
-
-. Delete the local and remote release branch:
-
- git branch -D release/VERSION
- git push origin --delete release/VERSION
-
-
[[ReleaseGuide-CreatingTheRelease-Camel-karaf]]
== Creating the Release for camel-karaf
@@ -380,6 +346,47 @@ your username and ip.
Click "Release" on the tool bar above.
This will release the artifacts.
+[[ReleaseGuide-PublishingTheRelease-Camel]]
+== Publishing the Release
+
+. Once the release has been voted:
+
+* Login to https://repository.apache.org 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 "Release" on the tool bar above.
+This will release the artifacts.
+
+. Perform a release in JIRA:
+
+* Release the version in JIRA:
https://issues.apache.org/jira/plugins/servlet/project-config/CAMEL/versions
+
+. Copy distribution to Apache website:
+
+ cd ${CAMEL_ROOT_DIR}/etc/scripts
+ ./release-distro.sh <Camel version>
+
+. Remove the old distribution version from the Apache webstie:
+
+ svn rm
https://dist.apache.org/repos/dist/release/camel/apache-camel/OLD_CAMEL_VERSION
-m "Removed the old release"
+
+. Upload the new schema files (and the manual):
+
+ cd ${CAMEL_ROOT_DIR}/etc/scripts
+ ./release-website.sh <Camel version>
+
+. Merge the release branch back into the corresponding base branch (e.g. merge
`release/3.2.0` into `camel-3.2.x`)
+
+ git checkout BASE_BRANCH
+ git pull
+ git merge --no-ff release/VERSION
+ git push
+
+. Delete the local and remote release branch:
+
+ git branch -D release/VERSION
+ git push origin --delete release/VERSION
+
[[Publish-xsd-schemas]]
== Publish xsd schemas
