Merge branch 'STREAMS-255' into 0.1-rc1
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/f829faee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/f829faee
Diff:
Merge remote-tracking branch 'apache/STREAMS-245' into 0.1-rc1
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/510d6e49
Tree:
also exclude rat.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/68889430
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/68889430
Diff:
Merge branch 'STREAMS-254' into 0.1-rc1
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/9d2025ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/9d2025ba
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4e382970/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json
--
diff --git
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4e382970/streams-pojo/src/test/java/org/apache/streams/data/data/util/CustomDateTimeFormatTest.java
--
diff --git
Merge remote-tracking branch 'steveblackmon/STREAMS-249' into 0.1-rc1
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/6cf35d59
Tree:
also ignore dependency-reduced-pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/85a3d6e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/85a3d6e6
Diff:
use ${project.version} not 0.1-SNAPSHOT when importing dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b1eadecb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b1eadecb
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4e382970/streams-web/src/main/webapp/demo/js/handlebars.js
--
diff --git a/streams-web/src/main/webapp/demo/js/handlebars.js
needs license
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/5fe3438a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/5fe3438a
Diff:
Merge branch 'STREAMS-254' into 0.1-rc1
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/99d01237
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/99d01237
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4e382970/streams-web/src/main/webapp/demo/js/publisher.js
--
diff --git a/streams-web/src/main/webapp/demo/js/publisher.js
javadoc:aggregate with site plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/03f07d73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/03f07d73
Diff:
Repository: incubator-streams
Updated Branches:
refs/heads/STREAMS-246 50a41cf55 - b1eadecb5
use ${project.version} not 0.1-SNAPSHOT when importing dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit:
Merge branch 'STREAMS-246' into 0.1-rc1
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/1f56c55c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/1f56c55c
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4e382970/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/Subscription.java
--
diff --git
Merge remote-tracking branch 'apache/STREAMS-246' into 0.1-rc1
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b6e9fd5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b6e9fd5c
Merge branch 'STREAMS-250' into 0.1-rc1
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/560d82e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/560d82e6
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4e382970/streams-contrib/streams-provider-gnip/gnip-edc-reddit/pom.xml
--
diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-reddit/pom.xml
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4e382970/streams-contrib/streams-provider-moreover/pom.xml
--
diff --git a/streams-contrib/streams-provider-moreover/pom.xml
also exclude *.jar that clean doesn't clean
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e2b82733
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e2b82733
Diff:
disconnect from streams-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/c7500342
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c7500342
Diff:
reporting plugin config
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/99fcc29c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/99fcc29c
Diff:
resolves STREAMS-254
mvn -P apache-release rat:check now succeeds
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/4e382970
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/4e382970
25 matches
Mail list logo