Merge branch 'pr-886'
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index d028686..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Fluo is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by Apache Incubator.
-
-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 stability of the code, it does indicate that the project has yet
-to be fully endorsed by the ASF.
diff --git a/NOTICE b/NOTICE
index 0cf9769..96a243f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Fluo (incubating)
+Apache Fluo
Copyright 2017 The Apache Software Foundation.
This product includes software developed at
diff --git a/modules/accumulo/pom.xml b/modules/accumulo/pom.xml
index 4da36f9..581038d 100644
--- a/modules/accumulo/pom.xml
+++ b/modules/accumulo/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-project</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>fluo-accumulo</artifactId>
- <name>Apache Fluo (incubating) Accumulo Extensions</name>
+ <name>Apache Fluo Accumulo Extensions</name>
<description>This module contains all Apache Fluo code that is run by Accumulo. This includes
iterators and formatters. Given that this module produces a JAR that needs to be included on the
Accumulo classpath, external dependencies should be limited. Some utility classes in this module
diff --git a/modules/api/pom.xml b/modules/api/pom.xml
index 0c85205..40f0297 100644
--- a/modules/api/pom.xml
+++ b/modules/api/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-project</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>fluo-api</artifactId>
- <name>Apache Fluo (incubating) API</name>
+ <name>Apache Fluo API</name>
<description>This module contains all API code for Apache Fluo. External dependencies should be
limited. Any changes to public methods should be avoided. While the API module does not have
compile time dependency on fluo-core, you must include fluo-core as a run-time dependency.</description>
diff --git a/modules/cluster/pom.xml b/modules/cluster/pom.xml
index a379536..efce104 100644
--- a/modules/cluster/pom.xml
+++ b/modules/cluster/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-project</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>fluo-cluster</artifactId>
- <name>Apache Fluo (incubating) Cluster</name>
+ <name>Apache Fluo Cluster</name>
<description>This module contains all code necessary to run Apache Fluo on a YARN cluster using
Apache Twill. It was separated from fluo-core to keep dependencies (like Twill) out of Fluo
clients which depend on the fluo-core jar. It was also done to limit conflicts. For example,
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 6a068b4..546ece1 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-project</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>fluo-core</artifactId>
- <name>Apache Fluo (incubating) Core</name>
+ <name>Apache Fluo Core</name>
<description>The modules contains the core implementation code of Apache Fluo.</description>
<dependencies>
<dependency>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 986f8d8..10b9b0b 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-project</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>fluo</artifactId>
<packaging>pom</packaging>
- <name>Apache Fluo (incubating) Distribution</name>
+ <name>Apache Fluo Distribution</name>
<description>This module produces a tarball distribution of Apache Fluo. It contains all of the
default configuration and scripts required for the distribution.</description>
<!-- NOTE: These dependencies are bundled in this assembly -->
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 5063341..e08daa2 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-project</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>fluo-integration</artifactId>
- <name>Apache Fluo (incubating) Integration</name>
+ <name>Apache Fluo Integration</name>
<description>This module contains Apache Fluo integration tests</description>
<dependencies>
<dependency>
diff --git a/modules/mapreduce/pom.xml b/modules/mapreduce/pom.xml
index a4b641f..617d8c1 100644
--- a/modules/mapreduce/pom.xml
+++ b/modules/mapreduce/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-project</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>fluo-mapreduce</artifactId>
- <name>Apache Fluo (incubating) MapReduce Utilities</name>
+ <name>Apache Fluo MapReduce Utilities</name>
<description>This module provides utility code for MapReduce jobs that read from or write to a
Apache Fluo table.</description>
<dependencies>
diff --git a/modules/mini/pom.xml b/modules/mini/pom.xml
index 593ca0b..50eeacd 100644
--- a/modules/mini/pom.xml
+++ b/modules/mini/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-project</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>fluo-mini</artifactId>
- <name>Apache Fluo (incubating) Mini</name>
+ <name>Apache Fluo Mini</name>
<description>This module contains the implementation code of MiniFluo. It was separated from
fluo-core to remove the dependency on accumulo-minicluster from core.</description>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 4441b50..5b1a14e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,9 @@
<version>1-incubating</version>
</parent>
<artifactId>fluo-project</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Fluo (incubating) Project</name>
+ <name>Apache Fluo Project</name>
<description>An implementation of Percolator for Apache Accumulo</description>
<licenses>
<license>
