Author: cutting
Date: Thu Aug 25 21:56:31 2011
New Revision: 1161771
URL: http://svn.apache.org/viewvc?rev=1161771&view=rev
Log:
Merge 1161769 & 1161770 from trunk to 1.5 branch. Fixing RAT issues with
AVRO-872 & AVRO-877.
Modified:
avro/branches/branch-1.5/ (props changed)
avro/branches/branch-1.5/lang/java/avro/pom.xml
avro/branches/branch-1.5/lang/java/compiler/pom.xml
avro/branches/branch-1.5/lang/java/compiler/src/test/idl/input/baseball.avdl
avro/branches/branch-1.5/lang/java/ipc/pom.xml
avro/branches/branch-1.5/lang/java/mapred/pom.xml
avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml
avro/branches/branch-1.5/lang/java/pom.xml
avro/branches/branch-1.5/lang/java/tools/pom.xml
avro/branches/branch-1.5/pom.xml
avro/branches/branch-1.5/share/VERSION.txt
avro/branches/branch-1.5/share/rat-excludes.txt
Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 21:56:31 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1079680,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1099257,1102332,1102335,1124127,1124971,1129053,1129071,1129697-1129706,1129729,1129856,1130503,1136342,1141619,1141677,1141685,1141979-1141980,1142057,1142063,1151660,1151983,1157245,1161743,1161755,1161764
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1079680,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1099257,1102332,1102335,1124127,1124971,1129053,1129071,1129697-1129706,1129729,1129856,1130503,1136342,1141619,1141677,1141685,1141979-1141980,1142057,1142063,1151660,1151983,1157245,1161743,1161755,1161764,1161769-1161770
Modified: avro/branches/branch-1.5/lang/java/avro/pom.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/avro/pom.xml?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/avro/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/avro/pom.xml Thu Aug 25 21:56:31 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
<relativePath>../</relativePath>
</parent>
<artifactId>avro</artifactId>
Modified: avro/branches/branch-1.5/lang/java/compiler/pom.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/compiler/pom.xml?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/compiler/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/compiler/pom.xml Thu Aug 25 21:56:31 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
<relativePath>../</relativePath>
</parent>
<artifactId>avro-compiler</artifactId>
Modified:
avro/branches/branch-1.5/lang/java/compiler/src/test/idl/input/baseball.avdl
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/compiler/src/test/idl/input/baseball.avdl?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
---
avro/branches/branch-1.5/lang/java/compiler/src/test/idl/input/baseball.avdl
(original)
+++
avro/branches/branch-1.5/lang/java/compiler/src/test/idl/input/baseball.avdl
Thu Aug 25 21:56:31 2011
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
@namespace("avro.examples.baseball")
protocol Baseball {
import schema "position.avsc";
Modified: avro/branches/branch-1.5/lang/java/ipc/pom.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/ipc/pom.xml?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/ipc/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/ipc/pom.xml Thu Aug 25 21:56:31 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
<relativePath>../</relativePath>
</parent>
<artifactId>avro-ipc</artifactId>
Modified: avro/branches/branch-1.5/lang/java/mapred/pom.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/mapred/pom.xml?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/mapred/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/mapred/pom.xml Thu Aug 25 21:56:31 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
<relativePath>../</relativePath>
</parent>
<artifactId>avro-mapred</artifactId>
Modified: avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml Thu Aug 25 21:56:31
2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
<relativePath>../</relativePath>
</parent>
<artifactId>avro-maven-plugin</artifactId>
Modified: avro/branches/branch-1.5/lang/java/pom.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/pom.xml?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/pom.xml Thu Aug 25 21:56:31 2011
@@ -27,7 +27,7 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
<packaging>pom</packaging>
<name>Apache Avro Java</name>
Modified: avro/branches/branch-1.5/lang/java/tools/pom.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/tools/pom.xml?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/tools/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/tools/pom.xml Thu Aug 25 21:56:31 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
<relativePath>../</relativePath>
</parent>
<artifactId>avro-tools</artifactId>
Modified: avro/branches/branch-1.5/pom.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/pom.xml?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/pom.xml (original)
+++ avro/branches/branch-1.5/pom.xml Thu Aug 25 21:56:31 2011
@@ -27,7 +27,7 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro-toplevel</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.3</version>
<packaging>pom</packaging>
<name>Apache Avro Toplevel</name>
Modified: avro/branches/branch-1.5/share/VERSION.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/share/VERSION.txt?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/share/VERSION.txt (original)
+++ avro/branches/branch-1.5/share/VERSION.txt Thu Aug 25 21:56:31 2011
@@ -1 +1 @@
-1.5.3-SNAPSHOT
\ No newline at end of file
+1.5.3
\ No newline at end of file
Modified: avro/branches/branch-1.5/share/rat-excludes.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/share/rat-excludes.txt?rev=1161771&r1=1161770&r2=1161771&view=diff
==============================================================================
--- avro/branches/branch-1.5/share/rat-excludes.txt (original)
+++ avro/branches/branch-1.5/share/rat-excludes.txt Thu Aug 25 21:56:31 2011
@@ -36,4 +36,5 @@ lang/csharp/Avro.sln
lang/csharp/Avro.nunit
lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/static/*.js
lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/static/*.css
+lang/java/tools/src/test/compiler/output/*.java
share/test/data/test.avro12
