deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rafab...@apache.org
Subject svn commit: r1644988 [2/2] - /deltaspike/site/trunk/content/staging/
Date Fri, 12 Dec 2014 17:39:52 GMT
Added: deltaspike/site/trunk/content/staging/news.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/news.html?rev=1644988&view=auto
==============================================================================
--- deltaspike/site/trunk/content/staging/news.html (added)
+++ deltaspike/site/trunk/content/staging/news.html Fri Dec 12 17:39:51 2014
@@ -0,0 +1,613 @@
+<!DOCTYPE html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="deltaspike-generate-pages">
+<meta name="author" content="chm">
+
+<title>Apache DeltaSpike News</title>
+
+<!-- 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 &quot;License&quot;); 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 &quot;AS IS&quot; 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. -->
+
+<!-- Styles -->
+
+<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+
+<style type="text/css">
+/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
+body {
+	padding-top: 60px;
+	padding-bottom: 40px;
+}
+</style>
+<script type="text/javascript">
+
+	  var _gaq = _gaq || [];
+	  _gaq.push(['_setAccount', 'UA-36103647-1']);
+	  _gaq.push(['_trackPageview']);
+	
+	  (function() {
+		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+	  })();
+	
+	</script>
+</head>
+
+<body>
+
+	<div class="navbar navbar-fixed-top">
+		<div class="navbar-inner">
+			<div class="container">
+				<a class="btn btn-navbar" data-toggle="collapse"
+					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
+					class="icon-bar"></span> <span class="icon-bar"></span>
+				</a> <a class="brand logocolor"
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+				<div class="nav-collapse">
+					<ul class="nav">
+						<li class="active"><a
+							href="index.html">Home</a></li>
+						<li><a href="./documentation">Documentation</a></li>
+						<li><a href="./javadoc.html">Javadoc</a></li>
+						<li><a href="./documentation/source.html">Source</a></li>
+						<li><a href="./download.html">Download</a></li>
+						<li><a href="./community.html">Community</a></li>
+						<!-- <li><a href="./support.html">Support</a></li>  -->
+						<li><a href="./news.html">News</a></li>
+						<li><a href="./migration-guide.html">Migration</a></li>
+					</ul>
+				</div>
+				<!--/.nav-collapse -->
+				<form id="search-form" action="http://www.google.com/search"
+					method="get" class="navbar-search pull-right">
+					<input value="deltaspike.apache.org" name="sitesearch"
+						type="hidden"> <input class="search-query" name="q"
+						id="query" type="text">
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<div class="container">
+		<div class="row">
+			<div class="span12">
+				<div class="page-title">
+			    <h1>Apache DeltaSpike News</h1>
+                </div>
+
+				<div id="toc" class="toc">
+       	 		<ul class="sectlevel1">
+<li><a href="#_overview">Overview</a>
+<ul class="sectlevel2">
+<li><a href="#_13th_release_1_2_0_30_11_2014">13th Release (1.2.0) (30.11.2014)</a></li>
+<li><a href="#_new_pmc_member_20_11_2014">New PMC Member (20.11.2014)</a></li>
+<li><a href="#_12th_release_1_1_0_01_11_2014">12th Release (1.1.0) (01.11.2014)</a></li>
+<li><a href="#_duke_s_choice_award_28_09_2014">Duke&#8217;s Choice Award (28.09.2014)</a></li>
+<li><a href="#_11th_release_1_0_3_21_09_2014">11th Release (1.0.3) (21.09.2014)</a></li>
+<li><a href="#_10th_release_1_0_2_17_08_2014">10th Release (1.0.2) (17.08.2014)</a></li>
+<li><a href="#_9th_release_1_0_1_13_07_2014">9th Release (1.0.1) (13.07.2014)</a></li>
+<li><a href="#_8th_release_1_0_0_14_06_2014">8th Release (1.0.0) (14.06.2014)</a></li>
+<li><a href="#_new_committer_18_05_2014">New Committer (18.05.2014)</a></li>
+<li><a href="#_7th_release_0_7_03_05_2014">7th Release (0.7) (03.05.2014)</a></li>
+<li><a href="#_6th_release_0_6_20_03_2014">6th Release (0.6) (20.03.2014)</a></li>
+<li><a href="#_new_committer_14_12_2013">New Committer (14.12.2013)</a></li>
+<li><a href="#_5th_release_0_5_18_09_2013">5th Release (0.5) (18.09.2013)</a></li>
+<li><a href="#_4th_release_0_4_31_05_2013">4th Release (0.4) (31.05.2013)</a></li>
+<li><a href="#_graduation_28_05_2013">Graduation (28.05.2013)</a></li>
+<li><a href="#_3rd_release_0_3_incubating_22_08_2012">3rd Release (0.3 incubating) (22.08.2012)</a></li>
+<li><a href="#_new_committer_21_08_2012">New Committer (21.08.2012)</a></li>
+<li><a href="#_new_committers_11_07_2012">New Committers (11.07.2012)</a></li>
+<li><a href="#_apache_cms_30_05_2012">Apache CMS (30.05.2012)</a></li>
+<li><a href="#_2nd_release_0_2_incubating_22_04_2012">2nd Release (0.2 incubating) (22.04.2012)</a></li>
+<li><a href="#_1st_release_0_1_incubating_10_02_2012">1st Release (0.1 incubating) (10.02.2012)</a></li>
+<li><a href="#_execution_of_integration_tests_with_remote_servers_01_02_2012">Execution of integration tests with remote servers (01.02.2012)</a></li>
+<li><a href="#_new_committer_29_01_2012">New Committer (29.01.2012)</a></li>
+<li><a href="#_new_committer_28_01_2012">New Committer (28.01.2012)</a></li>
+<li><a href="#_new_committer_27_01_2012">New Committer (27.01.2012)</a></li>
+<li><a href="#_nabble_mirror_21_01_2012">Nabble Mirror (21.01.2012)</a></li>
+<li><a href="#_new_committers_13_01_2012">New Committers (13.01.2012)</a></li>
+<li><a href="#_github_mirror_12_01_2012">GitHub Mirror (12.01.2012)</a></li>
+<li><a href="#_creation_of_the_status_page_30_12_2011">Creation of the Status Page (30.12.2011)</a></li>
+<li><a href="#_nightly_builds_29_12_2011">Nightly builds (29.12.2011)</a></li>
+<li><a href="#_sonar_build_29_12_2011">Sonar build (29.12.2011)</a></li>
+<li><a href="#_first_commit_22_12_2011">First Commit (22.12.2011)</a></li>
+<li><a href="#_first_jira_ticket_13_12_2011">First JIRA ticket (13.12.2011)</a></li>
+<li><a href="#_first_report_12_2011_12_12_2011">First report 12.2011 (12.12.2011)</a></li>
+<li><a href="#_twitter_account">Twitter Account</a></li>
+<li><a href="#_mailing_lists_8_12_2011">Mailing-lists (8.12.2011)</a></li>
+<li><a href="#_vote_closed_7_12_2011">Vote closed (7.12.2011)</a></li>
+<li><a href="#_vote_to_join_the_incubator_4_12_2011">Vote to join the Incubator (4.12.2011)</a></li>
+<li><a href="#_proposal_30_11_2011">Proposal (30.11.2011)</a></li>
+</ul>
+</li>
+</ul>
+       	 		<hr>	
+       	 		
+				<div class="sect1">
+<h2 id="_overview">Overview</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_13th_release_1_2_0_30_11_2014">13th Release (1.2.0) (30.11.2014)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 13th release
+(v1.2.0).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DeltaSpike_1.2.0">release notes</a> contains 22 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_new_pmc_member_20_11_2014">New PMC Member (20.11.2014)</h3>
+<div class="paragraph">
+<p>Thomas Andraschko joined our PMC.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_12th_release_1_1_0_01_11_2014">12th Release (1.1.0) (01.11.2014)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 12th release (v1.1.0).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DeltaSpike_1.1.0">release notes</a> contains 24 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_duke_s_choice_award_28_09_2014">Duke&#8217;s Choice Award (28.09.2014)</h3>
+<div class="paragraph">
+<p>We won a <a href="https://blogs.oracle.com/java/entry/2014_duke_s_choice_award">Duke&#8217;s Choice Award</a>!</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_11th_release_1_0_3_21_09_2014">11th Release (1.0.3) (21.09.2014)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 11th release (v1.0.3).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DeltaSpike_1.0.3">release notes</a> contains 20 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_10th_release_1_0_2_17_08_2014">10th Release (1.0.2) (17.08.2014)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 10th release (v1.0.2).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DeltaSpike_1.0.2">release notes</a> contains 15 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_9th_release_1_0_1_13_07_2014">9th Release (1.0.1) (13.07.2014)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 9th release (v1.0.1).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DeltaSpike_1.0.1">release notes</a> contains 18 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_8th_release_1_0_0_14_06_2014">8th Release (1.0.0) (14.06.2014)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 8th release (v1.0.0).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DeltaSpike_1.0.0">release notes</a> contains 48 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_new_committer_18_05_2014">New Committer (18.05.2014)</h3>
+<div class="paragraph">
+<p>Rafael Benevides joined our development community.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_7th_release_0_7_03_05_2014">7th Release (0.7) (03.05.2014)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 7th release (v0.7).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DS-0.7-RNotes">release notes</a> contains 35 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_6th_release_0_6_20_03_2014">6th Release (0.6) (20.03.2014)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 6th release (v0.6).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DS-0.6-RNotes">release notes</a> contains 102 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_new_committer_14_12_2013">New Committer (14.12.2013)</h3>
+<div class="paragraph">
+<p>Thomas Andraschko joined our development community.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_5th_release_0_5_18_09_2013">5th Release (0.5) (18.09.2013)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the 5th release (v0.5).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DS-0.5-RNotes">release notes</a> contains 29 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_4th_release_0_4_31_05_2013">4th Release (0.4) (31.05.2013)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the fourth release (v0.4).
+This is our first release as a top level project!</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DS-0.4-RNotes">release notes</a> contains a large list of bug fixes and new features.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_graduation_28_05_2013">Graduation (28.05.2013)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce that we have complete graduation as a top level project.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_3rd_release_0_3_incubating_22_08_2012">3rd Release (0.3 incubating) (22.08.2012)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the second release (v0.3-incubating).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DeltaSpike_03incubating">release notes</a> contains 104 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_new_committer_21_08_2012">New Committer (21.08.2012)</h3>
+<div class="paragraph">
+<p>Bolesław Dawidowicz joined our development community.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_new_committers_11_07_2012">New Committers (11.07.2012)</h3>
+<div class="paragraph">
+<p>Charles Moulliard and Romain Manni-Bucau joined our development community.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_apache_cms_30_05_2012">Apache CMS (30.05.2012)</h3>
+<div class="paragraph">
+<p>The setup of the project-site in Apache CMS started.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_2nd_release_0_2_incubating_22_04_2012">2nd Release (0.2 incubating) (22.04.2012)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to announce the second release (v0.2-incubating).</p>
+</div>
+<div class="paragraph">
+<p>The <a href="http://s.apache.org/DeltaSpike_02incubating">release notes</a> contains 61 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_1st_release_0_1_incubating_10_02_2012">1st Release (0.1 incubating) (10.02.2012)</h3>
+<div class="paragraph">
+<p>The Apache DeltaSpike team is pleased to <a href="http://s.apache.org/cTt">announce</a> the first release (v0.1-incubating).</p>
+</div>
+<div class="paragraph">
+<p>The first release contains about 5 000 lines of code (including tests and 10 000 including comments). The <a href="http://s.apache.org/DeltaSpike_01incubating">release notes</a> contains 42 JIRA tickets.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_execution_of_integration_tests_with_remote_servers_01_02_2012">Execution of integration tests with remote servers (01.02.2012)</h3>
+<div class="paragraph">
+<p>C4J helps us with nightly builds which deploy our integration tests to remote-servers (AS7 and GF3).</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_new_committer_29_01_2012">New Committer (29.01.2012)</h3>
+<div class="paragraph">
+<p>Lukasz Lenart joined our development community.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_new_committer_28_01_2012">New Committer (28.01.2012)</h3>
+<div class="paragraph">
+<p>Christian Kaltepoth joined our development community.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_new_committer_27_01_2012">New Committer (27.01.2012)</h3>
+<div class="paragraph">
+<p>Rudy De Busscher joined our development community.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_nabble_mirror_21_01_2012">Nabble Mirror (21.01.2012)</h3>
+<div class="paragraph">
+<p>Dan Allen created a <a href="http://s.apache.org/deltaspike-dev_nabble">Nabble mirror</a> for the dev-list (based on <a href="http://incubator.apache.org/mail/deltaspike-dev/" class="bare">http://incubator.apache.org/mail/deltaspike-dev/</a>)</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_new_committers_13_01_2012">New Committers (13.01.2012)</h3>
+<div class="paragraph">
+<p>Dan Allen and Lincoln Baxter III are our first committers after the initial committers.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_github_mirror_12_01_2012">GitHub Mirror (12.01.2012)</h3>
+<div class="paragraph">
+<p>The infra team created our mirror (<a href="https://github.com/apache/incubator-deltaspike" class="bare">https://github.com/apache/incubator-deltaspike</a>)</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_creation_of_the_status_page_30_12_2011">Creation of the Status Page (30.12.2011)</h3>
+<div class="paragraph">
+<p>We created an initial version of our status page (<a href="http://incubator.apache.org/guides/website.html" class="bare">http://incubator.apache.org/guides/website.html</a>)</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_nightly_builds_29_12_2011">Nightly builds (29.12.2011)</h3>
+<div class="paragraph">
+<p>The infra team added the GIT plugin to Jenkins and we created build jobs for nightly builds which get deployed to
+<a href="https://repository.apache.org/content/groups/snapshots/org/apache/deltaspike/" class="bare">https://repository.apache.org/content/groups/snapshots/org/apache/deltaspike/</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_sonar_build_29_12_2011">Sonar build (29.12.2011)</h3>
+<div class="paragraph">
+<p>Gavin McDonald did the Sonar setup
+(<a href="https://analysis.apache.org/dashboard/index/org.apache.deltaspike:deltaspike-project" class="bare">https://analysis.apache.org/dashboard/index/org.apache.deltaspike:deltaspike-project</a>)</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_first_commit_22_12_2011">First Commit (22.12.2011)</h3>
+<div class="paragraph">
+<p>The infra team created our GIT repository and we made the first commit.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_first_jira_ticket_13_12_2011">First JIRA ticket (13.12.2011)</h3>
+<div class="paragraph">
+<p>We created our JIRA project and filed the first ticket.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_first_report_12_2011_12_12_2011">First report 12.2011 (12.12.2011)</h3>
+<div class="paragraph">
+<p>We submitted the first report to
+<a href="http://wiki.apache.org/incubator/December2011" class="bare">http://wiki.apache.org/incubator/December2011</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_twitter_account">Twitter Account</h3>
+<div class="paragraph">
+<p>We created our Twitter account <a href="https://twitter.com/deltaspiketeam">@DeltaSpikeTeam</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_mailing_lists_8_12_2011">Mailing-lists (8.12.2011)</h3>
+<div class="paragraph">
+<p>Matt Benson created our <a href="https://s.apache.org/Kpg">mailing-lists</a>.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_vote_closed_7_12_2011">Vote closed (7.12.2011)</h3>
+<div class="paragraph">
+<p>The vote to join the incubator was closed. There were 8 binding +1
+votes, 3 non-binding +1 votes and no -1 votes. In parallel several other
+folks showed up and told us that they are interested to join the effort.</p>
+</div>
+<div class="paragraph">
+<p>We start with the following initial committers (and therefore PPMC
+members):</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Andy Gibson</p>
+</li>
+<li>
+<p>Antoine Sabot-Durand</p>
+</li>
+<li>
+<p>Arne Limburg</p>
+</li>
+<li>
+<p>Brian Leathem</p>
+</li>
+<li>
+<p>Cody Lerum</p>
+</li>
+<li>
+<p>David Blevins</p>
+</li>
+<li>
+<p>George Gastaldi</p>
+</li>
+<li>
+<p>Gerhard Petracek</p>
+</li>
+<li>
+<p>Jakob Korherr</p>
+</li>
+<li>
+<p>Jason Porter</p>
+</li>
+<li>
+<p>John Ament</p>
+</li>
+<li>
+<p>Jozef Hartinger</p>
+</li>
+<li>
+<p>Ken Finnigan</p>
+</li>
+<li>
+<p>Marius Bogoevici</p>
+</li>
+<li>
+<p>Mark Struberg</p>
+</li>
+<li>
+<p>Matthias Wessendorf</p>
+</li>
+<li>
+<p>Pete Muir</p>
+</li>
+<li>
+<p>Pete Royle</p>
+</li>
+<li>
+<p>Rick Hightower</p>
+</li>
+<li>
+<p>Shane Bryzak</p>
+</li>
+<li>
+<p>Stuart Douglas</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Our mentors are:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>David Blevins</p>
+</li>
+<li>
+<p>Gerhard Petracek</p>
+</li>
+<li>
+<p>Jim Jagielski</p>
+</li>
+<li>
+<p>Mark Struberg</p>
+</li>
+<li>
+<p>Matt Benson</p>
+</li>
+<li>
+<p>Matthias Wessendorf</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_vote_to_join_the_incubator_4_12_2011">Vote to join the Incubator (4.12.2011)</h3>
+<div class="paragraph">
+<p>Gerhard Petracek started the official <a href="http://s.apache.org/h8">vote</a>.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_proposal_30_11_2011">Proposal (30.11.2011)</h3>
+<div class="paragraph">
+<p>After some discussions between the teams (of Apache MyFaces CODI, Seam3 and CDISource), Mark Struberg submitted the
+<a href="http://wiki.apache.org/incubator/DeltaSpikeProposal">proposal</a>. Since Spike couldn&#8217;t be used as project-name, we agreed on DeltaSpike as initial code name (delta because it closes several gaps).</p>
+</div>
+</div>
+</div>
+</div>
+			</div>
+
+			<hr>
+
+			<footer>
+				<p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+				<p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+			</footer>
+
+		</div>
+		<!-- /.container -->
+
+</body>
+</html>
\ No newline at end of file

Added: deltaspike/site/trunk/content/staging/release-preparation.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/release-preparation.html?rev=1644988&view=auto
==============================================================================
--- deltaspike/site/trunk/content/staging/release-preparation.html (added)
+++ deltaspike/site/trunk/content/staging/release-preparation.html Fri Dec 12 17:39:51 2014
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="deltaspike-generate-pages">
+<meta name="author" content="chm">
+
+<title>Reviewing an Apache Release</title>
+
+<!-- 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 &quot;License&quot;); 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 &quot;AS IS&quot; 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. -->
+
+<!-- Styles -->
+
+<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+
+<style type="text/css">
+/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
+body {
+	padding-top: 60px;
+	padding-bottom: 40px;
+}
+</style>
+<script type="text/javascript">
+
+	  var _gaq = _gaq || [];
+	  _gaq.push(['_setAccount', 'UA-36103647-1']);
+	  _gaq.push(['_trackPageview']);
+	
+	  (function() {
+		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+	  })();
+	
+	</script>
+</head>
+
+<body>
+
+	<div class="navbar navbar-fixed-top">
+		<div class="navbar-inner">
+			<div class="container">
+				<a class="btn btn-navbar" data-toggle="collapse"
+					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
+					class="icon-bar"></span> <span class="icon-bar"></span>
+				</a> <a class="brand logocolor"
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+				<div class="nav-collapse">
+					<ul class="nav">
+						<li class="active"><a
+							href="index.html">Home</a></li>
+						<li><a href="./documentation">Documentation</a></li>
+						<li><a href="./javadoc.html">Javadoc</a></li>
+						<li><a href="./documentation/source.html">Source</a></li>
+						<li><a href="./download.html">Download</a></li>
+						<li><a href="./community.html">Community</a></li>
+						<!-- <li><a href="./support.html">Support</a></li>  -->
+						<li><a href="./news.html">News</a></li>
+						<li><a href="./migration-guide.html">Migration</a></li>
+					</ul>
+				</div>
+				<!--/.nav-collapse -->
+				<form id="search-form" action="http://www.google.com/search"
+					method="get" class="navbar-search pull-right">
+					<input value="deltaspike.apache.org" name="sitesearch"
+						type="hidden"> <input class="search-query" name="q"
+						id="query" type="text">
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<div class="container">
+		<div class="row">
+			<div class="span12">
+				<div class="page-title">
+			    <h1>Reviewing an Apache Release</h1>
+                </div>
+
+				<div id="toc" class="toc">
+       	 		<ul class="sectlevel1">
+<li><a href="#_introduction">Introduction</a></li>
+</ul>
+       	 		<hr>	
+       	 		
+				<div class="sect1">
+<h2 id="_introduction">Introduction</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Once a Release has been staged on <a href="http://repository.apache.org" class="bare">http://repository.apache.org</a> it must
+be reviewed by each PMC member <strong>before</strong> casting his VOTE.</p>
+</div>
+<div class="paragraph">
+<p>The following points need to be checked:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>is the GPG signature fine?</p>
+</li>
+<li>
+<p>is there a source archive?</p>
+</li>
+<li>
+<p>can the source archive really be built?</p>
+</li>
+<li>
+<p>is there a correct LICENSE and NOTICE file in each artifact (both
+source and binary artifacts)?</p>
+</li>
+<li>
+<p>does the NOTICE file contain all necessary attributions?</p>
+</li>
+<li>
+<p>check the dependencies. We must not have any GPL dependencies and LGPL
+only if they are optional, etc! See
+<a href="http://www.apache.org/legal/3party.html" class="bare">http://www.apache.org/legal/3party.html</a></p>
+</li>
+<li>
+<p>do all the tests work?</p>
+</li>
+<li>
+<p>if there is a TCK to run, does it succeed?</p>
+</li>
+<li>
+<p>if there is a tag in the SCM, does it contain reproduceable sources?</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+			</div>
+
+			<hr>
+
+			<footer>
+				<p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+				<p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+			</footer>
+
+		</div>
+		<!-- /.container -->
+
+</body>
+</html>
\ No newline at end of file

Added: deltaspike/site/trunk/content/staging/steps_for_a_release.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/steps_for_a_release.html?rev=1644988&view=auto
==============================================================================
--- deltaspike/site/trunk/content/staging/steps_for_a_release.html (added)
+++ deltaspike/site/trunk/content/staging/steps_for_a_release.html Fri Dec 12 17:39:51 2014
@@ -0,0 +1,526 @@
+<!DOCTYPE html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="deltaspike-generate-pages">
+<meta name="author" content="chm">
+
+<title>Steps for a Release</title>
+
+<!-- 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 &quot;License&quot;); 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 &quot;AS IS&quot; 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. -->
+
+<!-- Styles -->
+
+<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+
+<style type="text/css">
+/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
+body {
+	padding-top: 60px;
+	padding-bottom: 40px;
+}
+</style>
+<script type="text/javascript">
+
+	  var _gaq = _gaq || [];
+	  _gaq.push(['_setAccount', 'UA-36103647-1']);
+	  _gaq.push(['_trackPageview']);
+	
+	  (function() {
+		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+	  })();
+	
+	</script>
+</head>
+
+<body>
+
+	<div class="navbar navbar-fixed-top">
+		<div class="navbar-inner">
+			<div class="container">
+				<a class="btn btn-navbar" data-toggle="collapse"
+					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
+					class="icon-bar"></span> <span class="icon-bar"></span>
+				</a> <a class="brand logocolor"
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+				<div class="nav-collapse">
+					<ul class="nav">
+						<li class="active"><a
+							href="index.html">Home</a></li>
+						<li><a href="./documentation">Documentation</a></li>
+						<li><a href="./javadoc.html">Javadoc</a></li>
+						<li><a href="./documentation/source.html">Source</a></li>
+						<li><a href="./download.html">Download</a></li>
+						<li><a href="./community.html">Community</a></li>
+						<!-- <li><a href="./support.html">Support</a></li>  -->
+						<li><a href="./news.html">News</a></li>
+						<li><a href="./migration-guide.html">Migration</a></li>
+					</ul>
+				</div>
+				<!--/.nav-collapse -->
+				<form id="search-form" action="http://www.google.com/search"
+					method="get" class="navbar-search pull-right">
+					<input value="deltaspike.apache.org" name="sitesearch"
+						type="hidden"> <input class="search-query" name="q"
+						id="query" type="text">
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<div class="container">
+		<div class="row">
+			<div class="span12">
+				<div class="page-title">
+			    <h1>Steps for a Release</h1>
+                </div>
+
+				<div id="toc" class="toc">
+       	 		<ul class="sectlevel1">
+<li><a href="#_preparations">Preparations</a></li>
+<li><a href="#_first_steps">First steps</a></li>
+<li><a href="#_vote">Vote</a>
+<ul class="sectlevel2">
+<li><a href="#_start_the_vote">Start the vote</a></li>
+</ul>
+</li>
+<li><a href="#_announce_the_vote">Announce the vote</a></li>
+<li><a href="#_perform_the_final_release">Perform the final release</a>
+<ul class="sectlevel2">
+<li><a href="#_close_the_vote">Close the vote</a></li>
+<li><a href="#_upload_artifacts">Upload artifacts</a></li>
+<li><a href="#_check_downloads">Check downloads</a></li>
+<li><a href="#_update_site_content">Update site content</a></li>
+<li><a href="#_announce_the_release">Announce the Release</a>
+<ul class="sectlevel3">
+<li><a href="#_e_mails">E-Mails</a></li>
+<li><a href="#_twitter">Twitter</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+       	 		<hr>	
+       	 		
+				<div class="sect1">
+<h2 id="_preparations">Preparations</h2>
+<div class="sectionbody">
+<div class="ulist">
+<ul>
+<li>
+<p>Heads up on the mailing-lists</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>e.g.:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>first steps for the next release
+
+hi @ all,
+
+if there are no objections, i'll start with the first steps for the next release (review, documentation,...).
+it would be great to start with the release procedure next week.
+
+regards,
+[name]</pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Check the documentation</p>
+</li>
+<li>
+<p>Check <a href="https://analysis.apache.org/dashboard/index/87921" class="bare">https://analysis.apache.org/dashboard/index/87921</a></p>
+</li>
+<li>
+<p>Check diff with tag of [version-1]</p>
+</li>
+<li>
+<p>Check the jenkins builds</p>
+</li>
+<li>
+<p>Create release notes and commit them to deltaspike/readme/ (format [ReleaseNotes][version].txt)</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>test at least:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>mvn clean install -POWB
+mvn clean install -PWeld
+mvn clean install -Prat
+mvn clean install -Ptomee-build-managed
+mvn clean install -Pjbossas-build-managed-7
+mvn clean install -Pwildfly-build-managed
+mvn clean install -Pglassfish-build-managed-3</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>deploy a demo app esp. with jsf-impl-ee6 to an ee6 server and check the logs (if there are no optional ee7+ classes)
+(<a href="https://github.com/os890/ee6-ds-demo" class="bare">https://github.com/os890/ee6-ds-demo</a> can be used for it e.g.)</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_first_steps">First steps</h2>
+<div class="sectionbody">
+<div class="listingblock">
+<div class="content">
+<pre>//install a version of git which is compatible with the release-plugin (e.g. v1.8.3.2)
+git checkout -b deltaspike-[release version]
+
+mvn release:prepare -Pdistribution -DreleaseProfiles=distribution
+
+//hint: don't use -DdryRun=true -- since it can break the next step
+mvn release:perform -Pdistribution -DreleaseProfiles=distribution
+
+//!!!check the created commits including user-name and email
+
+//login to https://repository.apache.org/ and go to "Staging Repositories"
+//check esp. .../org/apache/deltaspike/deltaspike-project/[version]/deltaspike-project-[version]-source-release.zip
+//close the repository
+
+//push the release-branch and tag to a 3rd 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 --tags</pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_vote">Vote</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_start_the_vote">Start the vote</h3>
+<div class="paragraph">
+<p>e.g.:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>[VOTE] Release of Apache DeltaSpike [version]
+
+
+Hi,
+
+I was running the needed tasks to get the ... release of Apache DeltaSpike out.
+The artifacts are deployed to Nexus [1] (and [2]).
+
+The tag is available at [3] and will get pushed to the ASF repository once the vote passed.
+
+Please take a look at the ... artifacts and vote!
+
+Please note:
+This vote is "majority approval" with a minimum of three +1 votes (see [4]).
+
+------------------------------------------------
+[ ] +1 for community members who have reviewed the bits
+[ ] +0
+[ ] -1 for fatal flaws that should cause these bits not to be released, and why..............
+------------------------------------------------
+
+Thanks,
+[name]
+
+[1] https://repository.apache.org/content/repositories/...
+[2] https://repository.apache.org/content/repositories/.../org/apache/deltaspike/deltaspike-project/[version]/deltaspike-project-[version]-source-release.zip
+[3] https://github.com/[user]/deltaspike-vote/tree/deltaspike-project-[version]
+[4] http://www.apache.org/foundation/voting.html#ReleaseVotes</pre>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_announce_the_vote">Announce the vote</h2>
+<div class="sectionbody">
+<div class="ulist">
+<ul>
+<li>
+<p>Create a link to the release notes at <a href="http://s.apache.org" class="bare">http://s.apache.org</a> (format DeltaSpike_[version])</p>
+</li>
+<li>
+<p>Tweet about the vote via @DeltaSpikeTeam.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_perform_the_final_release">Perform the final release</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_close_the_vote">Close the vote</h3>
+<div class="paragraph">
+<p>After 72 hours close the vote.</p>
+</div>
+<div class="paragraph">
+<p>e.g.:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>Result (was: Re: [VOTE] Release of Apache DeltaSpike [version])
+
+thank you for voting!
+
+X binding +1 votes (pmc):
+[list]
+
+Y non-binding +1 votes:
+[list]
+
+Z -1 votes
+[list]</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If the binding majority approved the vote continue.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Login to <a href="https://repository.apache.org/" class="bare">https://repository.apache.org/</a> and release the repository</p>
+</li>
+<li>
+<p>Merge release branch into master and push the branch and tag to the ASF repository</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Always do a merge in this case (not a rebase):</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>git checkout master
+git merge deltaspike-[version]
+git push origin deltaspike-[version]
+git push origin deltaspike-project-[version]
+git push origin master</pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Create the release at jira</p>
+</li>
+<li>
+<p>Close the corresponding tickets of the version</p>
+</li>
+<li>
+<p>Wait some hours and check <a href="http://repo2.maven.org/maven2/org/apache/deltaspike" class="bare">http://repo2.maven.org/maven2/org/apache/deltaspike</a></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_upload_artifacts">Upload artifacts</h3>
+<div class="listingblock">
+<div class="content">
+<pre>svn co https://dist.apache.org/repos/dist/release/deltaspike
+mkdir [version]
+//add and commit the artifacts (at least *source-release.zip + asc, md5, sha1)</pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_check_downloads">Check downloads</h3>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://www.eu.apache.org/dist/deltaspike" class="bare">http://www.eu.apache.org/dist/deltaspike</a></p>
+</li>
+<li>
+<p><a href="http://www.us.apache.org/dist/deltaspike" class="bare">http://www.us.apache.org/dist/deltaspike</a></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_update_site_content">Update site content</h3>
+<div class="paragraph">
+<p>via CMS:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Update download links: <a href="http://deltaspike.apache.org/download.html" class="bare">http://deltaspike.apache.org/download.html</a></p>
+</li>
+<li>
+<p>Update news: <a href="http://deltaspike.apache.org/news.html" class="bare">http://deltaspike.apache.org/news.html</a></p>
+</li>
+<li>
+<p>Update version: <a href="http://deltaspike.apache.org/index.html" class="bare">http://deltaspike.apache.org/index.html</a></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_announce_the_release">Announce the Release</h3>
+<div class="sect3">
+<h4 id="_e_mails">E-Mails</h4>
+<div class="listingblock">
+<div class="content">
+<pre>[ANNOUNCE] Release of Apache DeltaSpike [version]
+
+The Apache DeltaSpike team is pleased to announce the 6th release of DeltaSpike.
+
+Apache DeltaSpike is not a CDI-container, but a portable CDI extension.
+
+Documentation:
+http://deltaspike.apache.org/documentation.html
+
+Download:
+http://deltaspike.apache.org/download.html
+
+Release Notes:
+http://s.apache.org/DeltaSpike_06
+
+Enjoy!
+
+[name]</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Write the e-mails to:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="mailto:announce@apache.org">announce@apache.org</a></p>
+</li>
+<li>
+<p><a href="mailto:dev@deltaspike.apache.org">dev@deltaspike.apache.org</a></p>
+</li>
+<li>
+<p><a href="mailto:users@deltaspike.apache.org">users@deltaspike.apache.org</a></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_twitter">Twitter</h4>
+<div class="paragraph">
+<p>e.g.:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>[ANNOUNCE] The Apache #DeltaSpike team is pleased to announce http://s.apache.org/DeltaSpike_[version]. Feel free to test it! Feedback is very welcome!</pre>
+</div>
+</div>
+</div>
+</div>
+</div>
+</div>
+			</div>
+
+			<hr>
+
+			<footer>
+				<p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+				<p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+			</footer>
+
+		</div>
+		<!-- /.container -->
+
+</body>
+</html>
\ No newline at end of file

Added: deltaspike/site/trunk/content/staging/suggested-git-workflows.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/suggested-git-workflows.html?rev=1644988&view=auto
==============================================================================
--- deltaspike/site/trunk/content/staging/suggested-git-workflows.html (added)
+++ deltaspike/site/trunk/content/staging/suggested-git-workflows.html Fri Dec 12 17:39:51 2014
@@ -0,0 +1,456 @@
+<!DOCTYPE html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="deltaspike-generate-pages">
+<meta name="author" content="chm">
+
+<title>Suggested GIT workflows</title>
+
+<!-- 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 &quot;License&quot;); 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 &quot;AS IS&quot; 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. -->
+
+<!-- Styles -->
+
+<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+
+<style type="text/css">
+/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
+body {
+	padding-top: 60px;
+	padding-bottom: 40px;
+}
+</style>
+<script type="text/javascript">
+
+	  var _gaq = _gaq || [];
+	  _gaq.push(['_setAccount', 'UA-36103647-1']);
+	  _gaq.push(['_trackPageview']);
+	
+	  (function() {
+		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+	  })();
+	
+	</script>
+</head>
+
+<body>
+
+	<div class="navbar navbar-fixed-top">
+		<div class="navbar-inner">
+			<div class="container">
+				<a class="btn btn-navbar" data-toggle="collapse"
+					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
+					class="icon-bar"></span> <span class="icon-bar"></span>
+				</a> <a class="brand logocolor"
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+				<div class="nav-collapse">
+					<ul class="nav">
+						<li class="active"><a
+							href="index.html">Home</a></li>
+						<li><a href="./documentation">Documentation</a></li>
+						<li><a href="./javadoc.html">Javadoc</a></li>
+						<li><a href="./documentation/source.html">Source</a></li>
+						<li><a href="./download.html">Download</a></li>
+						<li><a href="./community.html">Community</a></li>
+						<!-- <li><a href="./support.html">Support</a></li>  -->
+						<li><a href="./news.html">News</a></li>
+						<li><a href="./migration-guide.html">Migration</a></li>
+					</ul>
+				</div>
+				<!--/.nav-collapse -->
+				<form id="search-form" action="http://www.google.com/search"
+					method="get" class="navbar-search pull-right">
+					<input value="deltaspike.apache.org" name="sitesearch"
+						type="hidden"> <input class="search-query" name="q"
+						id="query" type="text">
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<div class="container">
+		<div class="row">
+			<div class="span12">
+				<div class="page-title">
+			    <h1>Suggested GIT workflows</h1>
+                </div>
+
+				<div id="toc" class="toc">
+       	 		<ul class="sectlevel1">
+<li><a href="#_avoid_git_pull">Avoid git-pull!</a></li>
+<li><a href="#_git_pull_rebase">git pull --rebase</a>
+<ul class="sectlevel2">
+<li><a href="#_working_in_an_own_branch">Working in an own branch</a></li>
+</ul>
+</li>
+<li><a href="#_contribution_workflow">Contribution workflow</a>
+<ul class="sectlevel2">
+<li><a href="#_creating_patches">Creating patches</a></li>
+</ul>
+</li>
+<li><a href="#_discussion_workflow_optional">Discussion workflow (optional)</a></li>
+</ul>
+       	 		<hr>	
+       	 		
+				<div class="sect1">
+<h2 id="_avoid_git_pull">Avoid git-pull!</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>git-pull should never get invoked if you have dirty files lying around
+or if your branch is ahead of master. This will always lead to some
+dirty artifacts in the commit history:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>Merge branch 'master' of http://git-wip-us.apache.org/deltaspike into master</pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_git_pull_rebase">git pull --rebase</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>An easy version for getting rid of the auto-merges is using</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">$ git pull --rebase</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Please note that this sometimes trashes your working tree if there are
+unmergeable files around. Cleaning this up with a forced manual rebase
+is not something we would recommend for a git beginner.</p>
+</div>
+<div class="sect2">
+<h3 id="_working_in_an_own_branch">Working in an own branch</h3>
+<div class="paragraph">
+<p>This is actually the suggested way to prevent auto-merges.</p>
+</div>
+<div class="paragraph">
+<p>Create an own branch where you do your feature work. Either do all your
+work in one branch or create one branch per feature you are working on.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">$ git branch mybranch</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>After you finished your feature, <code>git-add</code> and <code>git-commit</code> your work.
+Check with <code>git-status</code> that you don&#8217;t have any dirty files and
+uncommitted changes around. You can use <code>git-stash</code> to 'backup'
+unfinished work.</p>
+</div>
+<div class="paragraph">
+<p>Then switch back to the master branch and pull changes done by other
+committers in the meantime.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout master
+$ git pull --rebase</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>You should now get all the changes done by other committers and the will
+get applied to your local master branch. Now go back to your private
+branch and rebase your locally performed work to the HEAD of master.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout mybranch
+$ git rebase master</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If you got conflicts, you will get lines with "&gt;&gt;&gt;&gt;" added to those
+files. Resolve those conflicts manually, add them and finish the rebase.</p>
+</div>
+<div class="paragraph">
+<p>Check with <code>git-status</code> and <code>gitk</code> if the merge went well and the
+history now contains your changes. If all is well, go back to the master
+branch and merge your changes in.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git pull --rebase     // (just for safety, you should see no changes)
+$ git checkout master
+$ git merge mybranch</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Finally you can push your changes to the ASF git repo</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git push</pre>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_contribution_workflow">Contribution workflow</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_creating_patches">Creating patches</h3>
+<div class="paragraph">
+<p>You should use the following workflow, if you plan to contribute patches or new features to DeltaSpike.</p>
+</div>
+<div class="paragraph">
+<p>First update you local copy of the repository:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout master
+$ git pull --rebase</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Then create a new local branch for your work. It&#8217;s good practice to name it after the corresponding JIRA issue.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout -b DELTASPIKE-XXX</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now you can start to work on your patch. When you are finished, commit
+your changes. But don&#8217;t forget to <strong>add the name of the JIRA issue to
+the commit message</strong>.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git add -am "DELTASPIKE-XXX: Fixed some issue"</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>For small patches we recommend to do a single commit containing your
+changes. For larger contributions you should try to group your work into
+separate sub-tasks that you can commit one by one.</p>
+</div>
+<div class="paragraph">
+<p>Before you create your patch you should make sure that your local
+repository is up to date with the master repository. This is very
+important especially if you work on your branch for a long time. Use the
+following commands to pull the latest changes from the upstream
+repository and rebase your branch against the current master.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">$ git checkout master
+$ git pull --rebase
+$ git checkout DELTASPIKE-XXX
+$ git rebase master</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now you are ready to create your patch:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">$ git checkout DELTASPIKE-XXX
+$ git format-patch --stdout master &gt; ../DELTASPIKE-XXX.patch</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Please attach the resulting patch file to the correspoding JIRA issue.</p>
+</div>
+<div class="paragraph">
+<p>===Applying patches</p>
+</div>
+<div class="paragraph">
+<p>If you are a committer and want to apply a patch you should do so in a
+separate branch.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout -b DELTASPIKE-XXX</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Then apply the patch using <code>git-am</code> and rebase it against the master
+branch.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git am &lt; ../DELTASPIKE-XXX.patch
+$ git rebase master</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>After reviewing the changes and testing the code, the changes are ready
+to be merged into the master branch:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout master
+$ git merge DELTASPIKE-XXX
+$ git branch -d DELTASPIKE-XXX</pre>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_discussion_workflow_optional">Discussion workflow (optional)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>All discussions which lead to a decision take place on the mailing list.
+Sometimes it&#8217;s required to show-case an idea esp. if the solution is
+more than few lines. As shown above it makes sense to use local branches
+for developing new parts. Git allows to push such local branches to a
+public repository. So it&#8217;s easier to share it with the community for
+discussing it. The following listings show an example in combination
+with GitHub - for sure it works with any hosting platform like
+BitBucket, Google-Code,&#8230;&#8203; The only important part here is that such
+branches <em>NEVER</em> get pushed to the main Apache repository to keep the
+commit history as clean as possible.</p>
+</div>
+<div class="paragraph">
+<p><strong>Initial setup</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">$ git clone https://git-wip-us.apache.org/repos/asf/deltaspike.git ./
+$ git remote add discuss https://[username]@github.com/[username]/[repo-name].git
+$ git push -u discuss master</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><strong>Branches for discussions</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">$ git checkout -b DELTASPIKE-XXX
+//1-n commits
+$ git push discuss DELTASPIKE-XXX
+//share the link to the branch for the discussions</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><em>If the community agrees on the suggested change, the implementation
+will be applied to the origin master. A committer has to follow the
+steps described above for the basic workflow to keep the commit history
+simple, clean and straight. A contributor has to follow the steps
+described above for creating a patch.</em></p>
+</div>
+<div class="paragraph">
+<p><strong>Delete the branch again</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git push discuss :DELTASPIKE-XXX
+$ git branch -d DELTASPIKE-XXX</pre>
+</div>
+</div>
+</div>
+</div>
+			</div>
+
+			<hr>
+
+			<footer>
+				<p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+				<p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+			</footer>
+
+		</div>
+		<!-- /.container -->
+
+</body>
+</html>
\ No newline at end of file



Mime
View raw message