You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by mo...@apache.org on 2017/09/13 01:32:20 UTC
reef git commit: [REEF-1567] Update Json version to 10.0.3
Repository: reef
Updated Branches:
refs/heads/master 07f8e023e -> 21029140a
[REEF-1567] Update Json version to 10.0.3
JIRA: [REEF-1567](https://issues.apache.org/jira/browse/REEF-1567)
Closes #1377
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/21029140
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/21029140
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/21029140
Branch: refs/heads/master
Commit: 21029140a4e20d16115f74b83aee77d2a7408737
Parents: 07f8e02
Author: Julia Wang <jw...@yahoo.com>
Authored: Tue Sep 12 16:14:11 2017 -0700
Committer: Sergiy Matusevych <mo...@apache.com>
Committed: Tue Sep 12 18:31:40 2017 -0700
----------------------------------------------------------------------
lang/cs/App.config | 2 +-
lang/cs/Org.Apache.REEF.Bridge.CLR/packages.config | 2 +-
lang/cs/Org.Apache.REEF.Client.Tests/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 +-
lang/cs/Org.Apache.REEF.Examples/packages.config | 2 +-
lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.nuspec | 2 +-
lang/cs/Org.Apache.REEF.IO/packages.config | 2 +-
lang/cs/Org.Apache.REEF.Network/packages.config | 2 +-
lang/cs/Org.Apache.REEF.Tang.Tests/packages.config | 2 +-
lang/cs/Org.Apache.REEF.Tang/packages.config | 4 ++--
lang/cs/Org.Apache.REEF.Tests/packages.config | 2 +-
.../Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.nuspec | 2 +-
lang/cs/Org.Apache.REEF.Utilities/packages.config | 2 +-
lang/cs/build.DotNet.props | 2 +-
lang/cs/build.props | 2 +-
18 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/lang/cs/App.config
----------------------------------------------------------------------
diff --git a/lang/cs/App.config b/lang/cs/App.config
index 9b468a7..8054969 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-8.0.0.0" newVersion="8.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/lang/cs/Org.Apache.REEF.Bridge.CLR/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge.CLR/packages.config b/lang/cs/Org.Apache.REEF.Bridge.CLR/packages.config
index 9f55ae4..9846a87 100644
--- a/lang/cs/Org.Apache.REEF.Bridge.CLR/packages.config
+++ b/lang/cs/Org.Apache.REEF.Bridge.CLR/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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
</packages>
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/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 ba46c63..123da0d 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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<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/21029140/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 f2b4fd5..7401235 100644
--- a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs
+++ b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs
@@ -42,7 +42,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-8.0.0.0"" newVersion=""8.0.0.0"" />" +
+ @" <bindingRedirect oldVersion=""0.0.0.0-10.0.0.0"" newVersion=""10.0.0.0"" />" +
@" </dependentAssembly>" +
@" <probing privatePath=""local;global""/>" +
@" </assemblyBinding>" +
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/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 71e4625..b15b7fd 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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<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/21029140/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 7db384f..a69e8bd 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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/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 101d669..57e83c0 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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
</packages>
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/lang/cs/Org.Apache.REEF.Examples/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/packages.config b/lang/cs/Org.Apache.REEF.Examples/packages.config
index e8e2a6d..4c586dd 100644
--- a/lang/cs/Org.Apache.REEF.Examples/packages.config
+++ b/lang/cs/Org.Apache.REEF.Examples/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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<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/21029140/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.nuspec
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.nuspec b/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.nuspec
index 5720112..9e7c092 100644
--- a/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.nuspec
+++ b/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.nuspec
@@ -30,7 +30,7 @@ under the License.
<tags>Single package which contains all Reef/Wake/Tang projects </tags>
<dependencies>
<dependency id="Microsoft.Hadoop.Avro" version="1.5.6" />
- <dependency id="Newtonsoft.Json" version="8.0.3" />
+ <dependency id="Newtonsoft.Json" version="10.0.3" />
<dependency id="protobuf-net" version="2.1.0" />
<dependency id="Rx-Core" version="2.2.5" />
</dependencies>
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/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 01b468e..e6783e0 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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<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/21029140/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 101b301..6b92382 100644
--- a/lang/cs/Org.Apache.REEF.Network/packages.config
+++ b/lang/cs/Org.Apache.REEF.Network/packages.config
@@ -26,7 +26,7 @@ under the License.
<package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net451" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net451" />
- <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
<package id="System.Collections" version="4.3.0" targetFramework="net451" />
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/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 0d72235..4b168fb 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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<package id="protobuf-net" version="2.1.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/21029140/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 101d669..6720116 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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
-</packages>
+</packages>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/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 ec9b572..9a239bc 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="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<package id="protobuf-net" version="2.1.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/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 bb5e380..4f74901 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="8.0.3" />
+ <dependency id="Newtonsoft.Json" version="10.0.3" />
</dependencies>
</metadata>
<files>
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/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 2b61ca3..e725c50 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="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<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/21029140/lang/cs/build.DotNet.props
----------------------------------------------------------------------
diff --git a/lang/cs/build.DotNet.props b/lang/cs/build.DotNet.props
index e9625b5..6b1d9e4 100644
--- a/lang/cs/build.DotNet.props
+++ b/lang/cs/build.DotNet.props
@@ -38,7 +38,7 @@ under the License.
<DefineConstants>DOTNET_BUILD</DefineConstants>
<OutputPath>..\bin\$(AssemblyName)</OutputPath>
<AvroVersion>0.1.0</AvroVersion>
- <NewtonsoftJsonVersion>10.0.1</NewtonsoftJsonVersion>
+ <NewtonsoftJsonVersion>10.0.3</NewtonsoftJsonVersion>
<NSubstituteVersion>1.8.2.0</NSubstituteVersion>
<ProtobufVersion>2.1.0</ProtobufVersion>
<SystemReactiveVersion>3.1.1</SystemReactiveVersion>
http://git-wip-us.apache.org/repos/asf/reef/blob/21029140/lang/cs/build.props
----------------------------------------------------------------------
diff --git a/lang/cs/build.props b/lang/cs/build.props
index 281b41f..f2f6020 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>8.0.3</NewtonsoftJsonVersion>
+ <NewtonsoftJsonVersion>10.0.3</NewtonsoftJsonVersion>
<ProtobufVersion>2.1.0</ProtobufVersion>
<SystemReactiveVersion>3.1.1</SystemReactiveVersion>
<StyleCopVersion>4.7.49.1</StyleCopVersion>