Skip to content

Commit

Permalink
External dependencies upgrade - Spring Boot 3.2.0 and Spring Cloud 20…
Browse files Browse the repository at this point in the history
…23.0.0 (#38011)

* Upgrade external dependencies to align with Spring Boot 3.2.0

* remove winutils download steps (#38030)

Co-authored-by: annie-mac <[email protected]>
(cherry picked from commit 097c182)

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Annie Liang <[email protected]>
  • Loading branch information
3 people authored Dec 14, 2023
1 parent 90800c3 commit b796ac8
Show file tree
Hide file tree
Showing 405 changed files with 3,386 additions and 3,190 deletions.
12 changes: 12 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,7 @@
"filename": "sdk/spring/scripts/**",
"words": [
"agroal",
"alluxio",
"antlr",
"arquillian",
"aspectj",
Expand All @@ -888,19 +889,23 @@
"assertj",
"astbuilder",
"asyncer",
"athenz",
"atomikos",
"awaitility",
"awspring",
"bcfips",
"Borca",
"brotli",
"bson",
"cbor",
"cockroachdb",
"codehaus",
"collectd",
"crac",
"cratedb",
"datastax",
"dbcp",
"debezium",
"deser",
"dynalite",
"dynatrace",
Expand All @@ -917,6 +922,7 @@
"Hikari",
"hikaricp",
"hivemq",
"hocon",
"hppc",
"hsqldb",
"humio",
Expand Down Expand Up @@ -946,6 +952,7 @@
"johnzon",
"jooq",
"jpamodelgen",
"jspc",
"jstl",
"jtds",
"jvnet",
Expand All @@ -956,10 +963,13 @@
"kotlinx",
"kqueue",
"kryo",
"kustomize",
"ldif",
"leveldb",
"liquibase",
"minio",
"mockmvc",
"moshi",
"moxy",
"mqtt",
"mrbean",
Expand All @@ -971,6 +981,8 @@
"ocsp",
"ojdbc",
"okcurl",
"okio",
"openmldb",
"opentsdb",
"orai",
"orientdb",
Expand Down
4 changes: 2 additions & 2 deletions common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
Expand All @@ -51,7 +51,7 @@
<!-- Special allowance for performance libraries as they aren't shipped. -->
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->

<include>io.projectreactor:reactor-core:[3.5.11]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.6.0]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
8 changes: 4 additions & 4 deletions eng/code-quality-reports/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,21 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<version>5.10.0</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
<version>5.10.0</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<version>5.10.0</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -119,7 +119,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
</plugin>
</plugins>
</build>
Expand Down
21 changes: 0 additions & 21 deletions eng/pipelines/templates/stages/cosmos-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,27 +122,6 @@ stages:
cp $env:temp\CosmosDbEmulatorCert.cer .
keytool -keystore cacerts -importcert -noprompt -trustcacerts -alias CosmosDbEmulatorCert -file CosmosDbEmulatorCert.cer -storepass changeit
displayName: 'Create Java TrustStore'
- powershell: |
$downloadTarget = Join-Path -Path $env:temp -ChildPath "hadoopsource.zip"
$targetDir = "D:\Hadoop"
Write-Host "Downloading and extracting Hadoop winutils - https://aka.ms/cosmos-hadoop-for-spark-ci-pipeline2"
Write-Host "Target: $targetDir"
Invoke-WebRequest "https://aka.ms/cosmos-hadoop-for-spark-ci-pipeline2" -OutFile $downloadTarget
if (Test-Path $targetDir) { Remove-Item -Recurse -Force $targetDir }
Expand-Archive -LiteralPath $downloadTarget -DestinationPath $targetDir
Write-Host "Copying binaries to windows sytem32 folder"
Copy-Item -Path "D:\Hadoop\bin\*" -Destination "C:\Windows\System32" -Recurse
Write-Host "Updating environment variables for Hadoop usage"
[System.Environment]::SetEnvironmentVariable("HADOOP_HOME", "D:\Hadoop", [System.EnvironmentVariableTarget]::Machine)
$hadoopHome = [System.Environment]::GetEnvironmentVariable("HADOOP_HOME", [System.EnvironmentVariableTarget]::Machine)
Write-Host "New HADOOP_HOME environment variable: $hadoopHome"
$path = [System.Environment]::GetEnvironmentVariable("Path", [System.EnvironmentVariableTarget]::Machine)
Write-Host "Original Path environment variable: $path"
$newPath = $path + ";D:\Hadoop\bin"
[System.Environment]::SetEnvironmentVariable("Path", $newPath,[System.EnvironmentVariableTarget]::Machine)
$updatedPath = [System.Environment]::GetEnvironmentVariable("Path", [System.EnvironmentVariableTarget]::Machine)
Write-Host "New Path environment variable: $updatedPath"
displayName: 'Download and Extract Hadoop winutils and update env variables for Hadoop usage'
# The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
- ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
Expand Down
4 changes: 2 additions & 2 deletions eng/spotbugs-aggregate-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version> <!-- {x-version-update;org.codehaus.mojo:build-helper-maven-plugin;external_dependency} -->
<version>3.4.0</version> <!-- {x-version-update;org.codehaus.mojo:build-helper-maven-plugin;external_dependency} -->
<executions>
<execution>
<id>add-data-source</id>
Expand Down Expand Up @@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.6.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<configuration>
<!-- Added to override the -snippetpath arg which is not applicable here-->
<additionalOptions>-maxLineLength 120</additionalOptions>
Expand Down
Loading

0 comments on commit b796ac8

Please sign in to comment.