Skip to content
Draft
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
6 changes: 3 additions & 3 deletions common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.6.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<version>3.6.3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
<includes combine.children="append">
<!-- Special allowance for performance libraries as they aren't shipped. -->
<include>com.beust:jcommander:[1.82]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
<include>io.vertx:vertx-codegen:[4.5.30]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
<include>io.vertx:vertx-codegen:[4.5.32]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.7.19]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-codegen</artifactId>
<version>4.5.30</version> <!-- {x-version-update;io.vertx:vertx-codegen;external_dependency} -->
<version>4.5.32</version> <!-- {x-version-update;io.vertx:vertx-codegen;external_dependency} -->
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
49 changes: 49 additions & 0 deletions eng/pipelines/scripts/Invoke-FederatedAuthTests.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<#
.SYNOPSIS
Tests the Maven project using Federated auth.

.PARAMETER PomFile
The POM file used to run tests.

.PARAMETER TestGoals
The test goals to be used when running tests.

.PARAMETER ParallelTestPlayback
The parallel test playback option to be used when running tests.

.PARAMETER TestOptions
The test options to be used when running tests.

.PARAMETER TestParallelization
The test parallelization option to be used when running tests.

.PARAMETER BuildOptions
The build options to be used when running tests.
#>

param(
[Parameter(Mandatory = $true)]
[string]$PomFile,

[Parameter(Mandatory = $true)]
[string]$TestGoals,

[Parameter(Mandatory = $true)]
[string]$ParallelTestPlayback,

[Parameter(Mandatory = $true)]
[string]$TestOptions,

[Parameter(Mandatory = $true)]
[string]$TestParallelization,

[Parameter(Mandatory = $false)]
[string]$BuildOptions
)

$account = (Get-AzContext).Account
$env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id
$env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants

mvn --% -f $PomFile $env:DefaultTestOptions $TestGoals -DAZURE_TEST_DEBUG=$env:IsDebug -Dparallel-test-playback=$ParallelTestPlayback $TestOptions $env:LiveTestSourceParams $BuildOptions -T $TestParallelization
exit $LASTEXITCODE
13 changes: 13 additions & 0 deletions eng/pipelines/scripts/Publish-FaultInjectorLogs.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<#
.SYNOPSIS
Publishes any logs captured by http-fault-injector for further investigation.
#>
param()

if (Test-Path -Path "$env:BUILD_SOURCEDIRECTORY/http-fault-injector.log") {
if (-not (Test-Path "$env:SYSTEM_DEFAULTWORKINGDIRECTORY/troubleshooting")) {
New-Item -ItemType Directory -Path "$env:SYSTEM_DEFAULTWORKINGDIRECTORY/troubleshooting" | Out-Null
}
Compress-Archive -Path "$env:BUILD_SOURCEDIRECTORY/http-fault-injector.log" -DestinationPath "$env:SYSTEM_DEFAULTWORKINGDIRECTORY/troubleshooting/fault-$env:SYSTEM_JOBNAME.zip"
Write-Host "##vso[task.setvariable variable=HAS_TROUBLESHOOTING]true"
}
8 changes: 8 additions & 0 deletions eng/pipelines/scripts/Set-PowerShellJavaHome.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Remove preceding "1." in the version specified by $(JavaTestVersion)
# e.g. 1.8 -> 8
# This is required to set JAVA_HOME correctly for the Java version
# Java versions are expected to always start with "1."
$javaTestVersion = "$env:JavaTestVersion".Substring(2)
$javaHomeValue = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_$javaTestVersion`_X64")
Write-Host "Setting PowerShellJavaHome to '$javaHomeValue'"
Write-Host "##vso[task.setvariable variable=PowerShellJavaHome;]$javaHomeValue"
11 changes: 11 additions & 0 deletions eng/pipelines/scripts/Update-TestNamesForReporting.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Write-Output "Current directory: $(get-location)"
Get-ChildItem "TEST-*.xml" -Recurse | ForEach-Object {
Write-Output "Updating $($_.Name)"
[xml]$xml = Get-Content $_.FullName
$xml.SelectNodes("//testcase") | ForEach-Object {
$parts = $_.classname -split '\.'
$shortClassname = (($parts[0..($parts.Length - 2)] | ForEach-Object { $_[0] }) -join ".") + ".$($parts[-1])"
$_.name = "$shortClassname.$($_.name)"
}
$xml.Save($_.FullName)
}
2 changes: 1 addition & 1 deletion eng/pipelines/templates/jobs/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ jobs:
# Use a PR job batch size of 50 as the design of Java's CI doesn't increase CI times linear for each library
# added. So, using a smaller batch size means more CI jobs that are slightly faster than fewer larger jobs.
# Overall, using a large batch size reduces overall CI time.
PRJobBatchSize: 50
PRJobBatchSize: 5
# This key will use the PackageInfo.Name to populate the ArtifactPackageNames
PRMatrixKey: 'Name'
SparseCheckoutPaths:
Expand Down
64 changes: 26 additions & 38 deletions eng/pipelines/templates/steps/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,11 @@ steps:
- ${{ parameters.PreTestRunSteps }}

- ${{ if eq('true', parameters.UseFederatedAuth) }}:
# Remove preceeding "1." in the version specified by $(JavaTestVersion)
# e.g. 1.8 -> 8
# This is required to set JAVA_HOME correctly for the Java version
# Java versions are expected to always start with "1."
- pwsh: |
$javaTestVersion = "$(JavaTestVersion)".Substring(2)
$javaHomeValue = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_$javaTestVersion`_X64")
Write-Host "Setting PowerShellJavaHome to '$javaHomeValue'"
Write-Host "##vso[task.setvariable variable=PowerShellJavaHome;]$javaHomeValue"
- task: PowerShell@2
displayName: 'Set PowerShellJavaHome'
inputs:
pwsh: true
filePath: eng/pipelines/scripts/Set-PowerShellJavaHome.ps1

- task: AzurePowerShell@5
condition: and(succeeded(), ne(variables['TestFromSource'], 'true'))
Expand All @@ -110,14 +105,14 @@ steps:
azureSubscription: ${{ parameters.ServiceConnection }}
azurePowerShellVersion: LatestVersion
pwsh: true
ScriptType: InlineScript
Inline: |
$account = (Get-AzContext).Account
$env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id
$env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants

mvn --% -f $(Build.SourcesDirectory)/pom.xml $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }} ${{ parameters.TestGoals }}
exit $LASTEXITCODE
ScriptType: FilePath
ScriptPath: eng/pipelines/scripts/Invoke-FederatedAuthTests.ps1
ScriptArguments: >
-PomFile $(Build.SourcesDirectory)/pom.xml
-TestGoals ${{ parameters.TestGoals }}
-ParallelTestPlayback ${{ parameters.ParallelTestPlayback }}
-TestOptions ${{ parameters.TestOptions }}
-TestParallelization ${{ parameters.TestParallelization }}
env:
JAVA_HOME: $(PowerShellJavaHome)
MAVEN_OPTS: '$(MemoryOptions) $(LoggingOptions)'
Expand Down Expand Up @@ -200,14 +195,15 @@ steps:
azureSubscription: ${{ parameters.ServiceConnection }}
azurePowerShellVersion: LatestVersion
pwsh: true
ScriptType: InlineScript
Inline: |
$account = (Get-AzContext).Account
$env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id
$env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants

mvn --% -f $(Build.SourcesDirectory)/ClientFromSourcePom.xml ${{ parameters.TestGoals }} $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} $(LiveTestSourceParams) ${{ parameters.BuildOptions }} -T ${{ parameters.TestParallelization }}
exit $LASTEXITCODE
ScriptType: FilePath
ScriptPath: eng/pipelines/scripts/Invoke-FederatedAuthTests.ps1
ScriptArguments: >
-PomFile $(Build.SourcesDirectory)/ClientFromSourcePom.xml
-TestGoals ${{ parameters.TestGoals }}
-ParallelTestPlayback ${{ parameters.ParallelTestPlayback }}
-TestOptions ${{ parameters.TestOptions }}
-TestParallelization ${{ parameters.TestParallelization }}
-BuildOptions ${{ parameters.BuildOptions }}
env:
# PowerShellJavaHome is set in the 'Set PowerShellJavaHome'
# task above
Expand Down Expand Up @@ -254,21 +250,13 @@ steps:

# The name of a test case in the results file isn't helpful in the web view.
# Update it to include the breadcrumb namespace and the type.
- pwsh: |
echo "Current directory: $(get-location)"
Get-ChildItem "TEST-*.xml" -Recurse | ForEach-Object {
echo "Updating $($_.Name)"
[xml]$xml = Get-Content $_.FullName
$xml.SelectNodes("//testcase") | ForEach-Object {
$parts = $_.classname -split '\.'
$shortClassname = (($parts[0..($parts.Length -2)] | ForEach-Object { $_[0] }) -join ".") + ".$($parts[-1])"
$_.name = "$shortClassname.$($_.name)"
}
$xml.Save($_.FullName)
}
- task: PowerShell@2
displayName: 'Update test case names for reporting'
inputs:
pwsh: true
filePath: eng/pipelines/scripts/Update-TestNamesForReporting.ps1
workingDirectory: $(System.DefaultWorkingDirectory)/sdk
condition: always()
workingDirectory: $(System.DefaultWorkingDirectory)/sdk

- task: PublishTestResults@2
condition: always()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
steps:
- pwsh: |
if (Test-Path -Path "$(Build.SourcesDirectory)/http-fault-injector.log") {
if (-not (Test-Path "$(System.DefaultWorkingDirectory)/troubleshooting")) {
New-Item -ItemType Directory -Path "$(System.DefaultWorkingDirectory)/troubleshooting" | Out-Null
}
Compress-Archive -Path "$(Build.SourcesDirectory)/http-fault-injector.log" -DestinationPath "$(System.DefaultWorkingDirectory)/troubleshooting/fault-$(System.JobName).zip"
Write-Host "##vso[task.setvariable variable=HAS_TROUBLESHOOTING]true"
}
- task: PowerShell@2
displayName: 'Check for and copy http-fault-injector log file'
inputs:
pwsh: true
filePath: $(Build.SourcesDirectory)/eng/pipelines/scripts/Publish-FaultInjectorLogs.ps1
condition: failed()
80 changes: 40 additions & 40 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,24 @@ commons-net:commons-net;3.9.0
io.cloudevents:cloudevents-api;2.2.0
io.cloudevents:cloudevents-core;2.2.0
io.fabric8:kubernetes-client;6.12.1
io.netty:netty-buffer;4.1.136.Final
io.netty:netty-common;4.1.136.Final
io.netty:netty-codec;4.1.136.Final
io.netty:netty-codec-http;4.1.136.Final
io.netty:netty-codec-http2;4.1.136.Final
io.netty:netty-handler;4.1.136.Final
io.netty:netty-handler-proxy;4.1.136.Final
io.netty:netty-resolver;4.1.136.Final
io.netty:netty-resolver-dns;4.1.136.Final
io.netty:netty-tcnative-boringssl-static;2.0.80.Final
io.netty:netty-transport;4.1.136.Final
io.netty:netty-transport-native-epoll;4.1.136.Final
io.netty:netty-transport-native-unix-common;4.1.136.Final
io.netty:netty-transport-native-kqueue;4.1.136.Final
io.netty:netty-buffer;4.1.137.Final
io.netty:netty-common;4.1.137.Final
io.netty:netty-codec;4.1.137.Final
io.netty:netty-codec-http;4.1.137.Final
io.netty:netty-codec-http2;4.1.137.Final
io.netty:netty-handler;4.1.137.Final
io.netty:netty-handler-proxy;4.1.137.Final
io.netty:netty-resolver;4.1.137.Final
io.netty:netty-resolver-dns;4.1.137.Final
io.netty:netty-tcnative-boringssl-static;2.0.81.Final
io.netty:netty-transport;4.1.137.Final
io.netty:netty-transport-native-epoll;4.1.137.Final
io.netty:netty-transport-native-unix-common;4.1.137.Final
io.netty:netty-transport-native-kqueue;4.1.137.Final
io.projectreactor.netty:reactor-netty-http;1.2.18
io.projectreactor:reactor-core;3.7.19
io.vertx:vertx-codegen;4.5.30
io.vertx:vertx-core;4.5.30
io.vertx:vertx-codegen;4.5.32
io.vertx:vertx-core;4.5.32
javax.websocket:javax.websocket-api;1.1
org.apache.ant:ant;1.10.15
org.apache.arrow:arrow-format;19.0.0
Expand Down Expand Up @@ -91,8 +91,8 @@ org.slf4j:slf4j-api;1.7.36
org.slf4j:slf4j-nop;1.7.36
org.slf4j:slf4j-simple;1.7.36
redis.clients:jedis;6.2.0
testdep_net.bytebuddy:byte-buddy;1.17.7
testdep_net.bytebuddy:byte-buddy-agent;1.17.7
testdep_net.bytebuddy:byte-buddy;1.18.11
testdep_net.bytebuddy:byte-buddy-agent;1.18.11
org.openrewrite.recipe:rewrite-recipe-bom;3.22.0

## Spring boot dependency versions
Expand Down Expand Up @@ -126,10 +126,10 @@ io.opentelemetry:opentelemetry-bom;1.58.0
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;2.24.0-alpha
io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.24.0
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.24.0-alpha
io.projectreactor:reactor-test;3.7.18
io.projectreactor:reactor-test;3.7.19
io.github.hakky54:logcaptor;2.9.3
com.squareup.okio:okio;3.17.0
com.squareup.okio:okio-jvm;3.17.0
com.squareup.okio:okio;3.18.1
com.squareup.okio:okio-jvm;3.18.1
junit:junit;4.13.2
commons-cli:commons-cli;1.9.0
org.assertj:assertj-core;3.27.7
Expand All @@ -155,7 +155,7 @@ com.azure.tools:codesnippet-maven-plugin;1.0.0-beta.10
com.beust:jcommander;1.82
# Spotless 2.30.0 is the last version supporting a Java 8 runtime
com.diffplug.spotless:spotless-maven-plugin;2.30.0
com.github.javaparser:javaparser-core;3.27.0
com.github.javaparser:javaparser-core;3.28.2
com.google.code.findbugs:jsr305;3.0.2
com.nimbusds:nimbus-jose-jwt;9.37.3
com.puppycrawl.tools:checkstyle;9.3
Expand All @@ -169,38 +169,38 @@ org.apache.commons:commons-text;1.10.0
org.apache.maven:maven-plugin-api;3.9.11
org.apache.maven:maven-project;2.2.1
org.apache.maven.plugin-tools:maven-plugin-annotations;3.15.1
org.apache.maven.plugins:maven-antrun-plugin;3.1.0
org.apache.maven.plugins:maven-assembly-plugin;3.7.1
org.apache.maven.plugins:maven-antrun-plugin;3.2.0
org.apache.maven.plugins:maven-assembly-plugin;3.8.0
org.apache.maven.plugins:maven-checkstyle-plugin;3.6.0
org.apache.maven.plugins:maven-clean-plugin;3.5.0
org.apache.maven.plugins:maven-compiler-plugin;3.14.0
org.apache.maven.plugins:maven-enforcer-plugin;3.6.1
org.apache.maven.plugins:maven-failsafe-plugin;3.5.3
org.apache.maven.plugins:maven-compiler-plugin;3.15.0
org.apache.maven.plugins:maven-enforcer-plugin;3.6.3
org.apache.maven.plugins:maven-failsafe-plugin;3.5.6
org.apache.maven.plugins:maven-install-plugin;3.1.4
org.apache.maven.plugins:maven-jar-plugin;3.4.2
org.apache.maven.plugins:maven-javadoc-plugin;3.11.3
org.apache.maven.plugins:maven-jar-plugin;3.5.0
org.apache.maven.plugins:maven-javadoc-plugin;3.12.0
org.apache.maven.plugins:maven-jxr-plugin;3.6.0
org.apache.maven.plugins:maven-plugin-plugin;3.15.1
org.apache.maven.plugins:maven-plugin-plugin;3.15.2
org.apache.maven.plugins:maven-project-info-reports-plugin;3.9.0
org.apache.maven.plugins:maven-release-plugin;3.1.1
org.apache.maven.plugins:maven-resources-plugin;3.3.1
org.apache.maven.plugins:maven-shade-plugin;3.6.0
org.apache.maven.plugins:maven-site-plugin;3.21.0
org.apache.maven.plugins:maven-source-plugin;3.3.1
org.apache.maven.plugins:maven-surefire-plugin;3.5.3
org.codehaus.mojo:animal-sniffer-maven-plugin;1.24
org.apache.maven.plugins:maven-shade-plugin;3.6.2
org.apache.maven.plugins:maven-site-plugin;3.22.0
org.apache.maven.plugins:maven-source-plugin;3.4.0
org.apache.maven.plugins:maven-surefire-plugin;3.5.6
org.codehaus.mojo:animal-sniffer-maven-plugin;1.27
org.codehaus.mojo:build-helper-maven-plugin;3.6.1
org.codehaus.mojo:exec-maven-plugin;3.5.1
org.codehaus.mojo:xml-maven-plugin;1.1.0
org.codehaus.mojo:exec-maven-plugin;3.6.3
org.codehaus.mojo:xml-maven-plugin;1.2.1
org.eclipse.jetty:jetty-maven-plugin;9.4.58.v20250814
org.eclipse.m2e:lifecycle-mapping;1.0.0
org.jacoco:jacoco-maven-plugin;0.8.14
org.jacoco:org.jacoco.agent;0.8.14
org.jacoco:jacoco-maven-plugin;0.8.15
org.jacoco:org.jacoco.agent;0.8.15
org.mockito:mockito-core;4.11.0
org.mockito:mockito-inline;4.11.0
org.moditect:moditect-maven-plugin;1.0.0.RC1
org.owasp:dependency-check-maven;12.1.1
org.ow2.asm:asm;9.9.1
org.ow2.asm:asm;9.10.1
org.revapi:revapi;0.15.1
org.revapi:revapi-java;0.28.3
org.revapi:revapi-java-spi;0.25.1
Expand Down
4 changes: 2 additions & 2 deletions sdk/agrifood/azure-resourcemanager-agrifood/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.17.7</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy;external_dependency} -->
<version>1.18.11</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.17.7</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy-agent;external_dependency} -->
<version>1.18.11</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy-agent;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion sdk/ai/azure-ai-agents/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.6.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<version>3.6.3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
Expand Down
2 changes: 1 addition & 1 deletion sdk/ai/azure-ai-inference/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.6.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<version>3.6.3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
Expand Down
Loading
Loading