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/12/04 19:06:19 UTC
incubator-streams git commit: resolves STREAMS-390 changes in
incubator-streams-master should merge first
Repository: incubator-streams
Updated Branches:
refs/heads/master cebc11baf -> c972683e9
resolves STREAMS-390
changes in incubator-streams-master should merge first
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/c972683e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c972683e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c972683e
Branch: refs/heads/master
Commit: c972683e9d29e319822dfc422cd659d755d35246
Parents: cebc11b
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Thu Dec 3 13:15:59 2015 -0600
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Thu Dec 3 13:15:59 2015 -0600
----------------------------------------------------------------------
pom.xml | 16 +++++-----------
streams-components/streams-http/pom.xml | 4 ----
.../streams-persist-elasticsearch/pom.xml | 5 -----
streams-contrib/streams-provider-datasift/pom.xml | 2 +-
streams-contrib/streams-provider-facebook/pom.xml | 2 +-
.../streams-provider-google/google-gplus/pom.xml | 2 +-
streams-contrib/streams-provider-instagram/pom.xml | 2 +-
streams-contrib/streams-provider-moreover/pom.xml | 2 +-
streams-contrib/streams-provider-rss/pom.xml | 2 +-
streams-contrib/streams-provider-sysomos/pom.xml | 2 +-
streams-contrib/streams-provider-twitter/pom.xml | 10 +++-------
11 files changed, 15 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 405ebd2..fcae2fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
<groupId>org.apache.streams</groupId>
<artifactId>streams-master</artifactId>
<version>0.3-incubating-SNAPSHOT</version>
- <relativePath>incubator-streams-master-pom.xml</relativePath>
</parent>
<groupId>org.apache.streams</groupId>
@@ -156,16 +155,6 @@
</site>
</distributionManagement>
- <properties>
-
- <scala.version>2.10</scala.version>
- <datastax.version>1.0.3</datastax.version>
- <zookeeper.version>3.4.5</zookeeper.version>
- <json-path.version>0.9.1</json-path.version>
- <facebook4j.version>2.1.0</facebook4j.version>
-
- </properties>
-
<modules>
<module>streams-core</module>
<module>streams-config</module>
@@ -274,6 +263,11 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.jsonschema2pojo</groupId>
+ <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <version>${jsonschema2pojo.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${typesafe.config.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-components/streams-http/pom.xml
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/pom.xml b/streams-components/streams-http/pom.xml
index 3f2b4b8..349b13c 100644
--- a/streams-components/streams-http/pom.xml
+++ b/streams-components/streams-http/pom.xml
@@ -82,10 +82,6 @@
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-contrib/streams-persist-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/pom.xml b/streams-contrib/streams-persist-elasticsearch/pom.xml
index 34f3b13..784a5b5 100644
--- a/streams-contrib/streams-persist-elasticsearch/pom.xml
+++ b/streams-contrib/streams-persist-elasticsearch/pom.xml
@@ -134,11 +134,6 @@
<version>${lucene.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- </dependency>
</dependencies>
</dependencyManagement>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/pom.xml b/streams-contrib/streams-provider-datasift/pom.xml
index 8cd8bed..896695c 100644
--- a/streams-contrib/streams-provider-datasift/pom.xml
+++ b/streams-contrib/streams-provider-datasift/pom.xml
@@ -209,7 +209,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <url>${testDataBaseURl}/${project.artifactId}.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-contrib/streams-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/pom.xml b/streams-contrib/streams-provider-facebook/pom.xml
index 7210132..b971fbb 100644
--- a/streams-contrib/streams-provider-facebook/pom.xml
+++ b/streams-contrib/streams-provider-facebook/pom.xml
@@ -193,7 +193,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <url>${testDataBaseURl}/${project.artifactId}.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-contrib/streams-provider-google/google-gplus/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/pom.xml b/streams-contrib/streams-provider-google/google-gplus/pom.xml
index d80cfd0..348a0dd 100644
--- a/streams-contrib/streams-provider-google/google-gplus/pom.xml
+++ b/streams-contrib/streams-provider-google/google-gplus/pom.xml
@@ -216,7 +216,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <url>${testDataBaseURl}/${project.artifactId}.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-contrib/streams-provider-instagram/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/pom.xml b/streams-contrib/streams-provider-instagram/pom.xml
index 7503514..aa059b5 100644
--- a/streams-contrib/streams-provider-instagram/pom.xml
+++ b/streams-contrib/streams-provider-instagram/pom.xml
@@ -178,7 +178,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <url>${testDataBaseURl}/${project.artifactId}.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-contrib/streams-provider-moreover/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/pom.xml b/streams-contrib/streams-provider-moreover/pom.xml
index 785b624..1cab3c2 100644
--- a/streams-contrib/streams-provider-moreover/pom.xml
+++ b/streams-contrib/streams-provider-moreover/pom.xml
@@ -192,7 +192,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <url>${testDataBaseURl}/${project.artifactId}.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-contrib/streams-provider-rss/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/pom.xml b/streams-contrib/streams-provider-rss/pom.xml
index 5a1684d..1675f16 100644
--- a/streams-contrib/streams-provider-rss/pom.xml
+++ b/streams-contrib/streams-provider-rss/pom.xml
@@ -183,7 +183,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <url>${testDataBaseURl}/${project.artifactId}.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-contrib/streams-provider-sysomos/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/pom.xml b/streams-contrib/streams-provider-sysomos/pom.xml
index 9531150..6ee42de 100644
--- a/streams-contrib/streams-provider-sysomos/pom.xml
+++ b/streams-contrib/streams-provider-sysomos/pom.xml
@@ -183,7 +183,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <url>${testDataBaseURl}/${project.artifactId}.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c972683e/streams-contrib/streams-provider-twitter/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/pom.xml b/streams-contrib/streams-provider-twitter/pom.xml
index 5de3172..ba3bf9b 100644
--- a/streams-contrib/streams-provider-twitter/pom.xml
+++ b/streams-contrib/streams-provider-twitter/pom.xml
@@ -70,10 +70,6 @@
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
<artifactId>streams-converters</artifactId>
<version>${project.version}</version>
</dependency>
@@ -187,7 +183,7 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <url>${testDataBaseURl}/${project.artifactId}.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
@@ -202,8 +198,8 @@
<skipTests>${skipITs}</skipTests>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
</plugins>