Repository: incubator-streams-examples Updated Branches: refs/heads/master 6d008ccda -> 2657909f1 (forced update) Updated Tags: refs/tags/streams-examples-0.4.1-incubating 198f7631e -> 139316052
prepare for 0.4.1 release Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/commit/eaf60467 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/eaf60467 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/eaf60467 Branch: refs/heads/master Commit: eaf604671c863b7fd2982a315e74a9f3cc5b3085 Parents: 0d0068c Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Sun Dec 18 11:24:16 2016 -0600 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Sun Dec 18 15:05:22 2016 -0600 ---------------------------------------------------------------------- flink/flink-twitter-collection/pom.xml | 9 +- flink/pom.xml | 2 +- local/elasticsearch-hdfs/pom.xml | 11 +-- local/elasticsearch-reindex/pom.xml | 6 +- local/mongo-elasticsearch-sync/pom.xml | 10 +-- local/pom.xml | 3 +- local/twitter-follow-neo4j/pom.xml | 8 +- local/twitter-history-elasticsearch/pom.xml | 10 +-- local/twitter-userstream-elasticsearch/pom.xml | 10 +-- pom.xml | 93 ++++++++++++++------- 10 files changed, 70 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/flink/flink-twitter-collection/pom.xml ---------------------------------------------------------------------- diff --git a/flink/flink-twitter-collection/pom.xml b/flink/flink-twitter-collection/pom.xml index 363815e..6acc8b8 100644 --- a/flink/flink-twitter-collection/pom.xml +++ b/flink/flink-twitter-collection/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streams</groupId> <artifactId>streams-examples-flink</artifactId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -69,7 +69,6 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>com.typesafe</groupId> @@ -78,27 +77,22 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-config</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-util</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-pojo</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-provider-twitter</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-hdfs</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -407,7 +401,6 @@ <plugin> <groupId>org.apache.streams.plugins</groupId> <artifactId>streams-plugin-pojo</artifactId> - <version>${project.version}</version> <configuration> <sourcePaths> <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/flink/pom.xml ---------------------------------------------------------------------- diff --git a/flink/pom.xml b/flink/pom.xml index 84f93f0..399ee06 100644 --- a/flink/pom.xml +++ b/flink/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>streams-examples</artifactId> <groupId>org.apache.streams</groupId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/local/elasticsearch-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/pom.xml b/local/elasticsearch-hdfs/pom.xml index 8df170b..ad56934 100644 --- a/local/elasticsearch-hdfs/pom.xml +++ b/local/elasticsearch-hdfs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streams</groupId> <artifactId>streams-examples-local</artifactId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -73,7 +73,6 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>com.typesafe</groupId> @@ -82,41 +81,34 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-config</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-util</artifactId> - <version>${project.version}</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-schema-activitystreams</artifactId> - <version>${project.version}</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-runtime-local</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-elasticsearch</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-elasticsearch</artifactId> - <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-hdfs</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -216,7 +208,6 @@ <plugin> <groupId>org.apache.streams.plugins</groupId> <artifactId>streams-plugin-pojo</artifactId> - <version>${project.version}</version> <configuration> <sourcePaths> <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/local/elasticsearch-reindex/pom.xml ---------------------------------------------------------------------- diff --git a/local/elasticsearch-reindex/pom.xml b/local/elasticsearch-reindex/pom.xml index 748bfa3..24b65a9 100644 --- a/local/elasticsearch-reindex/pom.xml +++ b/local/elasticsearch-reindex/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streams</groupId> <artifactId>streams-examples-local</artifactId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -89,7 +89,6 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-schema-activitystreams</artifactId> - <version>${project.version}</version> <type>test-jar</type> </dependency> <dependency> @@ -99,12 +98,10 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-elasticsearch</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-elasticsearch</artifactId> - <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -181,7 +178,6 @@ <plugin> <groupId>org.apache.streams.plugins</groupId> <artifactId>streams-plugin-pojo</artifactId> - <version>${project.version}</version> <configuration> <sourcePaths> <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/local/mongo-elasticsearch-sync/pom.xml ---------------------------------------------------------------------- diff --git a/local/mongo-elasticsearch-sync/pom.xml b/local/mongo-elasticsearch-sync/pom.xml index 46362cf..0f08234 100644 --- a/local/mongo-elasticsearch-sync/pom.xml +++ b/local/mongo-elasticsearch-sync/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streams</groupId> <artifactId>streams-examples-local</artifactId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -72,7 +72,6 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>com.typesafe</groupId> @@ -81,34 +80,28 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-config</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-runtime-local</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-elasticsearch</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-mongo</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-mongo</artifactId> - <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-schema-activitystreams</artifactId> - <version>${project.version}</version> <type>test-jar</type> </dependency> <dependency> @@ -184,7 +177,6 @@ <plugin> <groupId>org.apache.streams.plugins</groupId> <artifactId>streams-plugin-pojo</artifactId> - <version>${project.version}</version> <configuration> <sourcePaths> <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/local/pom.xml ---------------------------------------------------------------------- diff --git a/local/pom.xml b/local/pom.xml index 8c8f2a0..886e731 100644 --- a/local/pom.xml +++ b/local/pom.xml @@ -22,12 +22,11 @@ <parent> <artifactId>streams-examples</artifactId> <groupId>org.apache.streams</groupId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>streams-examples-local</artifactId> - <version>0.5-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>streams-examples-local</name> http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/local/twitter-follow-neo4j/pom.xml ---------------------------------------------------------------------- diff --git a/local/twitter-follow-neo4j/pom.xml b/local/twitter-follow-neo4j/pom.xml index 576de0a..35b6c17 100644 --- a/local/twitter-follow-neo4j/pom.xml +++ b/local/twitter-follow-neo4j/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streams</groupId> <artifactId>streams-examples-local</artifactId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -61,17 +61,14 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-config</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-runtime-local</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-provider-twitter</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -82,12 +79,10 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-graph</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-pojo</artifactId> - <version>${project.version}</version> <type>test-jar</type> </dependency> <dependency> @@ -163,7 +158,6 @@ <plugin> <groupId>org.apache.streams.plugins</groupId> <artifactId>streams-plugin-pojo</artifactId> - <version>${project.version}</version> <configuration> <sourcePaths> <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/local/twitter-history-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/local/twitter-history-elasticsearch/pom.xml b/local/twitter-history-elasticsearch/pom.xml index 8727865..6a0998f 100644 --- a/local/twitter-history-elasticsearch/pom.xml +++ b/local/twitter-history-elasticsearch/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streams</groupId> <artifactId>streams-examples-local</artifactId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -75,7 +75,6 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>com.typesafe</groupId> @@ -84,29 +83,24 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-config</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-util</artifactId> - <version>${project.version}</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-pojo</artifactId> - <version>${project.version}</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-runtime-local</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-provider-twitter</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -117,7 +111,6 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-elasticsearch</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -192,7 +185,6 @@ <plugin> <groupId>org.apache.streams.plugins</groupId> <artifactId>streams-plugin-pojo</artifactId> - <version>${project.version}</version> <configuration> <sourcePaths> <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/local/twitter-userstream-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/local/twitter-userstream-elasticsearch/pom.xml b/local/twitter-userstream-elasticsearch/pom.xml index be9fc09..b288b3f 100644 --- a/local/twitter-userstream-elasticsearch/pom.xml +++ b/local/twitter-userstream-elasticsearch/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streams</groupId> <artifactId>streams-examples-local</artifactId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -73,7 +73,6 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>com.typesafe</groupId> @@ -82,32 +81,26 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-config</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-runtime-local</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-filters</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-provider-twitter</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-elasticsearch</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-pojo</artifactId> - <version>${project.version}</version> <type>test-jar</type> </dependency> <dependency> @@ -139,7 +132,6 @@ <plugin> <groupId>org.apache.streams.plugins</groupId> <artifactId>streams-plugin-pojo</artifactId> - <version>${project.version}</version> <configuration> <sourcePaths> <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/eaf60467/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f249ab0..2064f1b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,11 @@ <parent> <artifactId>streams-master</artifactId> <groupId>org.apache.streams</groupId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating</version> </parent> <artifactId>streams-examples</artifactId> - <version>0.5-incubating-SNAPSHOT</version> + <version>0.4.1-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>streams-examples</name> @@ -187,77 +187,102 @@ <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-config</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-core</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-filters</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> + </dependency> + <dependency> + <groupId>org.apache.streams</groupId> + <artifactId>streams-schema-activitystreams</artifactId> + <version>0.4.1-incubating</version> + </dependency> + <dependency> + <groupId>org.apache.streams</groupId> + <artifactId>streams-schema-activitystreams</artifactId> + <version>0.4.1-incubating</version> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-pojo</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-pojo</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-util</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-util</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-pojo-extensions</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-runtime-local</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-provider-twitter</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-elasticsearch</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> + </dependency> + <dependency> + <groupId>org.apache.streams</groupId> + <artifactId>streams-persist-elasticsearch</artifactId> + <version>0.4.1-incubating</version> + <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-graph</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-hdfs</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-persist-mongo</artifactId> - <version>${project.version}</version> + <version>0.4.1-incubating</version> </dependency> + <dependency> + <groupId>org.apache.streams</groupId> + <artifactId>streams-persist-mongo</artifactId> + <version>0.4.1-incubating</version> + <type>test-jar</type> + </dependency> + </dependencies> </dependencyManagement> @@ -271,21 +296,6 @@ <groupId>org.scalastyle</groupId> <artifactId>scalastyle-maven-plugin</artifactId> </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - </plugin> </plugins> <pluginManagement> <plugins> @@ -305,7 +315,7 @@ <id>validate</id> <phase>validate</phase> <configuration> - <configLocation>http://streams.incubator.apache.org/site/${project.version}/streams-master/streams-java-checkstyle.xml</configLocation> + <configLocation>http://streams.incubator.apache.org/site/latest/streams-master/streams-java-checkstyle.xml</configLocation> <encoding>UTF-8</encoding> <consoleOutput>true</consoleOutput> <includeTestSourceDirectory>true</includeTestSourceDirectory> @@ -397,6 +407,25 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>0.4.1-incubating</version> + <configuration> + <sourcePaths> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> + </sourcePaths> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> + <targetPackage>org.apache.streams.pojo</targetPackage> + </configuration> + <executions> + <execution> + <goals> + <goal>generate-sources</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build>