Repository: incubator-reef Updated Branches: refs/heads/master c9b0376e8 -> ee1a6295e
[REEF-720] Update Avro version number from 1.4.0.0 to 1.5.6 JIRA: [REEF-720](https://issues.apache.org/jira/browse/REEF-720) Pull Request: This closes #479 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/ee1a6295 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/ee1a6295 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/ee1a6295 Branch: refs/heads/master Commit: ee1a6295e3720d13bde261c5010a653692a90f9c Parents: c9b0376 Author: Julia Wang <[email protected]> Authored: Wed Sep 9 19:55:22 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Thu Sep 10 16:47:13 2015 -0700 ---------------------------------------------------------------------- .../Org.Apache.REEF.Client.csproj | 1 - lang/cs/Org.Apache.REEF.Client/packages.config | 24 -------------------- .../Org.Apache.REEF.Common.csproj | 4 ++-- lang/cs/Org.Apache.REEF.Common/packages.config | 2 +- lang/cs/Org.Apache.REEF.Driver/packages.config | 2 -- .../Org.Apache.REEF.Network.csproj | 2 +- lang/cs/Org.Apache.REEF.Network/packages.config | 2 +- .../Org.Apache.REEF.Tang.Tests.csproj | 2 +- .../Org.Apache.REEF.Tang.Tests/packages.config | 2 +- .../Org.Apache.REEF.Tang.csproj | 2 +- lang/cs/Org.Apache.REEF.Tang/packages.config | 2 +- lang/cs/Org.Apache.REEF.Tests/packages.config | 2 -- .../Org.Apache.Reef.Utilities.csproj | 2 +- .../Org.Apache.REEF.Utilities/packages.config | 2 +- lang/cs/build.props | 2 +- 15 files changed, 12 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj index de1b045..348c7fa 100644 --- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj +++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj @@ -69,7 +69,6 @@ under the License. <Compile Include="YARN\YarnCommandLineEnvironment.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="Org.Apache.REEF.Client.nuspec" /> </ItemGroup> <ItemGroup> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Client/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/packages.config b/lang/cs/Org.Apache.REEF.Client/packages.config deleted file mode 100644 index 933b7e1..0000000 --- a/lang/cs/Org.Apache.REEF.Client/packages.config +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -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. ---> -<packages> - <package id="Microsoft.Hadoop.Avro" version="1.4.0.0" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> - <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> -</packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj index 59c8a24..1db9d72 100644 --- a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj +++ b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj @@ -31,10 +31,10 @@ under the License. <Import Project="$(SolutionDir)\build.props" /> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.1.4.0.0\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> - <HintPath>$(PackagesDir)\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> + <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="protobuf-net"> <HintPath>$(PackagesDir)\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Common/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/packages.config b/lang/cs/Org.Apache.REEF.Common/packages.config index 88cf17b..528c114 100644 --- a/lang/cs/Org.Apache.REEF.Common/packages.config +++ b/lang/cs/Org.Apache.REEF.Common/packages.config @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Microsoft.Hadoop.Avro" version="1.4.0.0" targetFramework="net45" /> + <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="Rx-Core" version="2.2.5" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Driver/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/packages.config b/lang/cs/Org.Apache.REEF.Driver/packages.config index 933b7e1..81b0ef5 100644 --- a/lang/cs/Org.Apache.REEF.Driver/packages.config +++ b/lang/cs/Org.Apache.REEF.Driver/packages.config @@ -18,7 +18,5 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Microsoft.Hadoop.Avro" version="1.4.0.0" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj index 884001f..4cf303c 100644 --- a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj +++ b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj @@ -33,7 +33,7 @@ under the License. <Import Project="$(SolutionDir)\build.props" /> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="protobuf-net"> <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Network/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/packages.config b/lang/cs/Org.Apache.REEF.Network/packages.config index 88cf17b..528c114 100644 --- a/lang/cs/Org.Apache.REEF.Network/packages.config +++ b/lang/cs/Org.Apache.REEF.Network/packages.config @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Microsoft.Hadoop.Avro" version="1.4.0.0" targetFramework="net45" /> + <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="Rx-Core" version="2.2.5" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj index c57131b..a92d1c9 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj @@ -34,7 +34,7 @@ under the License. </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config b/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config index 933b7e1..238e5be 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Microsoft.Hadoop.Avro" version="1.4.0.0" targetFramework="net45" /> + <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj index 487e7f7..ff3efa7 100644 --- a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj +++ b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj @@ -31,7 +31,7 @@ under the License. <Import Project="$(SolutionDir)\build.props" /> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Tang/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang/packages.config b/lang/cs/Org.Apache.REEF.Tang/packages.config index 933b7e1..238e5be 100644 --- a/lang/cs/Org.Apache.REEF.Tang/packages.config +++ b/lang/cs/Org.Apache.REEF.Tang/packages.config @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Microsoft.Hadoop.Avro" version="1.4.0.0" targetFramework="net45" /> + <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Tests/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/packages.config b/lang/cs/Org.Apache.REEF.Tests/packages.config index ef4860c..02dc191 100644 --- a/lang/cs/Org.Apache.REEF.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.Tests/packages.config @@ -21,9 +21,7 @@ under the License. <package id="Microsoft.Data.Edm" version="5.6.3" targetFramework="net45" /> <package id="Microsoft.Data.OData" version="5.6.3" targetFramework="net45" /> <package id="Microsoft.Data.Services.Client" version="5.6.3" targetFramework="net45" /> - <package id="Microsoft.Hadoop.Avro" version="1.4.0.0" targetFramework="net45" /> <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="Rx-Core" version="2.2.5" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj index 7b40ab7..78789ec 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj +++ b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj @@ -31,7 +31,7 @@ under the License. <Import Project="$(SolutionDir)\build.props" /> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/Org.Apache.REEF.Utilities/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/packages.config b/lang/cs/Org.Apache.REEF.Utilities/packages.config index c60eef8..2907dd8 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/packages.config +++ b/lang/cs/Org.Apache.REEF.Utilities/packages.config @@ -18,6 +18,6 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Microsoft.Hadoop.Avro" version="1.4.0.0" targetFramework="net45" /> + <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ee1a6295/lang/cs/build.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.props b/lang/cs/build.props index f817e9c..abe9298 100644 --- a/lang/cs/build.props +++ b/lang/cs/build.props @@ -65,7 +65,7 @@ under the License. <!-- Package versions --> <PropertyGroup> - <AvroVersion>1.4.0.0</AvroVersion> + <AvroVersion>1.5.6</AvroVersion> <NewtonsoftJsonVersion>6.0.8</NewtonsoftJsonVersion> <ProtobufVersion>2.0.0.668</ProtobufVersion> <RxVersion>2.2.5</RxVersion>
