diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index f500a348f3e9..9ff0869767bf 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -138,6 +138,7 @@ org.springframework.data:spring-data-commons;2.7.8 org.springframework.data:spring-data-mongodb;3.4.8 org.springframework.data:spring-data-redis;2.7.8 org.springframework.experimental:spring-aot;0.11.4 +org.springframework.experimental:spring-aot-maven-plugin;0.11.4 org.springframework.integration:spring-integration-core;5.5.16 org.springframework.kafka:spring-kafka;2.8.11 org.springframework.security:spring-security-config;5.7.7 diff --git a/eng/versioning/pom_file_version_scanner.ps1 b/eng/versioning/pom_file_version_scanner.ps1 index fd5165441c4f..f91cce4116b1 100644 --- a/eng/versioning/pom_file_version_scanner.ps1 +++ b/eng/versioning/pom_file_version_scanner.ps1 @@ -43,6 +43,7 @@ $ValidParents = ("azure-sdk-parent", "azure-client-sdk-parent", "azure-data-sdk- $SpringSampleParents = ("spring-boot-starter-parent", "azure-spring-boot-test-parent") $Path = Resolve-Path ($PSScriptRoot + "/../../") +$SamplesPath = Resolve-Path ($PSScriptRoot + "/../../samples") # Not all POM files have a parent entry $PomFilesIgnoreParent = ("$($Path)\parent\pom.xml") @@ -401,6 +402,15 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object { return } + # Exclude everything that's in samples as this folder contains end to end samples + # that uses BOM and some dependencies will not have versions as they are deduced from + # the BOM. Running version checks on these samples will always fail. So, we'll skip + # all version checks in the root samples directory. + if ($_.FullName.StartsWith($SamplesPath)) + { + return + } + # azure-core-jackson-tests verifies compatibility with different # Jackson versions, it should be excluded from version checks if ($_.FullName -like "*azure-core-jackson-tests*") diff --git a/samples/azure-samples-graalvm-spring-storageexplorer/pom.xml b/samples/azure-samples-graalvm-spring-storageexplorer/pom.xml index 624cdfe8892a..1a85db4e2ed2 100644 --- a/samples/azure-samples-graalvm-spring-storageexplorer/pom.xml +++ b/samples/azure-samples-graalvm-spring-storageexplorer/pom.xml @@ -17,9 +17,7 @@ 11 - 0.11.4 22.3.0 - 0.9.19 @@ -47,14 +45,14 @@ net.java.dev.jna jna - 5.11.0 + 5.6.0 org.springframework.experimental spring-native - ${spring-native.version} + 0.11.4 @@ -84,7 +82,7 @@ org.springframework.experimental spring-aot-maven-plugin - ${spring-native.version} + 0.11.4 test-generate @@ -140,7 +138,7 @@ org.graalvm.buildtools native-maven-plugin - ${native-maven-plugin.version} + 0.9.19 com.azure.samples.graalvm.spring.storageexplorer.SpringNativeApplication storageexplorer