Updated Branches: refs/heads/trunk 208f4e96b -> 2c3bbb7c1
FLUME-1500 Upgrade flume to use latest version of Avro - v1.7 (Hari Shreedharan via Mubarak Seyed) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/2c3bbb7c Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/2c3bbb7c Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/2c3bbb7c Branch: refs/heads/trunk Commit: 2c3bbb7c1f164ff94cc2c4d8d3bcb0edf0dd8431 Parents: 208f4e9 Author: Mubarak Seyed <[email protected]> Authored: Thu Aug 23 17:51:56 2012 -0700 Committer: Mubarak Seyed <[email protected]> Committed: Thu Aug 23 17:51:56 2012 -0700 ---------------------------------------------------------------------- flume-ng-legacy-sources/flume-avro-source/pom.xml | 3 +++ flume-ng-sdk/pom.xml | 2 +- pom.xml | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/2c3bbb7c/flume-ng-legacy-sources/flume-avro-source/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-legacy-sources/flume-avro-source/pom.xml b/flume-ng-legacy-sources/flume-avro-source/pom.xml index 236db8d..b951833 100644 --- a/flume-ng-legacy-sources/flume-avro-source/pom.xml +++ b/flume-ng-legacy-sources/flume-avro-source/pom.xml @@ -51,6 +51,9 @@ limitations under the License. </goals> </execution> </executions> + <configuration> + <stringType>CharSequence</stringType> + </configuration> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flume/blob/2c3bbb7c/flume-ng-sdk/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml index e8c5af6..75acacd 100644 --- a/flume-ng-sdk/pom.xml +++ b/flume-ng-sdk/pom.xml @@ -35,7 +35,7 @@ limitations under the License. <groupId>org.apache.avro</groupId> <artifactId>avro-maven-plugin</artifactId> <configuration> - <stringType>String</stringType> + <stringType>CharSequence</stringType> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/flume/blob/2c3bbb7c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 487be1c..b053bc6 100644 --- a/pom.xml +++ b/pom.xml @@ -521,7 +521,7 @@ limitations under the License. <stringType>String</stringType> </configuration> --> - <version>1.6.1</version> + <version>1.7.1</version> </plugin> <plugin> @@ -646,19 +646,19 @@ limitations under the License. <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> - <version>1.6.3</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro-compiler</artifactId> - <version>1.6.3</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro-ipc</artifactId> - <version>1.6.3</version> + <version>1.7.1</version> <exclusions> <exclusion> <groupId>org.mortbay.jetty</groupId>
