Skip to content

Bump newtonsoft dependency to 13.0.1 to respond to vulnerability #6473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/DockerFile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DOTNET_VERSION=5.0.103
ARG DOTNET_VERSION=5.0.408
FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build

ARG USER_ID
Expand Down
2 changes: 1 addition & 1 deletion .ci/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ OUTPUT_DIR="$repo/${output_folder}"
REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
mkdir -p "$OUTPUT_DIR"

DOTNET_VERSION=${DOTNET_VERSION-5.0.103}
DOTNET_VERSION=${DOTNET_VERSION-5.0.408}

echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"
Expand Down
2 changes: 1 addition & 1 deletion .ci/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $ STACK_VERSION=7.x-SNAPSHOT ELASTICSEARCH_VERSION=7.x-SNAPSHOT ./.ci/run-tests
|-------------------------|-------------|-------------|
| `STACK_VERSION` | `N/A` | The elasticsearch version to target
| `TEST_SUITE` | `basic` | `free` or `platinum` sets which test suite to run and which container to run against. |
| `DOTNET_VERSION` | `5.0.103` | The .NET sdk version used to grab the proper container |
| `DOTNET_VERSION` | `5.0.408` | The .NET sdk version used to grab the proper container |


If you want to manually spin up elasticsearch for these tests and call the runner afterwards you can use
Expand Down
2 changes: 1 addition & 1 deletion .ci/run-repository.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ param(
$NODE_NAME,

[string]
$DOTNET_VERSION = "5.0.103"
$DOTNET_VERSION = "5.0.408"
)

$ESC = [char]27
Expand Down
2 changes: 1 addition & 1 deletion .ci/run-repository.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
source $script_path/functions/imports.sh
set -euo pipefail

DOTNET_VERSION=${DOTNET_VERSION-5.0.103}
DOTNET_VERSION=${DOTNET_VERSION-5.0.408}
ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
elasticsearch_container=${elasticsearch_container-}

Expand Down
2 changes: 1 addition & 1 deletion .ci/run-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ param (
$TEST_SUITE = "free",

[string]
$DOTNET_VERSION = "5.0.103"
$DOTNET_VERSION = "5.0.408"
)

$ESC = [char]27
Expand Down
2 changes: 1 addition & 1 deletion .ci/test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ TEST_SUITE:
- platinum

DOTNET_VERSION:
- 5.0.103
- 5.0.408

exclude: ~
2 changes: 1 addition & 1 deletion .github/workflows/integration-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: actions/checkout@v2
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
dotnet-version: '5.0.408'
- uses: actions/cache@v2
with:
path: ~/.nuget/packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# Add version and backport labels automatically
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
dotnet-version: '5.0.408'
- name: Install dotnet-script
run: dotnet tool install release-notes --tool-path dotnet-tool

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make-release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
dotnet-version: '5.0.408'
- name: Install dotnet-script
run: dotnet tool install release-notes --tool-path dotnet-tool

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/checkout@v2
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
dotnet-version: '5.0.408'
- uses: actions/cache@v2
with:
path: ~/.nuget/packages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/checkout@v2
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
dotnet-version: '5.0.408'
- uses: actions/cache@v2
with:
path: ~/.nuget/packages
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/checkout@v2
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
dotnet-version: '5.0.408'
- uses: actions/cache@v2
with:
path: ~/.nuget/packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unified-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v2
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
dotnet-version: '5.0.408'

- run: "./.ci/make.sh assemble ${{ matrix.stack_version }}"
name: Assemble ${{ matrix.stack_version }}
6 changes: 3 additions & 3 deletions build/scripts/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[12.0.1, )",
"resolved": "12.0.1",
"contentHash": "pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg=="
"requested": "[13.0.1, )",
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"Octokit": {
"type": "Direct",
Expand Down
8 changes: 2 additions & 6 deletions build/scripts/scripts.fsproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -35,18 +35,14 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.Core" Version="5.0.0" />

<PackageReference Include="Bullseye" Version="3.3.0" />
<PackageReference Include="Elastic.Elasticsearch.Managed" Version="0.2.6" />

<PackageReference Include="Fake.Core.Environment" Version="5.15.0" />
<PackageReference Include="Fake.Core.SemVer" Version="5.15.0" />
<PackageReference Include="Fake.IO.FileSystem" Version="5.15.0" />
<PackageReference Include="Fake.IO.Zip" Version="5.15.0" />
<PackageReference Include="Fake.Tools.Git" Version="5.15.0" />

<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />

<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Octokit" Version="0.32.0" />
<PackageReference Include="Proc" Version="0.6.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "5.0.100",
"version": "5.0.408",
"rollForward": "latestFeature",
"allowPrerelease": false
},
Expand Down
4 changes: 2 additions & 2 deletions src/ApiGenerator/ApiGenerator.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -15,7 +15,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.1.0-beta3-final" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="ShellProgressBar" Version="5.0.0" />
<PackageReference Include="CsQuery.Core" Version="2.0.1" />
<!-- https://github.com/toddams/RazorLight/issues/172 -->
Expand Down
6 changes: 3 additions & 3 deletions src/ApiGenerator/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[12.0.1, )",
"resolved": "12.0.1",
"contentHash": "pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg=="
"requested": "[13.0.1, )",
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"RazorLight.Unofficial": {
"type": "Direct",
Expand Down
4 changes: 2 additions & 2 deletions src/DocGenerator/DocGenerator.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -19,7 +19,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="2.9.0" />
<PackageReference Include="Microsoft.Composition" Version="1.0.31" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NuDoq" Version="1.2.5" />
<PackageReference Include="BuildAlyzer" Version="2.4.0" />
<PackageReference Include="BuildAlyzer.Workspaces" Version="2.4.0" />
Expand Down
6 changes: 3 additions & 3 deletions src/DocGenerator/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[12.0.1, )",
"resolved": "12.0.1",
"contentHash": "pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg=="
"requested": "[13.0.1, )",
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"NuDoq": {
"type": "Direct",
Expand Down
4 changes: 2 additions & 2 deletions src/Nest.JsonNetSerializer/Nest.JsonNetSerializer.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<PackageId>NEST.JsonNetSerializer</PackageId>
Expand All @@ -16,6 +16,6 @@
<ProjectReference Include="$(SolutionRoot)\src\Nest\Nest.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions src/Nest.JsonNetSerializer/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[12.0.1, )",
"resolved": "12.0.1",
"contentHash": "pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg=="
"requested": "[13.0.1, )",
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"Microsoft.Build.Tasks.Git": {
"type": "Transitive",
Expand Down Expand Up @@ -137,9 +137,9 @@
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[12.0.1, )",
"resolved": "12.0.1",
"contentHash": "pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg=="
"requested": "[13.0.1, )",
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"Microsoft.Build.Tasks.Git": {
"type": "Transitive",
Expand Down
8 changes: 4 additions & 4 deletions tests/Tests.Benchmarking/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@
},
"Newtonsoft.Json": {
"type": "Transitive",
"resolved": "12.0.1",
"contentHash": "pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg=="
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"NuGet.Frameworks": {
"type": "Transitive",
Expand Down Expand Up @@ -1401,7 +1401,7 @@
"type": "Project",
"dependencies": {
"NEST": "7.0.0",
"Newtonsoft.Json": "12.0.1"
"Newtonsoft.Json": "13.0.1"
}
},
"tests.configuration": {
Expand Down Expand Up @@ -1431,7 +1431,7 @@
"Bogus": "22.1.2",
"Elastic.Elasticsearch.Managed": "0.2.6",
"NEST": "7.0.0",
"Newtonsoft.Json": "12.0.1",
"Newtonsoft.Json": "13.0.1",
"Tests.Configuration": "7.0.0"
}
}
Expand Down
8 changes: 4 additions & 4 deletions tests/Tests.ClusterLauncher/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@
},
"Newtonsoft.Json": {
"type": "Transitive",
"resolved": "12.0.1",
"contentHash": "pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg=="
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"NuGet.Frameworks": {
"type": "Transitive",
Expand Down Expand Up @@ -875,7 +875,7 @@
"type": "Project",
"dependencies": {
"NEST": "7.0.0",
"Newtonsoft.Json": "12.0.1"
"Newtonsoft.Json": "13.0.1"
}
},
"tests.configuration": {
Expand Down Expand Up @@ -905,7 +905,7 @@
"Bogus": "22.1.2",
"Elastic.Elasticsearch.Managed": "0.2.6",
"NEST": "7.0.0",
"Newtonsoft.Json": "12.0.1",
"Newtonsoft.Json": "13.0.1",
"Tests.Configuration": "7.0.0"
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Tests.Configuration/tests.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ force_reseed: true
# this is opt in during development in CI we never want to see our tests running against an already running node
test_against_already_running_elasticsearch: true

#random_source_serializer: true
random_source_serializer: true
#random_old_connection: true
#random_http_compresssion: true
random_api_versioning: true
#random_api_versioning: true
#seed: 74337

# Can be helpful to speed up tests runs as setting this to true only randomly tests a single overload of the api rather than all 4.
Expand Down
8 changes: 4 additions & 4 deletions tests/Tests.Core/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@
},
"Newtonsoft.Json": {
"type": "Transitive",
"resolved": "12.0.1",
"contentHash": "pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg=="
"resolved": "13.0.1",
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
"type": "Transitive",
Expand Down Expand Up @@ -1322,7 +1322,7 @@
"type": "Project",
"dependencies": {
"NEST": "7.0.0",
"Newtonsoft.Json": "12.0.1"
"Newtonsoft.Json": "13.0.1"
}
},
"tests.configuration": {
Expand All @@ -1337,7 +1337,7 @@
"Bogus": "22.1.2",
"Elastic.Elasticsearch.Managed": "0.2.6",
"NEST": "7.0.0",
"Newtonsoft.Json": "12.0.1",
"Newtonsoft.Json": "13.0.1",
"Tests.Configuration": "7.0.0"
}
}
Expand Down
5 changes: 2 additions & 3 deletions tests/Tests.Domain/Tests.Domain.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup Condition="'$(TestPackageVersion)'!=''">
<PackageReference Include="NEST" Version="$(TestPackageVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TestPackageVersion)'==''">
<ProjectReference Include="$(SolutionRoot)\src\Nest\Nest.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Bogus" Version="22.1.2" />
<PackageReference Include="Elastic.Elasticsearch.Managed" Version="0.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<ProjectReference Include="$(SolutionRoot)\tests\Tests.Configuration\Tests.Configuration.csproj" />
</ItemGroup>
</Project>
Loading