You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2015/04/01 03:59:02 UTC

[1/2] incubator-streams git commit: resolves STREAMS-271 plus misc edits

Repository: incubator-streams
Updated Branches:
  refs/heads/master 96c140d1c -> beaa8dc1d


resolves STREAMS-271
plus misc edits


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/58492047
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/58492047
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/58492047

Branch: refs/heads/master
Commit: 58492047809d058b87bb93826c5a9a1d4e513788
Parents: 8050869
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Sat Mar 28 15:09:35 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Sat Mar 28 15:09:35 2015 -0500

----------------------------------------------------------------------
 README.md | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/58492047/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 43aef2a..8a90757 100644
--- a/README.md
+++ b/README.md
@@ -6,15 +6,14 @@ About
 =====
 Apache Streams is a lightweight (yet scalable) server for ActivityStreams. The role of Apache Streams is to provide a central point of aggregation, filtering and querying for Activities that have been submitted by disparate systems. Apache Streams also intends to include a mechanism for intelligent filtering and recommendation to reduce the noise to end users.
 
-
-
 Release Notes
 =============
- - Initial project structure and master POM release
 
+[CHANGELOG.md](CHANGELOG.md "CHANGELOG.md")
 
 Getting Started
 ===============
+
 Please visit the project website for the latest information:
     http://streams.incubator.apache.org/
 
@@ -24,29 +23,19 @@ Along with the developer mailing list archive:
 
 System Requirements
 ===================
-You need a platform that supports Java SE 6 or later.
+You need a platform that supports Java SE 7 or later.
 
 Building and running
 ====================
 To build from source code:
 
   - Requirements:
-    Sources compilation require Java SE 6 or higher.
-    The project is built with Apache Maven 3+ (suggested is 3.0.3).
+    Sources compilation require Java SE 7 or higher.
+    The project is built with Apache Maven 3+ (suggested is 3.2.5).
     You need to download and install Maven 3 from: http://maven.apache.org/
 
-  - The Streams project itself (this one) depends on the separate Streams Master project
-    which defines general and global settings for the whole of the Streams project,
-    independent of a specific release.
-    As its streams-master-pom is already published to the Apache Snapshots repository,
-    there is no need to check it out manually and build it locally yourself,
-    unless changes are needed on general and global level.
-    
-    If so needed, the Streams Master project can be checked out from:
-      http://svn.apache.org/repos/asf/incubator/streams/streams-master-pom/trunk streams-master-pom
-
-    After check out, cd into streams-master-pom and invoke maven to install it using:
-      $mvn install
-    
-  - To build the Streams project invoke maven in the root directory:
-      $mvn install
+  - To build the Streams project, configure and invoke maven in the root directory.
+
+      `export MAVEN_OPTS="-Xmx2G"`
+
+      `mvn install`


[2/2] incubator-streams git commit: Merge branch 'STREAMS-271' into asf-master

Posted by sb...@apache.org.
Merge branch 'STREAMS-271' into asf-master


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/beaa8dc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/beaa8dc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/beaa8dc1

Branch: refs/heads/master
Commit: beaa8dc1d46d87868efabe48d42b2b987ad4b70e
Parents: 96c140d 5849204
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Mar 31 20:58:43 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Mar 31 20:58:43 2015 -0500

----------------------------------------------------------------------
 README.md | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------