Skip to content

Commit 0bf330d

Browse files
artembilanartembilan
committed
Move Spring gRPC BOM to gRPC module
1 parent 1350e9e commit 0bf330d

File tree

2 files changed

+74
-106
lines changed

2 files changed

+74
-106
lines changed

‎basic/grpc-client/pom.xml‎

Lines changed: 72 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -60,79 +60,15 @@
6060
<system>GitHub</system>
6161
<url>https://github.com/spring-projects/spring-integration-samples/issues</url>
6262
</issueManagement>
63-
<dependencies>
64-
<dependency>
65-
<groupId>org.springframework.boot</groupId>
66-
<artifactId>spring-boot-starter-integration</artifactId>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.springframework.grpc</groupId>
70-
<artifactId>spring-grpc-client-spring-boot-starter</artifactId>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.springframework.integration</groupId>
74-
<artifactId>spring-integration-grpc</artifactId>
75-
</dependency>
76-
<dependency>
77-
<groupId>com.google.protobuf</groupId>
78-
<artifactId>protobuf-java</artifactId>
79-
<version>4.29.4</version>
80-
</dependency>
81-
<dependency>
82-
<groupId>javax.annotation</groupId>
83-
<artifactId>javax.annotation-api</artifactId>
84-
<version>1.3.2</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.hamcrest</groupId>
88-
<artifactId>hamcrest-library</artifactId>
89-
<version>2.2</version>
90-
<scope>test</scope>
91-
</dependency>
92-
<dependency>
93-
<groupId>org.mockito</groupId>
94-
<artifactId>mockito-core</artifactId>
95-
<version>5.21.0</version>
96-
<scope>test</scope>
97-
</dependency>
98-
<dependency>
99-
<groupId>org.junit.jupiter</groupId>
100-
<artifactId>junit-jupiter-api</artifactId>
101-
<scope>test</scope>
102-
</dependency>
103-
<dependency>
104-
<groupId>org.springframework.integration</groupId>
105-
<artifactId>spring-integration-test</artifactId>
106-
<scope>test</scope>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.springframework.boot</groupId>
110-
<artifactId>spring-boot-starter-test</artifactId>
111-
<scope>test</scope>
112-
</dependency>
113-
<dependency>
114-
<groupId>org.springframework.grpc</groupId>
115-
<artifactId>spring-grpc-test</artifactId>
116-
<scope>test</scope>
117-
</dependency>
118-
<dependency>
119-
<groupId>org.springframework.grpc</groupId>
120-
<artifactId>spring-grpc-server-spring-boot-starter</artifactId>
121-
<scope>test</scope>
122-
</dependency>
123-
<dependency>
124-
<groupId>org.junit.jupiter</groupId>
125-
<artifactId>junit-jupiter-engine</artifactId>
126-
<scope>runtime</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.junit.platform</groupId>
130-
<artifactId>junit-platform-launcher</artifactId>
131-
<scope>runtime</scope>
132-
</dependency>
133-
</dependencies>
13463
<dependencyManagement>
13564
<dependencies>
65+
<dependency>
66+
<groupId>org.springframework.grpc</groupId>
67+
<artifactId>spring-grpc-dependencies</artifactId>
68+
<version>1.0.2</version>
69+
<type>pom</type>
70+
<scope>import</scope>
71+
</dependency>
13672
<dependency>
13773
<groupId>org.springframework.integration</groupId>
13874
<artifactId>spring-integration-jdbc</artifactId>
@@ -355,13 +291,6 @@
355291
<scope>import</scope>
356292
<type>pom</type>
357293
</dependency>
358-
<dependency>
359-
<groupId>org.springframework.grpc</groupId>
360-
<artifactId>spring-grpc-dependencies</artifactId>
361-
<version>1.0.2</version>
362-
<scope>import</scope>
363-
<type>pom</type>
364-
</dependency>
365294
<dependency>
366295
<groupId>org.junit</groupId>
367296
<artifactId>junit-bom</artifactId>
@@ -399,36 +328,76 @@
399328
</dependency>
400329
</dependencies>
401330
</dependencyManagement>
331+
<dependencies>
332+
<dependency>
333+
<groupId>org.springframework.boot</groupId>
334+
<artifactId>spring-boot-starter-integration</artifactId>
335+
<scope>runtime</scope>
336+
</dependency>
337+
<dependency>
338+
<groupId>org.springframework.grpc</groupId>
339+
<artifactId>spring-grpc-client-spring-boot-starter</artifactId>
340+
<scope>runtime</scope>
341+
</dependency>
342+
<dependency>
343+
<groupId>org.springframework.integration</groupId>
344+
<artifactId>spring-integration-grpc</artifactId>
345+
<scope>runtime</scope>
346+
</dependency>
347+
<dependency>
348+
<groupId>com.google.protobuf</groupId>
349+
<artifactId>protobuf-java</artifactId>
350+
<version>4.29.4</version>
351+
<scope>runtime</scope>
352+
</dependency>
353+
<dependency>
354+
<groupId>org.hamcrest</groupId>
355+
<artifactId>hamcrest-library</artifactId>
356+
<version>2.2</version>
357+
<scope>test</scope>
358+
</dependency>
359+
<dependency>
360+
<groupId>org.mockito</groupId>
361+
<artifactId>mockito-core</artifactId>
362+
<version>5.21.0</version>
363+
<scope>test</scope>
364+
</dependency>
365+
<dependency>
366+
<groupId>org.junit.jupiter</groupId>
367+
<artifactId>junit-jupiter-api</artifactId>
368+
<scope>test</scope>
369+
</dependency>
370+
<dependency>
371+
<groupId>org.springframework.integration</groupId>
372+
<artifactId>spring-integration-test</artifactId>
373+
<scope>test</scope>
374+
</dependency>
375+
<dependency>
376+
<groupId>org.springframework.boot</groupId>
377+
<artifactId>spring-boot-starter-test</artifactId>
378+
<scope>test</scope>
379+
</dependency>
380+
<dependency>
381+
<groupId>org.springframework.grpc</groupId>
382+
<artifactId>spring-grpc-test</artifactId>
383+
<scope>test</scope>
384+
</dependency>
385+
<dependency>
386+
<groupId>org.junit.jupiter</groupId>
387+
<artifactId>junit-jupiter-engine</artifactId>
388+
<scope>runtime</scope>
389+
</dependency>
390+
<dependency>
391+
<groupId>org.junit.platform</groupId>
392+
<artifactId>junit-platform-launcher</artifactId>
393+
<scope>runtime</scope>
394+
</dependency>
395+
</dependencies>
402396
<properties>
403397
<java.version>17</java.version>
404398
</properties>
405399
<build>
406-
<extensions>
407-
<extension>
408-
<groupId>kr.motd.maven</groupId>
409-
<artifactId>os-maven-plugin</artifactId>
410-
<version>1.7.1</version>
411-
</extension>
412-
</extensions>
413400
<plugins>
414-
<plugin>
415-
<groupId>org.xolstice.maven.plugins</groupId>
416-
<artifactId>protobuf-maven-plugin</artifactId>
417-
<version>0.6.1</version>
418-
<configuration>
419-
<protocArtifact>com.google.protobuf:protoc:4.29.4:exe:${os.detected.classifier}</protocArtifact>
420-
<pluginId>grpc-java</pluginId>
421-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.70.0:exe:${os.detected.classifier}</pluginArtifact>
422-
</configuration>
423-
<executions>
424-
<execution>
425-
<goals>
426-
<goal>compile</goal>
427-
<goal>compile-custom</goal>
428-
</goals>
429-
</execution>
430-
</executions>
431-
</plugin>
432401
<plugin>
433402
<groupId>org.springframework.boot</groupId>
434403
<artifactId>spring-boot-maven-plugin</artifactId>

‎build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ subprojects { subproject ->
353353
mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion"
354354
mavenBom "tools.jackson:jackson-bom:$jackson3Version"
355355
mavenBom "org.junit:junit-bom:$junitJupiterVersion"
356-
mavenBom "org.springframework.grpc:spring-grpc-dependencies:$springGrpc"
357356
}
358357
}
359358

@@ -575,8 +574,7 @@ project('barrier') {
575574
dependencies {
576575
api 'org.springframework.boot:spring-boot-starter-web'
577576
api 'org.springframework.boot:spring-boot-starter-integration'
578-
// TODO remove the version when boot bom is updated
579-
api 'org.springframework.boot:spring-boot-starter-rabbitmq:4.1.0-SNAPSHOT'
577+
api 'org.springframework.boot:spring-boot-starter-amqp'
580578
api 'org.springframework.integration:spring-integration-amqp'
581579
api 'org.springframework.integration:spring-integration-http'
582580

@@ -889,6 +887,7 @@ project('grpc-client') {
889887
apply plugin: 'com.google.protobuf'
890888

891889
dependencies {
890+
implementation platform("org.springframework.grpc:spring-grpc-dependencies:$springGrpc")
892891
implementation 'org.springframework.boot:spring-boot-starter-integration'
893892
implementation "org.springframework.grpc:spring-grpc-client-spring-boot-starter"
894893
implementation 'org.springframework.integration:spring-integration-grpc'

0 commit comments

Comments
 (0)