Fix version tags for samples (#34092)

* Fix version tags for samples * exlude storageexplorer sample from version check * remove unwanted var * Skip entire samples directory from version scanning
Azure · Mar 17, 2023 · 36077ac · 36077ac
1 parent 848f8e6
commit 36077ac
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git 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
@@ -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
@@ -17,9 +17,7 @@
 
   <properties>
     <java.version>11</java.version>
-    <spring-native.version>0.11.4</spring-native.version>
     <graalvm.version>22.3.0</graalvm.version>
-    <native-maven-plugin.version>0.9.19</native-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
@@ -47,14 +45,14 @@
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>5.11.0</version>
+      <version>5.6.0</version>
     </dependency>
 
     <!-- this enables the Spring support for native-image compilation -->
     <dependency>
       <groupId>org.springframework.experimental</groupId>
       <artifactId>spring-native</artifactId>
-      <version>${spring-native.version}</version>
+      <version>0.11.4</version>
     </dependency>
 
     <dependency>
@@ -84,7 +82,7 @@
       <plugin>
         <groupId>org.springframework.experimental</groupId>
         <artifactId>spring-aot-maven-plugin</artifactId>
-        <version>${spring-native.version}</version>
+        <version>0.11.4</version>
         <executions>
           <execution>
             <id>test-generate</id>
@@ -140,7 +138,7 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>${native-maven-plugin.version}</version>
+            <version>0.9.19</version>
             <configuration>
               <mainClass>com.azure.samples.graalvm.spring.storageexplorer.SpringNativeApplication</mainClass>
               <imageName>storageexplorer</imageName>