You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by jf...@apache.org on 2020/07/03 21:35:00 UTC

[streams] 01/01: STREAMS-663: Fix DISCLAIMER

This is an automated email from the ASF dual-hosted git repository.

jfrazee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/streams.git

commit 3f88bf6ce91616a33c90881d67c06c8efcfc2e17
Author: sblackmon <sb...@apache.org>
AuthorDate: Wed Jul 1 11:51:40 2020 -0500

    STREAMS-663: Fix DISCLAIMER
    
    Resolves STREAMS-663
    
    Signed-off-by: Joey Frazee <jf...@apache.org>
---
 pom.xml                                                             | 6 ++----
 publish-rc.sh                                                       | 2 +-
 streams-examples/src/site/markdown/index.md                         | 3 ---
 .../streams-examples-flink/flink-twitter-collection/README.md       | 2 +-
 .../streams-examples-local/elasticsearch-hdfs/README.md             | 2 +-
 .../elasticsearch-hdfs/src/site/markdown/ElasticsearchHdfs.md       | 2 +-
 .../elasticsearch-hdfs/src/site/markdown/HdfsElasticsearch.md       | 2 +-
 .../streams-examples-local/elasticsearch-reindex/README.md          | 2 +-
 .../elasticsearch-reindex/src/site/markdown/ElasticsearchReindex.md | 2 +-
 .../streams-examples-local/mongo-elasticsearch-sync/README.md       | 2 +-
 .../src/site/markdown/MongoElasticsearchSync.md                     | 2 +-
 .../streams-examples-local/twitter-follow-neo4j/README.md           | 2 +-
 .../twitter-follow-neo4j/src/site/markdown/TwitterFollowNeo4j.md    | 2 +-
 .../streams-examples-local/twitter-history-elasticsearch/README.md  | 2 +-
 .../src/site/markdown/TwitterHistoryElasticsearch.md                | 2 +-
 .../twitter-userstream-elasticsearch/README.md                      | 2 +-
 .../src/site/markdown/TwitterUserstreamElasticsearch.md             | 2 +-
 17 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index f303b85..ab78531 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,14 +71,14 @@
             <post>dev@streams.apache.org</post>
             <subscribe>dev-subscribe@streams.apache.org</subscribe>
             <unsubscribe>dev-unsubscribe@streams.apache.org</unsubscribe>
-            <archive>http://mail-archives.apache.org/mod_mbox/incubator-streams-dev/</archive>
+            <archive>http://mail-archives.apache.org/mod_mbox/streams-dev/</archive>
         </mailingList>
         <mailingList>
             <name>Commits Mailing List</name>
             <post>commits@streams.apache.org</post>
             <subscribe>commits-subscribe@streams.apache.org</subscribe>
             <unsubscribe>commits-unsubscribe@streams.apache.org</unsubscribe>
-            <archive>http://mail-archives.apache.org/mod_mbox/incubator-streams-commits/</archive>
+            <archive>http://mail-archives.apache.org/mod_mbox/streams-commits/</archive>
         </mailingList>
     </mailingLists>
 
@@ -518,8 +518,6 @@
                                 <resourceBundles combine.children="append">
                                     <!-- Will generate META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE -->
                                     <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-                                    <!-- Will generate META-INF/DISCLAIMER  -->
-                                    <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
                                 </resourceBundles>
                                 <properties>
                                     <projectName>${notice.file.project.name}</projectName>
diff --git a/publish-rc.sh b/publish-rc.sh
index 2e756a2..e9fc605 100755
--- a/publish-rc.sh
+++ b/publish-rc.sh
@@ -27,7 +27,7 @@ fi
 
 mkdir -p dist
 cd dist
-svn co https://dist.apache.org/repos/dist/dev/incubator/streams dev
+svn co https://dist.apache.org/repos/dist/dev/streams dev
 cd dev
 mkdir $REL
 cd $REL
diff --git a/streams-examples/src/site/markdown/index.md b/streams-examples/src/site/markdown/index.md
index f1dad19..08ed2ea 100644
--- a/streams-examples/src/site/markdown/index.md
+++ b/streams-examples/src/site/markdown/index.md
@@ -51,7 +51,4 @@ To build from source code:
       
         mvn -Pdocker clean package docker:build
 
-### Disclaimer
-Apache Streams is an effort undergoing incubation at [The Apache Software Foundation (ASF)](http://apache.org) sponsored by the [Apache Incubator PMC](http://incubator.apache.org). Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or s [...]
-
 ###### Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
diff --git a/streams-examples/streams-examples-flink/flink-twitter-collection/README.md b/streams-examples/streams-examples-flink/flink-twitter-collection/README.md
index f9fe687..6ac4d1a 100644
--- a/streams-examples/streams-examples-flink/flink-twitter-collection/README.md
+++ b/streams-examples/streams-examples-flink/flink-twitter-collection/README.md
@@ -1,4 +1,4 @@
-Apache Streams (incubating)
+Apache Streams
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
diff --git a/streams-examples/streams-examples-local/elasticsearch-hdfs/README.md b/streams-examples/streams-examples-local/elasticsearch-hdfs/README.md
index b6653da..278e165 100644
--- a/streams-examples/streams-examples-local/elasticsearch-hdfs/README.md
+++ b/streams-examples/streams-examples-local/elasticsearch-hdfs/README.md
@@ -1,4 +1,4 @@
-Apache Streams (incubating)
+Apache Streams
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
diff --git a/streams-examples/streams-examples-local/elasticsearch-hdfs/src/site/markdown/ElasticsearchHdfs.md b/streams-examples/streams-examples-local/elasticsearch-hdfs/src/site/markdown/ElasticsearchHdfs.md
index 3294e09..9aa9c65 100644
--- a/streams-examples/streams-examples-local/elasticsearch-hdfs/src/site/markdown/ElasticsearchHdfs.md
+++ b/streams-examples/streams-examples-local/elasticsearch-hdfs/src/site/markdown/ElasticsearchHdfs.md
@@ -29,7 +29,7 @@ Copies documents from elasticsearch to hdfs.
 
     sbtx -210 -sbt-create
     set resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
-    set libraryDependencies += "org.apache.streams" % "elasticsearch-hdfs" % "0.4-incubating-SNAPSHOT"
+    set libraryDependencies += "org.apache.streams" % "elasticsearch-hdfs" % "0.6.1"
     set fork := true
     set javaOptions +="-Dconfig.file=application.conf"
     run org.apache.streams.example.ElasticsearchHdfs
diff --git a/streams-examples/streams-examples-local/elasticsearch-hdfs/src/site/markdown/HdfsElasticsearch.md b/streams-examples/streams-examples-local/elasticsearch-hdfs/src/site/markdown/HdfsElasticsearch.md
index ecd8445..14813a6 100644
--- a/streams-examples/streams-examples-local/elasticsearch-hdfs/src/site/markdown/HdfsElasticsearch.md
+++ b/streams-examples/streams-examples-local/elasticsearch-hdfs/src/site/markdown/HdfsElasticsearch.md
@@ -31,7 +31,7 @@ Copies documents from hdfs to elasticsearch.
 
     sbtx -210 -sbt-create
     set resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
-    set libraryDependencies += "org.apache.streams" % "elasticsearch-hdfs" % "0.4-incubating-SNAPSHOT"
+    set libraryDependencies += "org.apache.streams" % "elasticsearch-hdfs" % "0.6.1"
     set fork := true
     set javaOptions +="-Dconfig.file=application.conf"
     run org.apache.streams.example.ElasticsearchHdfs
diff --git a/streams-examples/streams-examples-local/elasticsearch-reindex/README.md b/streams-examples/streams-examples-local/elasticsearch-reindex/README.md
index b6653da..278e165 100644
--- a/streams-examples/streams-examples-local/elasticsearch-reindex/README.md
+++ b/streams-examples/streams-examples-local/elasticsearch-reindex/README.md
@@ -1,4 +1,4 @@
-Apache Streams (incubating)
+Apache Streams
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
diff --git a/streams-examples/streams-examples-local/elasticsearch-reindex/src/site/markdown/ElasticsearchReindex.md b/streams-examples/streams-examples-local/elasticsearch-reindex/src/site/markdown/ElasticsearchReindex.md
index 9bd37d4..a3cdc1d 100644
--- a/streams-examples/streams-examples-local/elasticsearch-reindex/src/site/markdown/ElasticsearchReindex.md
+++ b/streams-examples/streams-examples-local/elasticsearch-reindex/src/site/markdown/ElasticsearchReindex.md
@@ -28,7 +28,7 @@ Copies documents into a different index
 
     sbtx -210 -sbt-create
     set resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
-    set libraryDependencies += "org.apache.streams" % "elasticsearch-reindex" % "0.4-incubating-SNAPSHOT"
+    set libraryDependencies += "org.apache.streams" % "elasticsearch-reindex" % "0.6.1"
     set fork := true
     set javaOptions +="-Dconfig.file=application.conf"
     run org.apache.streams.example.ElasticsearchReindex
diff --git a/streams-examples/streams-examples-local/mongo-elasticsearch-sync/README.md b/streams-examples/streams-examples-local/mongo-elasticsearch-sync/README.md
index e74196c..bcbf71f 100644
--- a/streams-examples/streams-examples-local/mongo-elasticsearch-sync/README.md
+++ b/streams-examples/streams-examples-local/mongo-elasticsearch-sync/README.md
@@ -1,4 +1,4 @@
-Apache Streams (incubating)
+Apache Streams
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
diff --git a/streams-examples/streams-examples-local/mongo-elasticsearch-sync/src/site/markdown/MongoElasticsearchSync.md b/streams-examples/streams-examples-local/mongo-elasticsearch-sync/src/site/markdown/MongoElasticsearchSync.md
index d1f8f8d..e30c92a 100644
--- a/streams-examples/streams-examples-local/mongo-elasticsearch-sync/src/site/markdown/MongoElasticsearchSync.md
+++ b/streams-examples/streams-examples-local/mongo-elasticsearch-sync/src/site/markdown/MongoElasticsearchSync.md
@@ -30,7 +30,7 @@ Copies documents from mongodb to elasticsearch
 
     sbtx -210 -sbt-create
     set resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
-    set libraryDependencies += "org.apache.streams" % "mongo-elasticsearch-sync" % "0.4-incubating-SNAPSHOT"
+    set libraryDependencies += "org.apache.streams" % "mongo-elasticsearch-sync" % "0.6.1"
     set fork := true
     set javaOptions +="-Dconfig.file=application.conf"
     run org.apache.streams.example.MongoElasticsearchSync
diff --git a/streams-examples/streams-examples-local/twitter-follow-neo4j/README.md b/streams-examples/streams-examples-local/twitter-follow-neo4j/README.md
index 3e63a53..c7318a6 100644
--- a/streams-examples/streams-examples-local/twitter-follow-neo4j/README.md
+++ b/streams-examples/streams-examples-local/twitter-follow-neo4j/README.md
@@ -1,4 +1,4 @@
-Apache Streams (incubating)
+Apache Streams
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
diff --git a/streams-examples/streams-examples-local/twitter-follow-neo4j/src/site/markdown/TwitterFollowNeo4j.md b/streams-examples/streams-examples-local/twitter-follow-neo4j/src/site/markdown/TwitterFollowNeo4j.md
index c241b60..1f6ed78 100644
--- a/streams-examples/streams-examples-local/twitter-follow-neo4j/src/site/markdown/TwitterFollowNeo4j.md
+++ b/streams-examples/streams-examples-local/twitter-follow-neo4j/src/site/markdown/TwitterFollowNeo4j.md
@@ -25,7 +25,7 @@ Collects friend or follower connections for a set of twitter users to build a gr
 
     sbtx -210 -sbt-create
     set resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
-    set libraryDependencies += "org.apache.streams" % "twitter-follow-neo4j" % "0.4-incubating-SNAPSHOT"
+    set libraryDependencies += "org.apache.streams" % "twitter-follow-neo4j" % "0.6.1"
     set fork := true
     set javaOptions +="-Dconfig.file=application.conf"
     run org.apache.streams.example.TwitterFollowNeo4j
diff --git a/streams-examples/streams-examples-local/twitter-history-elasticsearch/README.md b/streams-examples/streams-examples-local/twitter-history-elasticsearch/README.md
index 5b0b3ec..9832ff3 100644
--- a/streams-examples/streams-examples-local/twitter-history-elasticsearch/README.md
+++ b/streams-examples/streams-examples-local/twitter-history-elasticsearch/README.md
@@ -1,4 +1,4 @@
-Apache Streams (incubating)
+Apache Streams
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
diff --git a/streams-examples/streams-examples-local/twitter-history-elasticsearch/src/site/markdown/TwitterHistoryElasticsearch.md b/streams-examples/streams-examples-local/twitter-history-elasticsearch/src/site/markdown/TwitterHistoryElasticsearch.md
index 09d7f5a..26d36b2 100644
--- a/streams-examples/streams-examples-local/twitter-history-elasticsearch/src/site/markdown/TwitterHistoryElasticsearch.md
+++ b/streams-examples/streams-examples-local/twitter-history-elasticsearch/src/site/markdown/TwitterHistoryElasticsearch.md
@@ -33,7 +33,7 @@ Converts them to activities, and writes them in activity format to Elasticsearch
 
     sbtx -210 -sbt-create
     set resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
-    set libraryDependencies += "org.apache.streams" % "twitter-history-elasticsearch" % "0.4-incubating-SNAPSHOT"
+    set libraryDependencies += "org.apache.streams" % "twitter-history-elasticsearch" % "0.6.1"
     set fork := true
     set javaOptions +="-Dconfig.file=application.conf"
     run org.apache.streams.example.TwitterHistoryElasticsearch
diff --git a/streams-examples/streams-examples-local/twitter-userstream-elasticsearch/README.md b/streams-examples/streams-examples-local/twitter-userstream-elasticsearch/README.md
index a09b345..6f89901 100644
--- a/streams-examples/streams-examples-local/twitter-userstream-elasticsearch/README.md
+++ b/streams-examples/streams-examples-local/twitter-userstream-elasticsearch/README.md
@@ -1,4 +1,4 @@
-Apache Streams (incubating)
+Apache Streams
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
diff --git a/streams-examples/streams-examples-local/twitter-userstream-elasticsearch/src/site/markdown/TwitterUserstreamElasticsearch.md b/streams-examples/streams-examples-local/twitter-userstream-elasticsearch/src/site/markdown/TwitterUserstreamElasticsearch.md
index c812749..3158de1 100644
--- a/streams-examples/streams-examples-local/twitter-userstream-elasticsearch/src/site/markdown/TwitterUserstreamElasticsearch.md
+++ b/streams-examples/streams-examples-local/twitter-userstream-elasticsearch/src/site/markdown/TwitterUserstreamElasticsearch.md
@@ -23,7 +23,7 @@ This example connects to an active twitter account and stores the userstream as
 
     sbtx -210 -sbt-create
     set resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
-    set libraryDependencies += "org.apache.streams" % "twitter-userstream-elasticsearch" % "0.4-incubating-SNAPSHOT"
+    set libraryDependencies += "org.apache.streams" % "twitter-userstream-elasticsearch" % "0.6.1"
     set fork := true
     set javaOptions +="-Dconfig.file=application.conf"
     run org.apache.streams.example.TwitterUserstreamElasticsearch