diff --git a/Directory.Packages.props b/Directory.Packages.props index 146466c3d82..9ef05d3a892 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -184,10 +184,12 @@ - + + + diff --git a/global.json b/global.json index 0527dc9d64d..c45b51bd7d9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.201", + "version": "10.0.300", "rollForward": "major", "allowPrerelease": true, "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The .NET SDK could not be found. Run ./restore.sh (Linux/macOS) or ./restore.cmd (Windows) to install the local SDK." }, "tools": { - "dotnet": "10.0.201", + "dotnet": "10.0.300", "runtimes": { "dotnet/x64": [ "$(DotNetRuntimePreviousVersionForTesting)", diff --git a/playground/AspireWithJavaScript/AspireJavaScript.MinimalApi/AspireJavaScript.MinimalApi.csproj b/playground/AspireWithJavaScript/AspireJavaScript.MinimalApi/AspireJavaScript.MinimalApi.csproj index 47b19cfaecf..6a2ddd703ff 100644 --- a/playground/AspireWithJavaScript/AspireJavaScript.MinimalApi/AspireJavaScript.MinimalApi.csproj +++ b/playground/AspireWithJavaScript/AspireJavaScript.MinimalApi/AspireJavaScript.MinimalApi.csproj @@ -9,7 +9,6 @@ - diff --git a/playground/PostgresEndToEnd/PostgresEndToEnd.JavaService/pom.xml b/playground/PostgresEndToEnd/PostgresEndToEnd.JavaService/pom.xml index dc5b406197d..17657d085fb 100644 --- a/playground/PostgresEndToEnd/PostgresEndToEnd.JavaService/pom.xml +++ b/playground/PostgresEndToEnd/PostgresEndToEnd.JavaService/pom.xml @@ -13,59 +13,38 @@ 17 17 UTF-8 + 4.1.133.Final + 1.2.17 - - - central - https://repo.maven.apache.org/maven2 - - - - - - central - https://repo.maven.apache.org/maven2 - - - - - org.postgresql - postgresql - 42.7.11 - io.netty - netty-codec-http2 - 4.1.133.Final + netty-bom + ${netty.version} + pom + import - com.nimbusds - nimbus-jose-jwt - 9.48 + org.postgresql + postgresql + 42.7.11 io.projectreactor.netty reactor-netty-core - 1.0.48 + ${reactor-netty.version} io.projectreactor.netty reactor-netty-http - 1.0.48 - - - io.netty - netty-handler - 4.1.133.Final + ${reactor-netty.version}