Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 88A90200B73 for ; Mon, 15 Aug 2016 01:09:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 87520160AB4; Sun, 14 Aug 2016 23:09:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7BE5A160AA9 for ; Mon, 15 Aug 2016 01:09:19 +0200 (CEST) Received: (qmail 36462 invoked by uid 500); 14 Aug 2016 23:09:18 -0000 Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltaspike.apache.org Delivered-To: mailing list commits@deltaspike.apache.org Received: (qmail 36435 invoked by uid 99); 14 Aug 2016 23:09:18 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Aug 2016 23:09:18 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 49A70180227 for ; Sun, 14 Aug 2016 23:09:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.374 X-Spam-Level: X-Spam-Status: No, score=0.374 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 9x82cfZgnmjY for ; Sun, 14 Aug 2016 23:09:15 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id 670165FC1A for ; Sun, 14 Aug 2016 23:09:15 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id DC12CE0223 for ; Sun, 14 Aug 2016 23:09:14 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id DA6DB3A02F2 for ; Sun, 14 Aug 2016 23:09:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r995132 - in /websites/staging/deltaspike/trunk/content: ./ community.html download.html steps_for_a_release.html suggested-git-workflows.html Date: Sun, 14 Aug 2016 23:09:14 -0000 To: commits@deltaspike.apache.org From: buildbot@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160814230914.DA6DB3A02F2@svn01-us-west.apache.org> archived-at: Sun, 14 Aug 2016 23:09:20 -0000 Author: buildbot Date: Sun Aug 14 23:09:14 2016 New Revision: 995132 Log: Staging update by buildbot for deltaspike Modified: websites/staging/deltaspike/trunk/content/ (props changed) websites/staging/deltaspike/trunk/content/community.html websites/staging/deltaspike/trunk/content/download.html websites/staging/deltaspike/trunk/content/steps_for_a_release.html websites/staging/deltaspike/trunk/content/suggested-git-workflows.html Propchange: websites/staging/deltaspike/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sun Aug 14 23:09:14 2016 @@ -1 +1 @@ -1755397 +1756336 Modified: websites/staging/deltaspike/trunk/content/community.html ============================================================================== --- websites/staging/deltaspike/trunk/content/community.html (original) +++ websites/staging/deltaspike/trunk/content/community.html Sun Aug 14 23:09:14 2016 @@ -319,8 +319,8 @@ publish it.

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,…​ . Therefore, it’s essential to file a/n -(I)CLA or -CLA and send it to +ICLA or +CCLA and send it to secretary at apache dot org (or fax it) as early as possible.

@@ -382,7 +382,7 @@ contributing and help users.

User List

Subscribe

Unsubscribe

-

Archive

+

Archive

@@ -390,7 +390,7 @@ contributing and help users.

Developer List

Subscribe

Unsubscribe

-

Archive

+

Archive

@@ -398,7 +398,7 @@ contributing and help users.

Committer List

Subscribe

Unsubscribe

-

Archive

+

Archive

@@ -445,7 +445,7 @@ $ irssi

If you are new to IRC you can use the pre-configures web-client you can -find here.

+find here.

Modified: websites/staging/deltaspike/trunk/content/download.html ============================================================================== --- websites/staging/deltaspike/trunk/content/download.html (original) +++ websites/staging/deltaspike/trunk/content/download.html Sun Aug 14 23:09:14 2016 @@ -318,7 +318,7 @@ table.CodeRay td.code>pre{padding:0}

Maven Dependencies

-

Details are available here.

+

Details are available /documentation/configure.html#MavenProjects[here].

Modified: websites/staging/deltaspike/trunk/content/steps_for_a_release.html ============================================================================== --- websites/staging/deltaspike/trunk/content/steps_for_a_release.html (original) +++ websites/staging/deltaspike/trunk/content/steps_for_a_release.html Sun Aug 14 23:09:14 2016 @@ -559,16 +559,28 @@ svn add {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. +Apache DeltaSpike is a suite of portable CDI (Contexts & 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: websites/staging/deltaspike/trunk/content/suggested-git-workflows.html ============================================================================== --- websites/staging/deltaspike/trunk/content/suggested-git-workflows.html (original) +++ websites/staging/deltaspike/trunk/content/suggested-git-workflows.html Sun Aug 14 23:09:14 2016 @@ -373,6 +373,90 @@ $ git merge mybranch

Contribution workflow

+
+

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.

+
+
+

Raising Pull Requests

+
+

You should use the following workflow if you plan to contribute features or bug fixes to Apache DeltaSpike via GitHub

+
+
+

First, fork our repository on github

+
+
+

Second, clone it locally and add our upstream as a remote

+
+
+
+
$ git clone https://github.com/<YOUR USERNAME>/deltaspike
+$ git remote add asf https://git-wip-us.apache.org/repos/asf/deltaspike.git
+
+
+
+

Third, find a JIRA ticket to work on. When you do, use that as your branch name

+
+
+
+
$ git checkout -b DELTASPIKE-XXX
+
+
+
+

Now you can start to work on your patch. When you are finished, commit +your changes. But don’t forget to add the name of the JIRA issue to +the commit message.

+
+
+
+
$ git commit -am "DELTASPIKE-XXX: Fixed some issue"
+
+
+
+

Once you’re done with your changes, make sure you’re up to date and rebase from master

+
+
+
+
$ git pull asf master --rebase
+
+
+
+

Next, push your branch to GitHub

+
+
+
+
$ git push origin DELTASPIKE-XXX
+
+
+
+

Finally, raise your PR. If you go to your GitHub fork of DeltaSpike, you should see an option to create a PR

+
+
+
+

Merging Pull Requests

+
+

Whenever a PR gets created for DeltaSpike, an email is sent to the dev@deltaspike. It will include the subject

+
+
+
+
[GitHub] deltaspike pull request #00: DELTASPIKE-XXX some changes
+
+
+
+

Which will contain the instructions

+
+
+
+
You can merge this pull request into a Git repository by running:
+
+$ git pull https://github.com/<GITHUB USERNAME>/deltaspike DELTASPIKE-XXX
+
+
+
+

As long as you don’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).

+
+

Creating patches

@@ -402,7 +486,7 @@ the commit message.

-
$ git add -am "DELTASPIKE-XXX: Fixed some issue"
+
$ git commit -am "DELTASPIKE-XXX: Fixed some issue"
@@ -478,8 +562,8 @@ $ git branch -d DELTASPIKE-XXX

All discussions which lead to a decision take place on the mailing list. -Sometimes it’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’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’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

  • Contribution workflow