Skip to content
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

Dependabot updates for week of 15 May 2023 #2160

Merged
merged 14 commits into from
May 15, 2023
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
4 changes: 2 additions & 2 deletions Backend/BackendFramework.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<NoWarn>NU1701</NoWarn>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.16" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.30.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.30.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.30.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.30.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="MongoDB.Driver" Version="2.19.1" />
<PackageReference Include="MailKit" Version="4.0.0" />
Expand Down
8 changes: 4 additions & 4 deletions Backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Docker multi-stage build using bitnami/dotnet-sdk:6.0.408-debian-11-r8
FROM bitnami/dotnet-sdk@sha256:e9e0647da363ab10fa575e49810840e955a6a7c01f21c4d9dcbd01403b7a20cc AS builder
# Docker multi-stage build using bitnami/dotnet-sdk:6.0.408-debian-11-r11
FROM bitnami/dotnet-sdk@sha256:63cdc71743bb0bd48f34175eea4f78f54ac66acf4ddbbef566023486f6bd8acb AS builder
WORKDIR /app

# Copy csproj and restore (fetch dependencies) as distinct layers.
Expand All @@ -10,8 +10,8 @@ RUN dotnet restore
COPY . ./
RUN dotnet publish -c Release -o build

# Build runtime image. Using bitnami/aspnet-core:6.0.16-debian-11-r6
FROM bitnami/aspnet-core@sha256:83d7e223ade1178c9bdcf1b3f2594a95a17930df361ce9d78574372c070ed95d
# Build runtime image. Using bitnami/aspnet-core:6.0.16-debian-11-r11
FROM bitnami/aspnet-core@sha256:d39190e77f114dfdb429333f0e329e6a3cc34ca3bcae45c112c33a057b92f69a

ENV ASPNETCORE_URLS=http://+:5000
ENV COMBINE_IS_IN_CONTAINER=1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# User guide build environment using Python 3.13.3-bullseye
# User guide build environment using Python 3.11.3-bullseye
FROM python@sha256:181e49146bfdc8643ebe0f66cd06f27f42df40a0921438e96770dab09797effb AS user_guide_builder

ENV PYTHONDONTWRITEBYTECODE 1
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ A rapid word collection tool. See the [User Guide](https://sillsdev.github.io/Th

### Prepare the Environment

1. Set the environment variable `COMBINE_JWT_SECRET_KEY` to a string **containing at least 16 characters**, such as
_This is a secret key_. Set it in your `.profile` (Linux or Mac 10.14-), your `.zprofile` (Mac 10.15+), or the
_System_ app (Windows).
1. Set the environment variable `COMBINE_JWT_SECRET_KEY` to a string **containing at least 32 characters**, such as
_This is a secret key that is longer_. Set it in your `.profile` (Linux or Mac 10.14-), your `.zprofile` (Mac
10.15+), or the _System_ app (Windows).
2. If you want the email services to work you will need to set the following environment variables. These values must be
kept secret, so ask your email administrator to supply them.

Expand Down
10 changes: 5 additions & 5 deletions docs/user_guide/docs/licenses/backend_licenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ license Type:Apache-2.0

####################################################################################################
Package:Microsoft.IdentityModel.Abstractions
Version:6.30.0
Version:6.30.1
project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet
Description:A package containing thin abstractions for Microsoft.IdentityModel.
licenseUrl:https://licenses.nuget.org/MIT
Expand All @@ -612,7 +612,7 @@ license Type:MIT

####################################################################################################
Package:Microsoft.IdentityModel.JsonWebTokens
Version:6.30.0
Version:6.30.1
project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet
Description:Includes types that provide support for creating, serializing and validating JSON Web Tokens.
licenseUrl:https://licenses.nuget.org/MIT
Expand All @@ -636,7 +636,7 @@ license Type:MIT

####################################################################################################
Package:Microsoft.IdentityModel.Logging
Version:6.30.0
Version:6.30.1
project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet
Description:Includes Event Source based logging support.
licenseUrl:https://licenses.nuget.org/MIT
Expand Down Expand Up @@ -668,7 +668,7 @@ license Type:MIT

####################################################################################################
Package:Microsoft.IdentityModel.Tokens
Version:6.30.0
Version:6.30.1
project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet
Description:Includes types that provide support for SecurityTokens, Cryptographic operations: Signing, Verifying Signatures, Encryption.
licenseUrl:https://licenses.nuget.org/MIT
Expand Down Expand Up @@ -1730,7 +1730,7 @@ license Type:MIT

####################################################################################################
Package:System.IdentityModel.Tokens.Jwt
Version:6.30.0
Version:6.30.1
project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet
Description:Includes types that provide support for creating, serializing and validating JSON Web Tokens.
licenseUrl:https://licenses.nuget.org/MIT
Expand Down
6 changes: 3 additions & 3 deletions docs/user_guide/docs/licenses/frontend_licenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


@material-table/core 6.1.13
@material-table/core 6.1.15
MIT
MIT License

Expand All @@ -728,7 +728,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@matt-block/react-recaptcha-v2 2.0.0
@matt-block/react-recaptcha-v2 2.0.1
MIT
MIT License

Expand Down Expand Up @@ -40685,7 +40685,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


chart.js 4.2.1
chart.js 4.3.0
MIT
The MIT License (MIT)

Expand Down
58 changes: 29 additions & 29 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
"@loadable/component": "^5.15.0",
"@material-table/core": "^6.1.13",
"@matt-block/react-recaptcha-v2": "^2.0.0",
"@material-table/core": "^6.1.15",
"@matt-block/react-recaptcha-v2": "^2.0.1",
"@microsoft/signalr": "^6.0.7",
"@mui/icons-material": "^5.11.16",
"@mui/material": "^5.12.3",
Expand All @@ -48,7 +48,7 @@
"@reduxjs/toolkit": "^1.9.3",
"@segment/analytics-next": "^1.51.6",
"axios": "^0.27.2",
"chart.js": "^4.2.1",
"chart.js": "^4.3.0",
"crypto-js": "^4.1.1",
"dayjs": "^1.11.7",
"distinct-colors": "^3.0.0",
Expand Down Expand Up @@ -97,7 +97,7 @@
"@types/redux-mock-store": "^1.0.3",
"@types/segment-analytics": "^0.0.34",
"@types/uuid": "^9.0.1",
"@types/validator": "^13.7.16",
"@types/validator": "^13.7.17",
"@typescript-eslint/eslint-plugin": "^5.55.0",
"@typescript-eslint/parser": "^5.3.1",
"eslint": "^8.40.0",
Expand Down