Merge remote-tracking branch 'origin/main' into ramsessanchez/migrate-gradle-to-maven

Author: ramsessanchez

pom.xml

@@ -159,13 +159,17 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
+<<<<<<< HEAD
             <version>${azure-core.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.microsoft.kiota</groupId>
             <artifactId>microsoft-kiota-abstractions</artifactId>
             <version>${kiota.version}</version>
+=======
+            <version>1.58.1</version>
+>>>>>>> origin/main
         </dependency>
         <dependency>
             <groupId>com.microsoft.kiota</groupId>