Skip to content

Commit 63fad71

Browse files
stantonkstantonk
authored
Merge pull request #6 from sproutsocial/feature/internal/McpTransportContext-for-HttpServletSseServerTransportProvider
AIML-2969 Feature/internal/mcp transport context for http servlet sse server transport provider
2 parents eb427ad + 7a4e9b9 commit 63fad71

28 files changed

+253
-64
lines changed

‎Jenkinsfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
sproutMultiModuleBuild {
2+
moduleToBuild = 'mcp-parent'
3+
nodeLabel = 'ephemeral'
4+
tribes = ['global']
5+
notifySlackGroupsOnFailure = ['@kevin']
6+
runECRLogin = 'true'
7+
jdk = 17
8+
deployRCBranches = true
9+
}

‎mcp-bom/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>io.modelcontextprotocol.sdk</groupId>
8+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
99
<artifactId>mcp-parent</artifactId>
10-
<version>0.12.0-SNAPSHOT</version>
10+
<version>0.12.0-sprout</version>
1111
</parent>
1212

1313
<artifactId>mcp-bom</artifactId>
@@ -28,28 +28,28 @@
2828
<dependencies>
2929
<!-- Core MCP -->
3030
<dependency>
31-
<groupId>io.modelcontextprotocol.sdk</groupId>
31+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
3232
<artifactId>mcp</artifactId>
33-
<version>${project.version}</version>
33+
<version>0.12.0-sprout</version>
3434
</dependency>
3535

3636
<!-- MCP Test -->
3737
<dependency>
38-
<groupId>io.modelcontextprotocol.sdk</groupId>
38+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
3939
<artifactId>mcp-test</artifactId>
4040
<version>${project.version}</version>
4141
</dependency>
4242

4343
<!-- MCP Transport - WebFlux SSE -->
4444
<dependency>
45-
<groupId>io.modelcontextprotocol.sdk</groupId>
45+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
4646
<artifactId>mcp-spring-webflux</artifactId>
4747
<version>${project.version}</version>
4848
</dependency>
4949

5050
<!-- MCP Transport - WebMVC SSE -->
5151
<dependency>
52-
<groupId>io.modelcontextprotocol.sdk</groupId>
52+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
5353
<artifactId>mcp-spring-webmvc</artifactId>
5454
<version>${project.version}</version>
5555
</dependency>
@@ -95,4 +95,4 @@
9595
</plugins>
9696
</build>
9797

98-
</project>
98+
</project>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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>io.modelcontextprotocol.sdk</groupId>
7+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
88
<artifactId>mcp-parent</artifactId>
9-
<version>0.12.0-SNAPSHOT</version>
9+
<version>0.12.0-sprout</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>mcp-spring-webflux</artifactId>
@@ -23,15 +23,15 @@
2323

2424
<dependencies>
2525
<dependency>
26-
<groupId>io.modelcontextprotocol.sdk</groupId>
26+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
2727
<artifactId>mcp</artifactId>
28-
<version>0.12.0-SNAPSHOT</version>
28+
<version>0.12.0-sprout</version>
2929
</dependency>
3030

3131
<dependency>
32-
<groupId>io.modelcontextprotocol.sdk</groupId>
32+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
3333
<artifactId>mcp-test</artifactId>
34-
<version>0.12.0-SNAPSHOT</version>
34+
<version>0.12.0-sprout</version>
3535
<scope>test</scope>
3636
</dependency>
3737

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/client/WebClientStreamableHttpAsyncClientTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public class WebClientStreamableHttpAsyncClientTests extends AbstractMcpAsyncCli
1919

2020
// Uses the https://github.com/tzolov/mcp-everything-server-docker-image
2121
@SuppressWarnings("resource")
22-
GenericContainer<?> container = new GenericContainer<>("docker.io/tzolov/mcp-everything-server:v2")
22+
GenericContainer<?> container = new GenericContainer<>(
23+
"412335208158.dkr.ecr.us-east-1.amazonaws.com/docker-hub/tzolov/mcp-everything-server:v2")
2324
.withCommand("node dist/index.js streamableHttp")
2425
.withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String()))
2526
.withExposedPorts(3001)

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/client/WebClientStreamableHttpSyncClientTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public class WebClientStreamableHttpSyncClientTests extends AbstractMcpSyncClien
1919

2020
// Uses the https://github.com/tzolov/mcp-everything-server-docker-image
2121
@SuppressWarnings("resource")
22-
GenericContainer<?> container = new GenericContainer<>("docker.io/tzolov/mcp-everything-server:v2")
22+
GenericContainer<?> container = new GenericContainer<>(
23+
"412335208158.dkr.ecr.us-east-1.amazonaws.com/docker-hub/tzolov/mcp-everything-server:v2")
2324
.withCommand("node dist/index.js streamableHttp")
2425
.withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String()))
2526
.withExposedPorts(3001)

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpAsyncClientTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ class WebFluxSseMcpAsyncClientTests extends AbstractMcpAsyncClientTests {
2626

2727
// Uses the https://github.com/tzolov/mcp-everything-server-docker-image
2828
@SuppressWarnings("resource")
29-
GenericContainer<?> container = new GenericContainer<>("docker.io/tzolov/mcp-everything-server:v2")
29+
GenericContainer<?> container = new GenericContainer<>(
30+
"412335208158.dkr.ecr.us-east-1.amazonaws.com/docker-hub/tzolov/mcp-everything-server:v2")
3031
.withCommand("node dist/index.js sse")
3132
.withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String()))
3233
.withExposedPorts(3001)

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpSyncClientTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ class WebFluxSseMcpSyncClientTests extends AbstractMcpSyncClientTests {
2626

2727
// Uses the https://github.com/tzolov/mcp-everything-server-docker-image
2828
@SuppressWarnings("resource")
29-
GenericContainer<?> container = new GenericContainer<>("docker.io/tzolov/mcp-everything-server:v2")
29+
GenericContainer<?> container = new GenericContainer<>(
30+
"412335208158.dkr.ecr.us-east-1.amazonaws.com/docker-hub/tzolov/mcp-everything-server:v2")
3031
.withCommand("node dist/index.js sse")
3132
.withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String()))
3233
.withExposedPorts(3001)

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/client/transport/WebFluxSseClientTransportTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class WebFluxSseClientTransportTests {
4242
static String host = "http://localhost:3001";
4343

4444
@SuppressWarnings("resource")
45-
GenericContainer<?> container = new GenericContainer<>("docker.io/tzolov/mcp-everything-server:v2")
45+
GenericContainer<?> container = new GenericContainer<>(
46+
"412335208158.dkr.ecr.us-east-1.amazonaws.com/docker-hub/tzolov/mcp-everything-server:v2")
4647
.withCommand("node dist/index.js sse")
4748
.withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String()))
4849
.withExposedPorts(3001)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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>io.modelcontextprotocol.sdk</groupId>
7+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
88
<artifactId>mcp-parent</artifactId>
9-
<version>0.12.0-SNAPSHOT</version>
9+
<version>0.12.0-sprout</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>mcp-spring-webmvc</artifactId>
@@ -23,9 +23,9 @@
2323

2424
<dependencies>
2525
<dependency>
26-
<groupId>io.modelcontextprotocol.sdk</groupId>
26+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
2727
<artifactId>mcp</artifactId>
28-
<version>0.12.0-SNAPSHOT</version>
28+
<version>0.12.0-sprout</version>
2929
</dependency>
3030

3131
<dependency>
@@ -35,16 +35,16 @@
3535
</dependency>
3636

3737
<dependency>
38-
<groupId>io.modelcontextprotocol.sdk</groupId>
38+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
3939
<artifactId>mcp-test</artifactId>
40-
<version>0.12.0-SNAPSHOT</version>
40+
<version>0.12.0-sprout</version>
4141
<scope>test</scope>
4242
</dependency>
4343

4444
<dependency>
45-
<groupId>io.modelcontextprotocol.sdk</groupId>
45+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
4646
<artifactId>mcp-spring-webflux</artifactId>
47-
<version>0.12.0-SNAPSHOT</version>
47+
<version>0.12.0-sprout</version>
4848
<scope>test</scope>
4949
</dependency>
5050

‎mcp-test/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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>io.modelcontextprotocol.sdk</groupId>
7+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
88
<artifactId>mcp-parent</artifactId>
9-
<version>0.12.0-SNAPSHOT</version>
9+
<version>0.12.0-sprout</version>
1010
</parent>
1111
<artifactId>mcp-test</artifactId>
1212
<packaging>jar</packaging>
@@ -22,9 +22,9 @@
2222

2323
<dependencies>
2424
<dependency>
25-
<groupId>io.modelcontextprotocol.sdk</groupId>
25+
<groupId>com.sproutsocial.io.modelcontextprotocol.sdk</groupId>
2626
<artifactId>mcp</artifactId>
27-
<version>0.12.0-SNAPSHOT</version>
27+
<version>0.12.0-sprout</version>
2828
</dependency>
2929

3030
<dependency>
@@ -101,4 +101,4 @@
101101
</dependencies>
102102

103103

104-
</project>
104+
</project>

0 commit comments

Comments
 (0)