Skip to content

Commit 95a2765

Browse files
authored
Merge pull request #75 from springaialibaba/0308-yuluo/add-examples
feat: add module-rag pom.xml
2 parents 3a64188 + f5f8d32 commit 95a2765

File tree

1 file changed

+1
-44
lines changed
  • spring-ai-alibaba-rag-example/module-rag

1 file changed

+1
-44
lines changed

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

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
-->
1818

1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
<<<<<<< HEAD:spring-ai-alibaba-rag-example/module-rag/pom.xml
2120
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2221
<modelVersion>4.0.0</modelVersion>
2322

@@ -83,15 +82,6 @@
8382
</dependency>
8483
</dependencies>
8584

86-
<build>
87-
<plugins>
88-
<plugin>
89-
<groupId>org.springframework.boot</groupId>
90-
<artifactId>spring-boot-maven-plugin</artifactId>
91-
</plugin>
92-
</plugins>
93-
</build>
94-
9585
<repositories>
9686
<repository>
9787
<id>spring-milestones</id>
@@ -102,40 +92,6 @@
10292
</snapshots>
10393
</repository>
10494
</repositories>
105-
=======
106-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
107-
<modelVersion>4.0.0</modelVersion>
108-
109-
<parent>
110-
<groupId>com.alibaba.cloud.ai</groupId>
111-
<artifactId>spring-ai-alibaba-rag-example</artifactId>
112-
<version>${revision}</version>
113-
<relativePath>../pom.xml</relativePath>
114-
</parent>
115-
<artifactId>web-search</artifactId>
116-
<version>${revision}</version>
117-
118-
<name>internet-search</name>
119-
<description>Internet Search project for Spring AI Alibaba</description>
120-
121-
<properties>
122-
<maven.compiler.source>17</maven.compiler.source>
123-
<maven.compiler.target>17</maven.compiler.target>
124-
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
125-
</properties>
126-
127-
<dependencies>
128-
<dependency>
129-
<groupId>org.springframework.boot</groupId>
130-
<artifactId>spring-boot-starter-web</artifactId>
131-
</dependency>
132-
133-
<dependency>
134-
<groupId>com.alibaba.cloud.ai</groupId>
135-
<artifactId>spring-ai-alibaba-starter</artifactId>
136-
</dependency>
137-
</dependencies>
138-
>>>>>>> a5c26fb305b265b051fdf61a7629fe26a35abe4c:spring-ai-alibaba-rag-example/web-search/pom.xml
13995

14096
<build>
14197
<plugins>
@@ -153,4 +109,5 @@
153109
</plugin>
154110
</plugins>
155111
</build>
112+
156113
</project>

0 commit comments

Comments
 (0)