Author: cutting
Date: Fri Apr 29 22:24:34 2011
New Revision: 1097975
URL: http://svn.apache.org/viewvc?rev=1097975&view=rev
Log:
Merge change 1097974 from trunk to 1.5 branch, adding a missing license header.
Modified:
avro/branches/branch-1.5/ (props changed)
avro/branches/branch-1.5/CHANGES.txt
avro/branches/branch-1.5/lang/csharp/build.sh
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/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
Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 29 22:24:34 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,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
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,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
Modified: avro/branches/branch-1.5/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Fri Apr 29 22:24:34 2011
@@ -1,6 +1,6 @@
Avro Change Log
-Avro 1.5.1 (unreleased)
+Avro 1.5.1 (3 May 2011)
NEW FEATURES
Modified: avro/branches/branch-1.5/lang/csharp/build.sh
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/csharp/build.sh?rev=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/csharp/build.sh (original)
+++ avro/branches/branch-1.5/lang/csharp/build.sh Fri Apr 29 22:24:34 2011
@@ -1,4 +1,20 @@
#!/bin/bash
+
+# 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.
+
set -e # exit on error
set -x
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=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/avro/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/avro/pom.xml Fri Apr 29 22:24:34 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.0</version>
+ <version>1.5.1</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=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/compiler/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/compiler/pom.xml Fri Apr 29 22:24:34 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.0</version>
+ <version>1.5.1</version>
<relativePath>../</relativePath>
</parent>
<artifactId>avro-compiler</artifactId>
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=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/ipc/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/ipc/pom.xml Fri Apr 29 22:24:34 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.0</version>
+ <version>1.5.1</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=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/mapred/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/mapred/pom.xml Fri Apr 29 22:24:34 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.0</version>
+ <version>1.5.1</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=1097975&r1=1097974&r2=1097975&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 Fri Apr 29 22:24:34
2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.0</version>
+ <version>1.5.1</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=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/pom.xml Fri Apr 29 22:24:34 2011
@@ -27,7 +27,7 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro-parent</artifactId>
- <version>1.5.0</version>
+ <version>1.5.1</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=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/tools/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/tools/pom.xml Fri Apr 29 22:24:34 2011
@@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
- <version>1.5.0</version>
+ <version>1.5.1</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=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/pom.xml (original)
+++ avro/branches/branch-1.5/pom.xml Fri Apr 29 22:24:34 2011
@@ -27,7 +27,7 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro-toplevel</artifactId>
- <version>1.5.0</version>
+ <version>1.5.1</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=1097975&r1=1097974&r2=1097975&view=diff
==============================================================================
--- avro/branches/branch-1.5/share/VERSION.txt (original)
+++ avro/branches/branch-1.5/share/VERSION.txt Fri Apr 29 22:24:34 2011
@@ -1 +1 @@
-1.5.0
\ No newline at end of file
+1.5.1
\ No newline at end of file
