Skip to content

Commit

Permalink
FLUME-2677. Update versions in 1.6 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@harishreedharan
harishreedharan committed Apr 16, 2015
1 parent 6a64c3b commit 8ac759e
Show file tree
Hide file tree
Showing 38 changed files with 74 additions and 74 deletions.
6 changes: 3 additions & 3 deletions RELEASE-NOTES
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache Flume 1.5.2
Apache Flume 1.6.0

CONTENTS
1. What is Apache Flume
Expand All @@ -17,8 +17,8 @@ simple, extensible data model that allows for online analytic
application.

2. Status of this release
Apache Flume 1.5.2 is the eighth release of Flume as an Apache top-level project
(TLP). Apache Flume 1.5.2 is production-ready software.
Apache Flume 1.6.0 is the ninth release of Flume as an Apache top-level project
(TLP). Apache Flume 1.6.0 is production-ready software.

3. Major changes in this Release
For a detailed list of changes, please see the CHANGELOG file included
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<artifactId>flume-ng-auth</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-channels/flume-file-channel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-channels</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-channels/flume-jdbc-channel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-channels</groupId>
Expand Down
4 changes: 2 additions & 2 deletions flume-ng-channels/flume-kafka-channel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -51,4 +51,4 @@ limitations under the License.

</dependencies>

</project>
</project>
2 changes: 1 addition & 1 deletion flume-ng-channels/flume-spillable-memory-channel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-channels</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-channels/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-clients/flume-ng-log4jappender/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-clients</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flume-ng-clients/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flume-ng-clients</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flume-ng-configuration</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<artifactId>flume-ng-dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
======================================
Flume 1.6.0-SNAPSHOT Developer Guide
Flume 1.6.0 Developer Guide
======================================

Introduction
Expand Down
6 changes: 3 additions & 3 deletions flume-ng-doc/sphinx/FlumeUserGuide.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
======================================
Flume 1.6.0-SNAPSHOT User Guide
Flume 1.6.0 User Guide
======================================

Introduction
Expand Down Expand Up @@ -3420,7 +3420,7 @@ Log4J Appender

Appends Log4j events to a flume agent's avro source. A client using this
appender must have the flume-ng-sdk in the classpath (eg,
flume-ng-sdk-1.6.0-SNAPSHOT.jar).
flume-ng-sdk-1.6.0.jar).
Required properties are in **bold**.

===================== ======= ==================================================================================
Expand Down Expand Up @@ -3484,7 +3484,7 @@ Load Balancing Log4J Appender

Appends Log4j events to a list of flume agent's avro source. A client using this
appender must have the flume-ng-sdk in the classpath (eg,
flume-ng-sdk-1.6.0-SNAPSHOT.jar). This appender supports a round-robin and random
flume-ng-sdk-1.6.0.jar). This appender supports a round-robin and random
scheme for performing the load balancing. It also supports a configurable backoff
timeout so that down agents are removed temporarily from the set of hosts
Required properties are in **bold**.
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-doc/sphinx/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
================================================
Apache Flume 1.6.0-SNAPSHOT documentation
Apache Flume 1.6.0 documentation
================================================

Flume is a distributed, reliable, and available system for efficiently
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-embedded-agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<artifactId>flume-ng-embedded-agent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-legacy-sources/flume-avro-source/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-legacy-sources</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-legacy-sources/flume-thrift-source/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-legacy-sources</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-legacy-sources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-node/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<artifactId>flume-ng-node</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sdk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<artifactId>flume-ng-sdk</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sinks/flume-dataset-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-sinks</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sinks/flume-hdfs-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-sinks</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sinks/flume-hive-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sinks</artifactId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-sinks</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sinks/flume-irc-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-sinks</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-sinks</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sinks/flume-ng-hbase-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-hbase-sink</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sinks/flume-ng-kafka-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-kafka-sink</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-morphline-solr-sink</artifactId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
<name>Flume NG Morphline Solr Sink</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sinks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sources/flume-jms-source/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sources</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-sources</groupId>
Expand Down
4 changes: 2 additions & 2 deletions flume-ng-sources/flume-kafka-source/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>flume-ng-sources</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -67,4 +67,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
2 changes: 1 addition & 1 deletion flume-ng-sources/flume-scribe-source/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sources</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-sources</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sources/flume-twitter-source/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sources</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume.flume-ng-sources</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-sources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flume-ng-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<artifactId>flume-ng-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flume-tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>1.6.0-SNAPSHOT</version>
<version>1.6.0</version>
</parent>

<groupId>org.apache.flume</groupId>
Expand Down
Loading

0 comments on commit 8ac759e

Please sign in to comment.