Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.

Commit ba10954

Browse files
markpollackmarkpollack
committed
Refactor maven project structure
1 parent 305b80a commit ba10954

File tree

8 files changed

+469
-109
lines changed

8 files changed

+469
-109
lines changed

‎.flattened-pom.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.springframework.experimental</groupId>
6+
<artifactId>spring-ai-mcp</artifactId>
7+
<version>0.0.1-SNAPSHOT</version>
8+
<packaging>pom</packaging>
9+
<name>mcp-parent</name>
10+
<description>Demo project for Spring Boot</description>
11+
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
12+
<organization>
13+
<name>VMware Inc.</name>
14+
<url>https://spring.io</url>
15+
</organization>
16+
<licenses>
17+
<license>
18+
<name>Apache 2.0</name>
19+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
20+
<distribution>repo</distribution>
21+
</license>
22+
</licenses>
23+
<developers>
24+
<developer>
25+
<name>Christian Tzolov</name>
26+
</developer>
27+
<developer>
28+
<name>Dariusz Jędrzejczyk</name>
29+
</developer>
30+
</developers>
31+
<scm>
32+
<connection>git://github.com/spring-projects-experimental/spring-ai-mcp.git</connection>
33+
<developerConnection>[email protected]:spring-projects-experimental/spring-ai-mcp.git</developerConnection>
34+
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
35+
</scm>
36+
</project>

‎mcp-core/.flattened-pom.xml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.springframework.experimental</groupId>
6+
<artifactId>spring-ai-mcp-core</artifactId>
7+
<version>0.0.1-SNAPSHOT</version>
8+
<name>Spring AI MCP Core</name>
9+
<description>Demo project for Spring Boot</description>
10+
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
11+
<organization>
12+
<name>VMware Inc.</name>
13+
<url>https://spring.io</url>
14+
</organization>
15+
<licenses>
16+
<license>
17+
<name>Apache 2.0</name>
18+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
19+
<distribution>repo</distribution>
20+
</license>
21+
</licenses>
22+
<developers>
23+
<developer>
24+
<name>Christian Tzolov</name>
25+
</developer>
26+
<developer>
27+
<name>Dariusz Jędrzejczyk</name>
28+
</developer>
29+
</developers>
30+
<scm>
31+
<connection>git://github.com/spring-projects-experimental/spring-ai-mcp.git</connection>
32+
<developerConnection>[email protected]:spring-projects-experimental/spring-ai-mcp.git</developerConnection>
33+
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
34+
</scm>
35+
<dependencies>
36+
<dependency>
37+
<groupId>com.fasterxml.jackson.core</groupId>
38+
<artifactId>jackson-databind</artifactId>
39+
<version>2.18.2</version>
40+
<scope>compile</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>io.projectreactor</groupId>
44+
<artifactId>reactor-core</artifactId>
45+
<version>3.7.0</version>
46+
<scope>compile</scope>
47+
</dependency>
48+
</dependencies>
49+
</project>

‎mcp-core/pom.xml‎

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,23 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>org.springframework.experimental</groupId>
6+
<parent>
7+
<groupId>org.springframework.experimental</groupId>
8+
<artifactId>spring-ai-mcp</artifactId>
9+
<version>0.0.1-SNAPSHOT</version>
10+
</parent>
711
<artifactId>spring-ai-mcp-core</artifactId>
8-
<version>0.1.0-SNAPSHOT</version>
9-
<name>spring-ai-mcp-core</name>
12+
<packaging>jar</packaging>
13+
<name>Spring AI MCP Core</name>
1014
<description>Demo project for Spring Boot</description>
11-
1215
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
16+
1317
<scm>
1418
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
1519
<connection>git://github.com/spring-projects-experimental/spring-ai-mcp.git</connection>
1620
<developerConnection>[email protected]:spring-projects-experimental/spring-ai-mcp.git</developerConnection>
1721
</scm>
1822

19-
<properties>
20-
<java.version>17</java.version>
21-
<maven.compiler.release>17</maven.compiler.release>
22-
</properties>
23-
2423
<dependencies>
2524
<dependency>
2625
<groupId>com.fasterxml.jackson.core</groupId>
@@ -35,19 +34,19 @@
3534
<dependency>
3635
<groupId>org.assertj</groupId>
3736
<artifactId>assertj-core</artifactId>
38-
<version>3.26.3</version>
37+
<version>${assert4j.version}</version>
3938
<scope>test</scope>
4039
</dependency>
4140
<dependency>
4241
<groupId>org.junit.jupiter</groupId>
4342
<artifactId>junit-jupiter-api</artifactId>
44-
<version>5.11.3</version>
43+
<version>${junit.version}</version>
4544
<scope>test</scope>
4645
</dependency>
4746
<dependency>
4847
<groupId>org.mockito</groupId>
4948
<artifactId>mockito-core</artifactId>
50-
<version>5.11.0</version>
49+
<version>${mockito.version}</version>
5150
<scope>test</scope>
5251
</dependency>
5352
<dependency>
@@ -57,36 +56,6 @@
5756
</dependency>
5857

5958
</dependencies>
60-
<dependencyManagement>
61-
<dependencies>
62-
<dependency>
63-
<groupId>io.projectreactor</groupId>
64-
<artifactId>reactor-bom</artifactId>
65-
<version>2024.0.0</version>
66-
<type>pom</type>
67-
<scope>import</scope>
68-
</dependency>
69-
</dependencies>
70-
</dependencyManagement>
7159

72-
<build>
73-
<plugins>
74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-compiler-plugin</artifactId>
77-
<version>3.12.1</version>
78-
</plugin>
79-
</plugins>
80-
</build>
81-
<repositories>
82-
<repository>
83-
<id>spring-milestones</id>
84-
<name>Spring Milestones</name>
85-
<url>https://repo.spring.io/milestone</url>
86-
<snapshots>
87-
<enabled>false</enabled>
88-
</snapshots>
89-
</repository>
90-
</repositories>
9160

9261
</project>

‎mcp-spring-boot/.flattened-pom.xml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.springframework.experimental</groupId>
6+
<artifactId>spring-ai-mcp-spring-boot</artifactId>
7+
<version>0.0.1-SNAPSHOT</version>
8+
<name>spring-ai-mcp-spring-boot</name>
9+
<description>Spring AI MCP Spring Boot Integration</description>
10+
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
11+
<organization>
12+
<name>VMware Inc.</name>
13+
<url>https://spring.io</url>
14+
</organization>
15+
<licenses>
16+
<license>
17+
<name>Apache 2.0</name>
18+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
19+
<distribution>repo</distribution>
20+
</license>
21+
</licenses>
22+
<developers>
23+
<developer>
24+
<name>Christian Tzolov</name>
25+
</developer>
26+
<developer>
27+
<name>Dariusz Jędrzejczyk</name>
28+
</developer>
29+
</developers>
30+
<scm>
31+
<connection>git://github.com/spring-projects-experimental/spring-ai-mcp.git</connection>
32+
<developerConnection>[email protected]:spring-projects-experimental/spring-ai-mcp.git</developerConnection>
33+
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
34+
</scm>
35+
<dependencies>
36+
<dependency>
37+
<groupId>org.springframework.boot</groupId>
38+
<artifactId>spring-boot-starter</artifactId>
39+
<version>3.3.6</version>
40+
<scope>compile</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.springframework.ai</groupId>
44+
<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
45+
<version>1.0.0-M4</version>
46+
<scope>compile</scope>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.springframework.experimental</groupId>
50+
<artifactId>spring-ai-mcp-spring</artifactId>
51+
<version>0.0.1-SNAPSHOT</version>
52+
<scope>compile</scope>
53+
</dependency>
54+
</dependencies>
55+
</project>

‎mcp-spring-boot/pom.xml‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>org.springframework.boot</groupId>
8-
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.4.0</version>
10-
<relativePath /> <!-- lookup parent from repository -->
7+
<groupId>org.springframework.experimental</groupId>
8+
<artifactId>spring-ai-mcp</artifactId>
9+
<version>0.0.1-SNAPSHOT</version>
1110
</parent>
12-
<groupId>org.springframework.experimental</groupId>
1311
<artifactId>spring-ai-mcp-spring-boot</artifactId>
14-
<version>0.1.0-SNAPSHOT</version>
1512
<name>spring-ai-mcp-spring-boot</name>
16-
<description>Demo project for Spring Boot</description>
13+
<description>Spring AI MCP Spring Boot Integration</description>
1714

1815
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
1916
<scm>
@@ -23,54 +20,40 @@
2320
</scm>
2421

2522
<properties>
26-
<java.version>17</java.version>
27-
<spring-ai.version>1.0.0-M4</spring-ai.version>
23+
<spring-boot.version>3.3.6</spring-boot.version>
2824
</properties>
25+
2926
<dependencies>
27+
<dependency>
28+
<groupId>org.springframework.boot</groupId>
29+
<artifactId>spring-boot-starter</artifactId>
30+
</dependency>
3031
<dependency>
3132
<groupId>org.springframework.ai</groupId>
3233
<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
3334
</dependency>
3435
<dependency>
3536
<groupId>org.springframework.experimental</groupId>
3637
<artifactId>spring-ai-mcp-spring</artifactId>
37-
<version>0.1.0-SNAPSHOT</version>
38+
<version>${project.version}</version>
3839
</dependency>
3940
<dependency>
4041
<groupId>org.springframework.boot</groupId>
4142
<artifactId>spring-boot-starter-test</artifactId>
4243
<scope>test</scope>
4344
</dependency>
4445
</dependencies>
46+
4547
<dependencyManagement>
4648
<dependencies>
4749
<dependency>
48-
<groupId>org.springframework.ai</groupId>
49-
<artifactId>spring-ai-bom</artifactId>
50-
<version>${spring-ai.version}</version>
50+
<groupId>org.springframework.boot</groupId>
51+
<artifactId>spring-boot-dependencies</artifactId>
52+
<version>${spring-boot.version}</version>
5153
<type>pom</type>
5254
<scope>import</scope>
5355
</dependency>
5456
</dependencies>
5557
</dependencyManagement>
5658

57-
<build>
58-
<plugins>
59-
<plugin>
60-
<groupId>org.springframework.boot</groupId>
61-
<artifactId>spring-boot-maven-plugin</artifactId>
62-
</plugin>
63-
</plugins>
64-
</build>
65-
<repositories>
66-
<repository>
67-
<id>spring-milestones</id>
68-
<name>Spring Milestones</name>
69-
<url>https://repo.spring.io/milestone</url>
70-
<snapshots>
71-
<enabled>false</enabled>
72-
</snapshots>
73-
</repository>
74-
</repositories>
75-
7659
</project>

‎mcp-spring/.flattened-pom.xml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.springframework.experimental</groupId>
6+
<artifactId>spring-ai-mcp-spring</artifactId>
7+
<version>0.0.1-SNAPSHOT</version>
8+
<name>Spring AI MCP Spring</name>
9+
<description>Spring Integration for MCP</description>
10+
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
11+
<organization>
12+
<name>VMware Inc.</name>
13+
<url>https://spring.io</url>
14+
</organization>
15+
<licenses>
16+
<license>
17+
<name>Apache 2.0</name>
18+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
19+
<distribution>repo</distribution>
20+
</license>
21+
</licenses>
22+
<developers>
23+
<developer>
24+
<name>Christian Tzolov</name>
25+
</developer>
26+
<developer>
27+
<name>Dariusz Jędrzejczyk</name>
28+
</developer>
29+
</developers>
30+
<scm>
31+
<connection>git://github.com/spring-projects-experimental/spring-ai-mcp.git</connection>
32+
<developerConnection>[email protected]:spring-projects-experimental/spring-ai-mcp.git</developerConnection>
33+
<url>https://github.com/spring-projects-experimental/spring-ai-mcp</url>
34+
</scm>
35+
<dependencies>
36+
<dependency>
37+
<groupId>org.springframework.ai</groupId>
38+
<artifactId>spring-ai-core</artifactId>
39+
<version>1.0.0-M4</version>
40+
<scope>compile</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.springframework.experimental</groupId>
44+
<artifactId>spring-ai-mcp-core</artifactId>
45+
<version>0.0.1-SNAPSHOT</version>
46+
<scope>compile</scope>
47+
</dependency>
48+
</dependencies>
49+
</project>

0 commit comments

Comments
 (0)