Skip to content

Commit a5c26fb

Browse files
yuluo-yxyuluo-yx
authored
Merge pull request #73 from wstever/main
fix:update SpringAI version info based on parent
2 parents cc2663f + 8d762ad commit a5c26fb

File tree

8 files changed

+262
-351
lines changed

8 files changed

+262
-351
lines changed

‎spring-ai-alibaba-function-calling-example/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,23 @@
3535
<name>Spring AI Alibaba Function Calling Examples</name>
3636

3737
<properties>
38-
3938
<junit-jupiter.version>5.10.0</junit-jupiter.version>
40-
41-
<!-- Spring AI Alibaba -->
42-
<spring-ai-alibaba.version>1.0.0-M3.3</spring-ai-alibaba.version>
4339
</properties>
4440

4541
<dependencies>
46-
4742
<dependency>
4843
<groupId>com.alibaba.cloud.ai</groupId>
4944
<artifactId>spring-ai-alibaba-starter</artifactId>
50-
<version>${spring-ai-alibaba.version}</version>
5145
</dependency>
5246

5347
<dependency>
5448
<groupId>com.alibaba.cloud.ai</groupId>
5549
<artifactId>spring-ai-alibaba-starter-function-calling-microsofttranslate</artifactId>
56-
<version>${spring-ai-alibaba.version}</version>
5750
</dependency>
5851

5952
<dependency>
6053
<groupId>com.alibaba.cloud.ai</groupId>
6154
<artifactId>spring-ai-alibaba-starter-function-calling-weather</artifactId>
62-
<version>${spring-ai-alibaba.version}</version>
6355
</dependency>
6456

6557
<dependency>

‎spring-ai-alibaba-rag-example/bailian-agent/pom.xml

Lines changed: 51 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -17,79 +17,60 @@
1717
-->
1818

1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<modelVersion>4.0.0</modelVersion>
22-
<parent>
23-
<groupId>org.springframework.boot</groupId>
24-
<artifactId>spring-boot-starter-parent</artifactId>
25-
<version>3.3.3</version>
26-
<relativePath/> <!-- lookup parent from repository -->
27-
</parent>
28-
<groupId>com.alibaba.cloud.ai</groupId>
29-
<artifactId>bailian-agent</artifactId>
30-
<version>0.0.1-SNAPSHOT</version>
31-
<name>rag-example</name>
32-
<description>Demo project for Spring AI Alibaba with Aliyun Bailian platform</description>
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<parent>
23+
<groupId>com.alibaba.cloud.ai</groupId>
24+
<artifactId>spring-ai-alibaba-rag-example</artifactId>
25+
<version>${revision}</version>
26+
<relativePath>../pom.xml</relativePath>
27+
</parent>
28+
<artifactId>bailian-agent</artifactId>
29+
<version>${revision}</version>
30+
<name>bailian-agent</name>
31+
<description>Demo project for Spring AI Alibaba with Aliyun Bailian platform</description>
3332

34-
<properties>
35-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
37-
<maven.compiler.source>17</maven.compiler.source>
38-
<maven.compiler.target>17</maven.compiler.target>
39-
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
33+
<properties>
34+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
36+
<maven.compiler.source>17</maven.compiler.source>
37+
<maven.compiler.target>17</maven.compiler.target>
38+
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
39+
<!-- utils -->
40+
<commons-lang3.version>3.14.0</commons-lang3.version>
41+
</properties>
4042

41-
<!-- Spring AI -->
42-
<spring-ai-alibaba.version>1.0.0-M5.1</spring-ai-alibaba.version>
43-
<spring-ai.version>1.0.0-M5</spring-ai.version>
43+
<dependencies>
44+
<dependency>
45+
<groupId>com.alibaba.cloud.ai</groupId>
46+
<artifactId>spring-ai-alibaba-starter</artifactId>
47+
</dependency>
4448

45-
<!-- utils -->
46-
<commons-lang3.version>3.14.0</commons-lang3.version>
47-
</properties>
49+
<dependency>
50+
<groupId>org.springframework.boot</groupId>
51+
<artifactId>spring-boot-starter-web</artifactId>
52+
</dependency>
4853

49-
<dependencies>
50-
<dependency>
51-
<groupId>com.alibaba.cloud.ai</groupId>
52-
<artifactId>spring-ai-alibaba-starter</artifactId>
53-
<version>${spring-ai-alibaba.version}</version>
54-
</dependency>
55-
56-
<dependency>
57-
<groupId>org.springframework.boot</groupId>
58-
<artifactId>spring-boot-starter-web</artifactId>
59-
</dependency>
60-
61-
<dependency>
62-
<groupId>org.apache.commons</groupId>
63-
<artifactId>commons-lang3</artifactId>
64-
</dependency>
65-
</dependencies>
66-
67-
<build>
68-
<plugins>
69-
<plugin>
70-
<groupId>org.springframework.boot</groupId>
71-
<artifactId>spring-boot-maven-plugin</artifactId>
72-
</plugin>
73-
<plugin>
74-
<groupId>org.apache.maven.plugins</groupId>
75-
<artifactId>maven-deploy-plugin</artifactId>
76-
<version>${maven-deploy-plugin.version}</version>
77-
<configuration>
78-
<skip>true</skip>
79-
</configuration>
80-
</plugin>
81-
</plugins>
82-
</build>
83-
84-
<repositories>
85-
<repository>
86-
<id>spring-milestones</id>
87-
<name>Spring Milestones</name>
88-
<url>https://repo.spring.io/milestone</url>
89-
<snapshots>
90-
<enabled>false</enabled>
91-
</snapshots>
92-
</repository>
93-
</repositories>
54+
<dependency>
55+
<groupId>org.apache.commons</groupId>
56+
<artifactId>commons-lang3</artifactId>
57+
</dependency>
58+
</dependencies>
9459

60+
<build>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.springframework.boot</groupId>
64+
<artifactId>spring-boot-maven-plugin</artifactId>
65+
</plugin>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-deploy-plugin</artifactId>
69+
<version>${maven-deploy-plugin.version}</version>
70+
<configuration>
71+
<skip>true</skip>
72+
</configuration>
73+
</plugin>
74+
</plugins>
75+
</build>
9576
</project>

‎spring-ai-alibaba-rag-example/bailian-rag-knowledge/pom.xml

Lines changed: 51 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -15,82 +15,62 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
1918
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<modelVersion>4.0.0</modelVersion>
22-
<parent>
23-
<groupId>org.springframework.boot</groupId>
24-
<artifactId>spring-boot-starter-parent</artifactId>
25-
<version>3.3.3</version>
26-
<relativePath/> <!-- lookup parent from repository -->
27-
</parent>
28-
<groupId>com.alibaba.cloud.ai</groupId>
29-
<artifactId>bailian-rag-knowledge</artifactId>
30-
<version>0.0.1-SNAPSHOT</version>
31-
<name>rag-example</name>
32-
<description>Demo project for Spring AI Alibaba with Aliyun Bailian platform</description>
33-
34-
<properties>
35-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
37-
<maven.compiler.source>17</maven.compiler.source>
38-
<maven.compiler.target>17</maven.compiler.target>
39-
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
40-
41-
<!-- Spring AI -->
42-
<spring-ai-alibaba.version>1.0.0-M5.1</spring-ai-alibaba.version>
43-
<spring-ai.version>1.0.0-M5</spring-ai.version>
44-
45-
<!-- utils -->
46-
<commons-lang3.version>3.14.0</commons-lang3.version>
47-
</properties>
48-
49-
<dependencies>
50-
<dependency>
51-
<groupId>com.alibaba.cloud.ai</groupId>
52-
<artifactId>spring-ai-alibaba-starter</artifactId>
53-
<version>${spring-ai-alibaba.version}</version>
54-
</dependency>
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<groupId>com.alibaba.cloud.ai</groupId>
23+
<artifactId>spring-ai-alibaba-rag-example</artifactId>
24+
<version>${revision}</version>
25+
<relativePath>../pom.xml</relativePath>
26+
</parent>
27+
<artifactId>bailian-rag-knowledge</artifactId>
28+
<version>${revision}</version>
29+
<name>bailian-rag-knowledge</name>
30+
<description>Demo project for Spring AI Alibaba with Aliyun Bailian platform</description>
5531

56-
<dependency>
57-
<groupId>org.springframework.boot</groupId>
58-
<artifactId>spring-boot-starter-web</artifactId>
59-
</dependency>
32+
<properties>
33+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
35+
<maven.compiler.source>17</maven.compiler.source>
36+
<maven.compiler.target>17</maven.compiler.target>
37+
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
38+
<!-- utils -->
39+
<commons-lang3.version>3.14.0</commons-lang3.version>
40+
</properties>
6041

61-
<dependency>
62-
<groupId>org.apache.commons</groupId>
63-
<artifactId>commons-lang3</artifactId>
64-
</dependency>
42+
<dependencies>
43+
<dependency>
44+
<groupId>com.alibaba.cloud.ai</groupId>
45+
<artifactId>spring-ai-alibaba-starter</artifactId>
46+
</dependency>
6547

66-
</dependencies>
48+
<dependency>
49+
<groupId>org.springframework.boot</groupId>
50+
<artifactId>spring-boot-starter-web</artifactId>
51+
</dependency>
6752

68-
<build>
69-
<plugins>
70-
<plugin>
71-
<groupId>org.springframework.boot</groupId>
72-
<artifactId>spring-boot-maven-plugin</artifactId>
73-
</plugin>
74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-deploy-plugin</artifactId>
77-
<version>${maven-deploy-plugin.version}</version>
78-
<configuration>
79-
<skip>true</skip>
80-
</configuration>
81-
</plugin>
82-
</plugins>
83-
</build>
53+
<dependency>
54+
<groupId>org.apache.commons</groupId>
55+
<artifactId>commons-lang3</artifactId>
56+
</dependency>
8457

85-
<repositories>
86-
<repository>
87-
<id>spring-milestones</id>
88-
<name>Spring Milestones</name>
89-
<url>https://repo.spring.io/milestone</url>
90-
<snapshots>
91-
<enabled>false</enabled>
92-
</snapshots>
93-
</repository>
94-
</repositories>
58+
</dependencies>
9559

60+
<build>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.springframework.boot</groupId>
64+
<artifactId>spring-boot-maven-plugin</artifactId>
65+
</plugin>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-deploy-plugin</artifactId>
69+
<version>${maven-deploy-plugin.version}</version>
70+
<configuration>
71+
<skip>true</skip>
72+
</configuration>
73+
</plugin>
74+
</plugins>
75+
</build>
9676
</project>

‎spring-ai-alibaba-rag-example/pom.xml

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,45 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
1918
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xmlns="http://maven.apache.org/POM/4.0.0"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22-
<modelVersion>4.0.0</modelVersion>
23-
24-
<parent>
25-
<groupId>com.alibaba.cloud.ai</groupId>
26-
<artifactId>spring-ai-alibaba-examples</artifactId>
27-
<version>${revision}</version>
28-
<relativePath>../pom.xml</relativePath>
29-
</parent>
30-
31-
<version>${revision}</version>
32-
<artifactId>spring-ai-alibaba-rag-example</artifactId>
33-
<packaging>pom</packaging>
34-
35-
<description>Spring AI Alibaba RAG Example</description>
36-
<name>Spring AI Alibaba RAG Examples</name>
37-
38-
<modules>
39-
<module>bailian-rag-knowledge</module>
40-
<module>bailian-agent</module>
41-
<module>rag-example</module>
42-
<module>rag-milvus-example</module>
43-
<module>rag-pgvector-example</module>
44-
<module>web-search</module>
45-
</modules>
46-
47-
<build>
48-
<plugins>
49-
<plugin>
50-
<groupId>org.apache.maven.plugins</groupId>
51-
<artifactId>maven-deploy-plugin</artifactId>
52-
<version>${maven-deploy-plugin.version}</version>
53-
<configuration>
54-
<skip>true</skip>
55-
</configuration>
56-
</plugin>
57-
</plugins>
58-
</build>
19+
xmlns="http://maven.apache.org/POM/4.0.0"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
23+
<parent>
24+
<groupId>com.alibaba.cloud.ai</groupId>
25+
<artifactId>spring-ai-alibaba-examples</artifactId>
26+
<version>${revision}</version>
27+
<relativePath>../pom.xml</relativePath>
28+
</parent>
29+
30+
<version>${revision}</version>
31+
<artifactId>spring-ai-alibaba-rag-example</artifactId>
32+
<packaging>pom</packaging>
33+
34+
<description>Spring AI Alibaba RAG Example</description>
35+
<name>Spring AI Alibaba RAG Examples</name>
36+
37+
<modules>
38+
<module>bailian-agent</module>
39+
<module>bailian-rag-knowledge</module>
40+
<module>rag-example</module>
41+
<module>rag-milvus-example</module>
42+
<module>rag-pgvector-example</module>
43+
<module>web-search</module>
44+
</modules>
45+
46+
<build>
47+
<plugins>
48+
<plugin>
49+
<groupId>org.apache.maven.plugins</groupId>
50+
<artifactId>maven-deploy-plugin</artifactId>
51+
<version>${maven-deploy-plugin.version}</version>
52+
<configuration>
53+
<skip>true</skip>
54+
</configuration>
55+
</plugin>
56+
</plugins>
57+
</build>
5958

6059
</project>

0 commit comments

Comments
 (0)