You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2015/07/22 20:02:14 UTC
[2/2] deltaspike git commit: DELTASPIKE-961 information about v1.4.2
DELTASPIKE-961 information about v1.4.2
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/04bd9999
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/04bd9999
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/04bd9999
Branch: refs/heads/master
Commit: 04bd99992f1004f347d5b5c1a54a51988dd4f1d5
Parents: 60eab56
Author: gpetracek <gp...@apache.org>
Authored: Wed Jul 22 20:01:27 2015 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Wed Jul 22 20:01:46 2015 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
site/src/main/asciidoc/news.adoc | 6 ++++++
site/src/main/asciidoc/steps_for_a_release.adoc | 8 ++++----
3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/04bd9999/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b8eeee..0890893 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@
<properties>
<asciidoctor.version>1.5.2</asciidoctor.version>
- <version.deltaspike.latest.stable>1.4.1</version.deltaspike.latest.stable>
- <version.deltaspike.latest.snapshot>1.4.2-SNAPSHOT</version.deltaspike.latest.snapshot>
+ <version.deltaspike.latest.stable>1.4.2</version.deltaspike.latest.stable>
+ <version.deltaspike.latest.snapshot>1.4.3-SNAPSHOT</version.deltaspike.latest.snapshot>
<svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
</properties>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/04bd9999/site/src/main/asciidoc/news.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/news.adoc b/site/src/main/asciidoc/news.adoc
index 1918c2a..00025e4 100644
--- a/site/src/main/asciidoc/news.adoc
+++ b/site/src/main/asciidoc/news.adoc
@@ -4,6 +4,12 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+== 18th Release (1.4.2) (19.07.2015)
+
+The Apache DeltaSpike team is pleased to announce the 18th release
+(v1.4.2).
+
+
== 17th Release (1.4.1) (12.06.2015)
The Apache DeltaSpike team is pleased to announce the 17th release
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/04bd9999/site/src/main/asciidoc/steps_for_a_release.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/steps_for_a_release.adoc b/site/src/main/asciidoc/steps_for_a_release.adoc
index 5bd9fa8..d45a6ae 100644
--- a/site/src/main/asciidoc/steps_for_a_release.adoc
+++ b/site/src/main/asciidoc/steps_for_a_release.adoc
@@ -46,7 +46,7 @@ deploy a demo app especially with jsf-impl-ee6 to an ee6 server and check the lo
-----------------------------------------------------------------------------------------------------------------------
//install a version of git which is compatible with the release-plugin (e.g. v1.8.3.2)
-git checkout -b deltaspike-[release version]
+git checkout -b ds-[release version]
mvn release:prepare -Pdistribution -DreleaseProfiles=distribution
@@ -62,7 +62,7 @@ mvn release:perform -Pdistribution -DreleaseProfiles=distribution
//push the release-branch and tag to a third-party git repo
git remote add vote https://github.com/[user]/deltaspike-vote
git push -u vote master
-git push vote deltaspike-[release version]
+git push vote ds-[release version]
git push vote --tags
-----------------------------------------------------------------------------------------------------------------------
@@ -145,9 +145,9 @@ Always do a merge in this case (not a rebase):
-----------------------------------------------------------------------------------------------------------------------
git checkout master
-git merge deltaspike-[version]
+git merge ds-[version]
+git push origin ds-[version]
git push origin deltaspike-[version]
-git push origin deltaspike-project-[version]
git push origin master
-----------------------------------------------------------------------------------------------------------------------