Repository: reef Updated Branches: refs/heads/master 16ca43efe -> a7c2c84fa
[REEF-1463] Update Newtonsoft.Json to version 8.0.3 This change: * updates Newtonsoft.Json to version 8.0.3 * removes unused app.config in O.A.R.Evaluator.Tests * replaces app.config in O.A.R.Examples.DriverRestart with a link to common app.config files JIRA: [REEF-1463](https://issues.apache.org/jira/browse/REEF-1463) This closes #1047 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/a7c2c84f Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/a7c2c84f Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/a7c2c84f Branch: refs/heads/master Commit: a7c2c84faf4eb5326f8a1d2c0408326598ba8a46 Parents: 16ca43e Author: Julia Wang <[email protected]> Authored: Mon Jun 20 14:38:44 2016 -0700 Committer: Mariia Mykhailova <[email protected]> Committed: Tue Jun 21 12:53:24 2016 -0700 ---------------------------------------------------------------------- lang/cs/App.config | 2 +- .../packages.config | 2 +- .../Common/DriverFolderPreparationHelper.cs | 2 +- lang/cs/Org.Apache.REEF.Client/packages.config | 2 +- lang/cs/Org.Apache.REEF.Common/packages.config | 2 +- lang/cs/Org.Apache.REEF.Driver/packages.config | 2 +- .../Org.Apache.REEF.Evaluator.Tests/app.config | 29 ------------------ .../App.config | 32 -------------------- ...rg.Apache.REEF.Examples.DriverRestart.csproj | 4 ++- lang/cs/Org.Apache.REEF.IO/packages.config | 2 +- lang/cs/Org.Apache.REEF.Network/packages.config | 2 +- .../Org.Apache.REEF.Tang.Tests/packages.config | 2 +- lang/cs/Org.Apache.REEF.Tang/packages.config | 2 +- .../Functional/Bridge/TestDisposeTasks.cs | 2 +- lang/cs/Org.Apache.REEF.Tests/packages.config | 2 +- .../Org.Apache.Reef.Utilities.nuspec | 2 +- .../Org.Apache.REEF.Utilities/packages.config | 2 +- lang/cs/build.props | 2 +- 18 files changed, 18 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/lang/cs/App.config ---------------------------------------------------------------------- diff --git a/lang/cs/App.config b/lang/cs/App.config index 72dbca3..756d7c9 100644 --- a/lang/cs/App.config +++ b/lang/cs/App.config @@ -25,7 +25,7 @@ under the License. <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> + <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> </dependentAssembly> </assemblyBinding> </runtime> http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/lang/cs/Org.Apache.REEF.Client.Tests/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client.Tests/packages.config b/lang/cs/Org.Apache.REEF.Client.Tests/packages.config index b976e6b..ba46c63 100644 --- a/lang/cs/Org.Apache.REEF.Client.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.Client.Tests/packages.config @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" /> <package id="NSubstitute" version="1.8.2.0" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> <package id="xunit" version="2.1.0" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs index ee2e341..fbcce51 100644 --- a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs +++ b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs @@ -47,7 +47,7 @@ namespace Org.Apache.REEF.Client.Common @" <assemblyBinding xmlns=""urn:schemas-microsoft-com:asm.v1"">" + @" <dependentAssembly>" + @" <assemblyIdentity name=""Newtonsoft.Json"" publicKeyToken=""30ad4fe6b2a6aeed"" culture=""neutral"" />" + - @" <bindingRedirect oldVersion=""0.0.0.0-7.0.0.0"" newVersion=""7.0.0.0"" />" + + @" <bindingRedirect oldVersion=""0.0.0.0-8.0.0.0"" newVersion=""8.0.0.0"" />" + @" </dependentAssembly>" + @" <probing privatePath=""local;global""/>" + @" </assemblyBinding>" + http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/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 index 41386fa..71e4625 100644 --- a/lang/cs/Org.Apache.REEF.Client/packages.config +++ b/lang/cs/Org.Apache.REEF.Client/packages.config @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> <packages> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> <package id="TransientFaultHandling.Core" version="5.1.1209.1" targetFramework="net45" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/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 240e99e..0b76c0c 100644 --- a/lang/cs/Org.Apache.REEF.Common/packages.config +++ b/lang/cs/Org.Apache.REEF.Common/packages.config @@ -19,7 +19,7 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" 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/reef/blob/a7c2c84f/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 086bedd..3114a87 100644 --- a/lang/cs/Org.Apache.REEF.Driver/packages.config +++ b/lang/cs/Org.Apache.REEF.Driver/packages.config @@ -19,7 +19,7 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/lang/cs/Org.Apache.REEF.Evaluator.Tests/app.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/app.config b/lang/cs/Org.Apache.REEF.Evaluator.Tests/app.config deleted file mode 100644 index 39d3857..0000000 --- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/app.config +++ /dev/null @@ -1,29 +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. ---> -<configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/lang/cs/Org.Apache.REEF.Examples.DriverRestart/App.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.DriverRestart/App.config b/lang/cs/Org.Apache.REEF.Examples.DriverRestart/App.config deleted file mode 100644 index 72dbca3..0000000 --- a/lang/cs/Org.Apache.REEF.Examples.DriverRestart/App.config +++ /dev/null @@ -1,32 +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. ---> -<configuration> - <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> - </startup> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.csproj b/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.csproj index a41364d..dbcb766 100644 --- a/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.csproj +++ b/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.csproj @@ -31,7 +31,9 @@ <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <None Include="App.config" /> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> <None Include="packages.config" /> <None Include="Readme.md" /> </ItemGroup> http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/lang/cs/Org.Apache.REEF.IO/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO/packages.config b/lang/cs/Org.Apache.REEF.IO/packages.config index e7e7b1b..01b468e 100644 --- a/lang/cs/Org.Apache.REEF.IO/packages.config +++ b/lang/cs/Org.Apache.REEF.IO/packages.config @@ -22,7 +22,7 @@ under the License. <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" /> <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" /> <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> <package id="System.Spatial" version="5.6.4" targetFramework="net45" /> <package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/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 240e99e..0b76c0c 100644 --- a/lang/cs/Org.Apache.REEF.Network/packages.config +++ b/lang/cs/Org.Apache.REEF.Network/packages.config @@ -19,7 +19,7 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" 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/reef/blob/a7c2c84f/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 08ffe47..0e262ae 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/packages.config @@ -19,7 +19,7 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> <package id="xunit" version="2.1.0" targetFramework="net45" /> http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/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 086bedd..3114a87 100644 --- a/lang/cs/Org.Apache.REEF.Tang/packages.config +++ b/lang/cs/Org.Apache.REEF.Tang/packages.config @@ -19,7 +19,7 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestDisposeTasks.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestDisposeTasks.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestDisposeTasks.cs index 6a5eb6a..7e8702c 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestDisposeTasks.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestDisposeTasks.cs @@ -60,7 +60,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge ValidateSuccessForLocalRuntime(1, 0, 0, testFolder); var messages = new List<string> { TaskIsDisposed }; ValidateMessageSuccessfullyLogged(messages, "Node-*", EvaluatorStdout, testFolder, 1); - CleanUp(testFolder); + ////CleanUp(testFolder); } /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/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 c8142fc..35db217 100644 --- a/lang/cs/Org.Apache.REEF.Tests/packages.config +++ b/lang/cs/Org.Apache.REEF.Tests/packages.config @@ -22,7 +22,7 @@ under the License. <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" /> <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" /> <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" 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/reef/blob/a7c2c84f/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec index ef37b96..c3d13f1 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec +++ b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec @@ -30,7 +30,7 @@ under the License. <tags>Reef/Wake/Tang common utilities</tags> <dependencies> <dependency id="Microsoft.Hadoop.Avro" version="1.5.6" /> - <dependency id="Newtonsoft.Json" version="7.0.1" /> + <dependency id="Newtonsoft.Json" version="8.0.3" /> </dependencies> </metadata> <files> http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/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 e858e14..497b801 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/packages.config +++ b/lang/cs/Org.Apache.REEF.Utilities/packages.config @@ -19,6 +19,6 @@ under the License. --> <packages> <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" /> <package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" /> </packages> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/a7c2c84f/lang/cs/build.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.props b/lang/cs/build.props index 11d367a..a89e74c 100644 --- a/lang/cs/build.props +++ b/lang/cs/build.props @@ -68,7 +68,7 @@ under the License. <!-- Package versions --> <PropertyGroup> <AvroVersion>1.5.6</AvroVersion> - <NewtonsoftJsonVersion>7.0.1</NewtonsoftJsonVersion> + <NewtonsoftJsonVersion>8.0.3</NewtonsoftJsonVersion> <ProtobufVersion>2.0.0.668</ProtobufVersion> <RxVersion>2.2.5</RxVersion> <StyleCopVersion>4.7.49.1</StyleCopVersion>
