You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by mp...@apache.org on 2012/07/02 08:10:21 UTC
svn commit: r1356076 - in /incubator/flume/trunk: ./ flume-ng-channels/
flume-ng-channels/flume-file-channel/ flume-ng-channels/flume-jdbc-channel/
flume-ng-channels/flume-recoverable-memory-channel/ flume-ng-clients/
flume-ng-clients/flume-ng-log4japp...
Author: mpercy
Date: Mon Jul 2 06:10:18 2012
New Revision: 1356076
URL: http://svn.apache.org/viewvc?rev=1356076&view=rev
Log:
Updating trunk to version 1.3.0-SNAPSHOT. Also, updating dist.xml to pick up
the docs after the javadoc goal was changed to aggregate-jar.
Modified:
incubator/flume/trunk/flume-ng-channels/flume-file-channel/pom.xml
incubator/flume/trunk/flume-ng-channels/flume-jdbc-channel/pom.xml
incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/pom.xml
incubator/flume/trunk/flume-ng-channels/pom.xml
incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml
incubator/flume/trunk/flume-ng-clients/pom.xml
incubator/flume/trunk/flume-ng-configuration/pom.xml
incubator/flume/trunk/flume-ng-core/pom.xml
incubator/flume/trunk/flume-ng-dist/pom.xml
incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml
incubator/flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml
incubator/flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml
incubator/flume/trunk/flume-ng-legacy-sources/pom.xml
incubator/flume/trunk/flume-ng-node/pom.xml
incubator/flume/trunk/flume-ng-sdk/pom.xml
incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml
incubator/flume/trunk/flume-ng-sinks/flume-irc-sink/pom.xml
incubator/flume/trunk/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
incubator/flume/trunk/flume-ng-sinks/pom.xml
incubator/flume/trunk/flume-ng-tests/pom.xml
incubator/flume/trunk/pom.xml
Modified: incubator/flume/trunk/flume-ng-channels/flume-file-channel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-channels/flume-file-channel/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-channels/flume-file-channel/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-channels/flume-file-channel/pom.xml Mon Jul 2 06:10:18 2012
@@ -24,7 +24,7 @@
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-channels</groupId>
Modified: incubator/flume/trunk/flume-ng-channels/flume-jdbc-channel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-channels/flume-jdbc-channel/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-channels/flume-jdbc-channel/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-channels/flume-jdbc-channel/pom.xml Mon Jul 2 06:10:18 2012
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-channels</groupId>
Modified: incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/pom.xml Mon Jul 2 06:10:18 2012
@@ -24,7 +24,7 @@
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-channels</groupId>
Modified: incubator/flume/trunk/flume-ng-channels/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-channels/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-channels/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-channels/pom.xml Mon Jul 2 06:10:18 2012
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
Modified: incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml Mon Jul 2 06:10:18 2012
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-clients</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: incubator/flume/trunk/flume-ng-clients/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-clients/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-clients/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-clients/pom.xml Mon Jul 2 06:10:18 2012
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flume-ng-clients</artifactId>
Modified: incubator/flume/trunk/flume-ng-configuration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-configuration/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-configuration/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-configuration/pom.xml Mon Jul 2 06:10:18 2012
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flume-ng-configuration</artifactId>
Modified: incubator/flume/trunk/flume-ng-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-core/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-core/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-core/pom.xml Mon Jul 2 06:10:18 2012
@@ -22,7 +22,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
Modified: incubator/flume/trunk/flume-ng-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-dist/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-dist/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-dist/pom.xml Mon Jul 2 06:10:18 2012
@@ -24,7 +24,7 @@
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>flume-ng-dist</artifactId>
Modified: incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml (original)
+++ incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml Mon Jul 2 06:10:18 2012
@@ -125,6 +125,14 @@
<outputDirectory>docs</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../target/apidocs</directory>
+ <includes>
+ <include>/**</include>
+ </includes>
+ <outputDirectory>docs/apidocs</outputDirectory>
+ </fileSet>
+
</fileSets>
</assembly>
Modified: incubator/flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-legacy-sources/flume-avro-source/pom.xml Mon Jul 2 06:10:18 2012
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-legacy-sources</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
Modified: incubator/flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-legacy-sources/flume-thrift-source/pom.xml Mon Jul 2 06:10:18 2012
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-legacy-sources</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
Modified: incubator/flume/trunk/flume-ng-legacy-sources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-legacy-sources/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-legacy-sources/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-legacy-sources/pom.xml Mon Jul 2 06:10:18 2012
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
Modified: incubator/flume/trunk/flume-ng-node/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-node/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-node/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-node/pom.xml Mon Jul 2 06:10:18 2012
@@ -25,7 +25,7 @@
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>flume-ng-node</artifactId>
Modified: incubator/flume/trunk/flume-ng-sdk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-sdk/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-sdk/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-sdk/pom.xml Mon Jul 2 06:10:18 2012
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>flume-ng-sdk</artifactId>
Modified: incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml Mon Jul 2 06:10:18 2012
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
Modified: incubator/flume/trunk/flume-ng-sinks/flume-irc-sink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-sinks/flume-irc-sink/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-sinks/flume-irc-sink/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-sinks/flume-irc-sink/pom.xml Mon Jul 2 06:10:18 2012
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
Modified: incubator/flume/trunk/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-sinks/flume-ng-hbase-sink/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-sinks/flume-ng-hbase-sink/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-sinks/flume-ng-hbase-sink/pom.xml Mon Jul 2 06:10:18 2012
@@ -15,7 +15,7 @@
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-hbase-sink</artifactId>
Modified: incubator/flume/trunk/flume-ng-sinks/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-sinks/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-sinks/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-sinks/pom.xml Mon Jul 2 06:10:18 2012
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
Modified: incubator/flume/trunk/flume-ng-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-tests/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-tests/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-tests/pom.xml Mon Jul 2 06:10:18 2012
@@ -24,7 +24,7 @@
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>flume-ng-tests</artifactId>
Modified: incubator/flume/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/pom.xml?rev=1356076&r1=1356075&r2=1356076&view=diff
==============================================================================
--- incubator/flume/trunk/pom.xml (original)
+++ incubator/flume/trunk/pom.xml Mon Jul 2 06:10:18 2012
@@ -27,7 +27,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.flume</groupId>
<artifactId>flume-parent</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Flume</name>
@@ -712,78 +712,78 @@ limitations under the License.
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-configuration</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-node</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-file-channel</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-jdbc-channel</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-recoverable-memory-channel</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-hdfs-sink</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-irc-sink</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-hbase-sink</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
<artifactId>flume-thrift-source</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
<artifactId>flume-avro-source</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-clients</groupId>
<artifactId>flume-ng-log4jappender</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>