Merge branch 'main' into signoz-changes

Author: lake-of-dreams

cloudbank-v4/chatbot/pom.xml

@@ -18,18 +18,15 @@ https://oss.oracle.com/licenses/upl/ -->
     <name>chatbot</name>
     <description>A Simple ChatBot Application</description>
 
+    <properties>
+        <java.version>21</java.version>
+        <spring-ai.version>1.0.0-M6</spring-ai.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-ollama</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-autoconfigure-model-ollama</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-starter-model-ollama</artifactId>
+            <artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.example</groupId>
@@ -38,40 +35,17 @@ https://oss.oracle.com/licenses/upl/ -->
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.ai</groupId>
                 <artifactId>spring-ai-bom</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>${spring-ai.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>

cloudbank-v4/pom.xml

@@ -44,9 +44,9 @@
         <micrometer-tracing.version>1.4.4</micrometer-tracing.version>
         <lombok.version>1.18.36</lombok.version>
         <oracle-springboot-starter.version>25.1.0</oracle-springboot-starter.version>
-		<oracle-microtx-starter.version>24.2.2</oracle-microtx-starter.version>
-		<liquibase.version>4.31.1</liquibase.version>
-		<datasource-micrometer-spring-boot.version>1.1.0</datasource-micrometer-spring-boot.version>
+	<oracle-microtx-starter.version>24.2.2</oracle-microtx-starter.version>
+	<liquibase.version>4.31.1</liquibase.version>
+	<datasource-micrometer-spring-boot.version>1.1.0</datasource-micrometer-spring-boot.version>
 
         <!-- Code quality tools -->
         <maven-checkstyle-plugin-version>3.3.1</maven-checkstyle-plugin-version>