deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject svn commit: r1756336 - in /deltaspike/site/trunk/content: community.html download.html steps_for_a_release.html suggested-git-workflows.html
Date Sun, 14 Aug 2016 23:08:06 GMT
Author: johndament
Date: Sun Aug 14 23:08:06 2016
New Revision: 1756336

URL: http://svn.apache.org/viewvc?rev=1756336&view=rev
Log:
Site checkin for project Apache DeltaSpike Site

Modified:
    deltaspike/site/trunk/content/community.html
    deltaspike/site/trunk/content/download.html
    deltaspike/site/trunk/content/steps_for_a_release.html
    deltaspike/site/trunk/content/suggested-git-workflows.html

Modified: deltaspike/site/trunk/content/community.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/community.html?rev=1756336&r1=1756335&r2=1756336&view=diff
==============================================================================
--- deltaspike/site/trunk/content/community.html (original)
+++ deltaspike/site/trunk/content/community.html Sun Aug 14 23:08:06 2016
@@ -319,8 +319,8 @@ publish it.</p>
 <p>Before you get a committer you have to contribute to our effort. E.g.
 you can help users, participate in discussions on the dev list, submit
 patches,&#8230;&#8203; . Therefore, it&#8217;s essential to file a/n
-<a href="http://www.apache.org/licenses/icla.txt">(I)CLA</a> or
-<a href="http://www.apache.org/licenses/cla-corporate.txt">CLA</a> and send it
to
+<a href="http://www.apache.org/licenses/icla.pdf">ICLA</a> or
+<a href="http://www.apache.org/licenses/cla-corporate.txt">CCLA</a> and send
it to
 secretary at apache dot org (or fax it) as early as possible.</p>
 </div>
 <div class="paragraph">
@@ -382,7 +382,7 @@ contributing and help users.</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users@deltaspike.apache.org">User
List</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users-subscribe@deltaspike.apache.org">Subscribe</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users-unsubscribe@deltaspike.apache.org">Unsubscribe</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://mail-archives.apache.org/mod_mbox/deltaspike-users/">Archive</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?users@deltaspike.apache.org">Archive</a></p></td>
 <td class="tableblock halign-left valign-top"></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
@@ -390,7 +390,7 @@ contributing and help users.</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev@deltaspike.apache.org">Developer
List</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-subscribe@deltaspike.apache.org">Subscribe</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-unsubscribe@deltaspike.apache.org">Unsubscribe</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://mail-archives.apache.org/mod_mbox/deltaspike-dev/">Archive</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?dev@deltaspike.apache.org">Archive</a></p></td>
 <td class="tableblock halign-left valign-top"></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
@@ -398,7 +398,7 @@ contributing and help users.</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:commits@deltaspike.apache.org">Committer
List</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:commits-subscribe@deltaspike.apache.org">Subscribe</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:commits-unsubscribe@deltaspike.apache.org">Unsubscribe</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://mail-archives.apache.org/mod_mbox/deltaspike-commits/">Archive</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?commits@deltaspike.apache.org">Archive</a></p></td>
 <td class="tableblock halign-left valign-top"></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
@@ -445,7 +445,7 @@ $ irssi
 </div>
 <div class="paragraph">
 <p>If you are new to IRC you can use the pre-configures web-client you can
-find <a href="http://people.apache.org/~gpetracek/deltaspike/freenode.html">here</a>.</p>
+find <a href="https://kiwiirc.com/client/irc.freenode.net/#deltaspike">here</a>.</p>
 </div>
 </div>
 </div>

Modified: deltaspike/site/trunk/content/download.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/download.html?rev=1756336&r1=1756335&r2=1756336&view=diff
==============================================================================
--- deltaspike/site/trunk/content/download.html (original)
+++ deltaspike/site/trunk/content/download.html Sun Aug 14 23:08:06 2016
@@ -318,7 +318,7 @@ table.CodeRay td.code>pre{padding:0}
 <h2 id="_maven_dependencies">Maven Dependencies</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Details are available <a href="http://deltaspike.apache.org/documentation/configure.html#Maven-basedProjects">here</a>.</p>
+<p>Details are available /documentation/configure.html#MavenProjects[here].</p>
 </div>
 </div>
 </div>

Modified: deltaspike/site/trunk/content/steps_for_a_release.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/steps_for_a_release.html?rev=1756336&r1=1756335&r2=1756336&view=diff
==============================================================================
--- deltaspike/site/trunk/content/steps_for_a_release.html (original)
+++ deltaspike/site/trunk/content/steps_for_a_release.html Sun Aug 14 23:08:06 2016
@@ -559,16 +559,28 @@ svn add {version}</pre>
 
 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.
+Apache DeltaSpike is  a suite of portable CDI (Contexts &amp; Dependency Injection) extensions
intended to make application development easier when working with CDI and Java EE.  Some of
its key features include:
+
+- A core runtime that supports component configuration, type safe messaging and internationalization,
and exception handling.
+- A suite of utilities to make programmatic bean lookup easier.
+- A plugin for Java SE to bootstrap both JBoss Weld and Apache OpenWebBeans outside of a
container.
+- JSF integration, including backporting of JSF 2.2 features for Java EE 6.
+- JPA integration and transaction support.
+- A Data module, to create an easy to use repository pattern on top of JPA.
+- Quartz integration
+
+Testing support is also provided, to allow you to do low level unit testing of your CDI enabled
projects.
+
+More can be found on our website - https://deltaspike.apache.org
 
 Documentation:
-http://deltaspike.apache.org/documentation/
+https://deltaspike.apache.org/documentation/
 
 Download:
-http://deltaspike.apache.org/download.html
+https://deltaspike.apache.org/download.html
 
 Release Notes:
-http://s.apache.org/DeltaSpike_[version]
+https://s.apache.org/DeltaSpike_[version]
 
 Enjoy!
 

Modified: deltaspike/site/trunk/content/suggested-git-workflows.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/suggested-git-workflows.html?rev=1756336&r1=1756335&r2=1756336&view=diff
==============================================================================
--- deltaspike/site/trunk/content/suggested-git-workflows.html (original)
+++ deltaspike/site/trunk/content/suggested-git-workflows.html Sun Aug 14 23:08:06 2016
@@ -373,6 +373,90 @@ $ git merge mybranch</pre>
 <div class="sect1">
 <h2 id="_contribution_workflow">Contribution workflow</h2>
 <div class="sectionbody">
+<div class="paragraph">
+<p>Please understand that our contribution workflow is designed for outside contributions.
 They should represent your
+changes and your changes alone.  Any other contributors should raise their own pull request
or submit their own patch.
+Committers should continue to follow the discussion flow for complex changes, and merge their
changes when ready.</p>
+</div>
+<div class="sect2">
+<h3 id="_raising_pull_requests">Raising Pull Requests</h3>
+<div class="paragraph">
+<p>You should use the following workflow if you plan to contribute features or bug
fixes to Apache DeltaSpike via GitHub</p>
+</div>
+<div class="paragraph">
+<p>First, fork our repository <a href="https://github.com/apache/deltaspike">on
github</a></p>
+</div>
+<div class="paragraph">
+<p>Second, clone it locally and add our upstream as a remote</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git clone https://github.com/&lt;YOUR USERNAME&gt;/deltaspike
+$ git remote add asf https://git-wip-us.apache.org/repos/asf/deltaspike.git</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Third, find a JIRA ticket to work on.  When you do, use that as your branch name</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 commit -am "DELTASPIKE-XXX: Fixed some issue"</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Once you&#8217;re done with your changes, make sure you&#8217;re up to date
and rebase from master</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git pull asf master --rebase</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Next, push your branch to GitHub</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git push origin DELTASPIKE-XXX</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Finally, raise your PR.  If you go to your GitHub fork of DeltaSpike, you should
see an option to create a PR</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_merging_pull_requests">Merging Pull Requests</h3>
+<div class="paragraph">
+<p>Whenever a PR gets created for DeltaSpike, an email is sent to the dev@deltaspike.
 It will include the subject</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>[GitHub] deltaspike pull request #00: DELTASPIKE-XXX some changes</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Which will contain the instructions</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>You can merge this pull request into a Git repository by running:
+
+$ git pull https://github.com/&lt;GITHUB USERNAME&gt;/deltaspike DELTASPIKE-XXX</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>As long as you don&#8217;t rebase, pushing the result of this pull will merge
the change into our git repository and close the PR.  If there are any issues with the patch,
you can monitor the build status from the PR, where we run some smoke tests against the commit
to ensure its working.  Please make the requestor aware of any issues identified (e.g. code
quality, formatting, missing tests, etc).</p>
+</div>
+</div>
 <div class="sect2">
 <h3 id="_creating_patches">Creating patches</h3>
 <div class="paragraph">
@@ -402,7 +486,7 @@ the commit message</strong>.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>$ git add -am "DELTASPIKE-XXX: Fixed some issue"</pre>
+<pre>$ git commit -am "DELTASPIKE-XXX: Fixed some issue"</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -478,8 +562,8 @@ $ git branch -d DELTASPIKE-XXX</pre>
 <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
+Sometimes it&#8217;s required to show-case an idea especially if the solution is
+more than a 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
@@ -552,6 +636,8 @@ $ git branch -d DELTASPIKE-XXX</pre>
 </li>
 <li><a href="#_contribution_workflow">Contribution workflow</a>
 <ul class="sectlevel2">
+<li><a href="#_raising_pull_requests">Raising Pull Requests</a></li>
+<li><a href="#_merging_pull_requests">Merging Pull Requests</a></li>
 <li><a href="#_creating_patches">Creating patches</a></li>
 </ul>
 </li>



Mime
View raw message