Skip to content

Commit c856f71

Browse files
onobcdsyer
onobc
authored and
dsyer
committed
Clean up dependencies and versions
This commit does the following: - Update various dependencies to latest patch versions - Remove unused dependencies - Remove unused version properties - Remove Spring Boot references in all modules except autoconfigure and samples
1 parent 118e176 commit c856f71

File tree

7 files changed

+52
-94
lines changed

7 files changed

+52
-94
lines changed

‎pom.xml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,15 @@
7474
<maven.compiler.target>17</maven.compiler.target>
7575

7676
<!-- production dependencies -->
77-
<spring-cloud-function-context.version>4.1.3</spring-cloud-function-context.version>
78-
<spring-boot.version>3.3.3</spring-boot.version>
79-
<spring-framework.version>6.1.4</spring-framework.version>
77+
<spring-framework.version>6.1.14</spring-framework.version>
78+
<netty.version>4.1.113.Final</netty.version>
79+
<protobuf-java.version>3.25.5</protobuf-java.version>
80+
<grpc.version>1.63.2</grpc.version>
8081

81-
<!-- Protobuf -->
82-
<protobuf-java.version>3.25.2</protobuf-java.version>
83-
<grpc.version>1.63.0</grpc.version>
84-
85-
<!-- testing dependencies -->
86-
<httpclient5.version>5.3.1</httpclient5.version>
87-
88-
<!-- testing dependencies -->
89-
<testcontainers.version>1.20.1</testcontainers.version>
90-
<testcontainers.opensearch.version>2.0.1</testcontainers.opensearch.version>
82+
<!-- internal dependencies -->
83+
<spring-boot.version>3.3.4</spring-boot.version>
84+
<jackson.version>2.17.2</jackson.version>
85+
<junit.version>5.10.5</junit.version>
9186

9287
<!-- documentation dependencies -->
9388
<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
@@ -382,9 +377,16 @@
382377
<dependencyManagement>
383378
<dependencies>
384379
<dependency>
385-
<groupId>org.springframework.boot</groupId>
386-
<artifactId>spring-boot-dependencies</artifactId>
387-
<version>${spring-boot.version}</version>
380+
<groupId>org.springframework</groupId>
381+
<artifactId>spring-framework-bom</artifactId>
382+
<version>${spring-framework.version}</version>
383+
<type>pom</type>
384+
<scope>import</scope>
385+
</dependency>
386+
<dependency>
387+
<groupId>io.netty</groupId>
388+
<artifactId>netty-bom</artifactId>
389+
<version>${netty.version}</version>
388390
<type>pom</type>
389391
<scope>import</scope>
390392
</dependency>
@@ -463,4 +465,4 @@
463465
</plugins>
464466
</reporting>
465467

466-
</project>
468+
</project>

‎samples/grpc-server/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencyManagement {
2929
}
3030

3131
dependencies {
32-
implementation 'org.springframework.grpc:spring-grpc-spring-boot-autoconfigure:0.1.0-SNAPSHOT'
32+
implementation 'org.springframework.grpc:spring-grpc-spring-boot-autoconfigure'
3333
implementation 'io.grpc:grpc-services'
3434
testImplementation 'org.springframework.boot:spring-boot-starter-test'
3535
testImplementation 'org.springframework.grpc:spring-grpc-test'
@@ -55,4 +55,4 @@ protobuf {
5555
grpc {}
5656
}
5757
}
58-
}
58+
}

‎samples/grpc-server/pom.xml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.3.3</version>
9+
<version>3.3.4</version>
1010
<relativePath /> <!-- lookup parent from repository -->
1111
</parent>
1212
<groupId>org.springframework.grpc</groupId>
@@ -30,22 +30,15 @@
3030
<properties>
3131
<java.version>17</java.version>
3232
<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
33-
<protobuf-java.version>3.25.2</protobuf-java.version>
34-
<grpc.version>1.63.0</grpc.version>
33+
<protobuf-java.version>3.25.5</protobuf-java.version>
34+
<grpc.version>1.63.2</grpc.version>
3535
</properties>
3636
<dependencyManagement>
3737
<dependencies>
3838
<dependency>
3939
<groupId>org.springframework.grpc</groupId>
4040
<artifactId>spring-grpc-bom</artifactId>
41-
<version>0.1.0-SNAPSHOT</version>
42-
<type>pom</type>
43-
<scope>import</scope>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.springframework.grpc</groupId>
47-
<artifactId>spring-grpc</artifactId>
48-
<version>0.1.0-SNAPSHOT</version>
41+
<version>${project.version}</version>
4942
<type>pom</type>
5043
<scope>import</scope>
5144
</dependency>
@@ -60,7 +53,6 @@
6053
<groupId>io.grpc</groupId>
6154
<artifactId>grpc-services</artifactId>
6255
</dependency>
63-
6456
<dependency>
6557
<groupId>org.springframework.boot</groupId>
6658
<artifactId>spring-boot-starter-test</artifactId>
@@ -185,4 +177,4 @@
185177
</pluginRepositories>
186178

187179

188-
</project>
180+
</project>

‎spring-grpc-core/pom.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
</scm>
2222

2323
<dependencies>
24-
2524
<dependency>
2625
<groupId>org.springframework</groupId>
2726
<artifactId>spring-context</artifactId>
@@ -54,14 +53,14 @@
5453
<version>1.3.2</version>
5554
</dependency>
5655

57-
<!-- test dependencies -->
5856
<dependency>
59-
<groupId>org.springframework.boot</groupId>
60-
<artifactId>spring-boot-starter-test</artifactId>
57+
<groupId>org.junit.jupiter</groupId>
58+
<artifactId>junit-jupiter</artifactId>
59+
<version>${junit.version}</version>
6160
<scope>test</scope>
6261
</dependency>
6362

6463
</dependencies>
6564

6665

67-
</project>
66+
</project>

‎spring-grpc-docs/pom.xml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,14 @@
2020
<!-- Dependencies used to build the config props doc generator -->
2121
<dependencies>
2222
<dependency>
23-
<groupId>org.springframework</groupId>
24-
<artifactId>spring-core</artifactId>
23+
<groupId>org.springframework.grpc</groupId>
24+
<artifactId>spring-grpc-spring-boot-autoconfigure</artifactId>
25+
<version>${project.version}</version>
2526
</dependency>
2627
<dependency>
2728
<groupId>com.fasterxml.jackson.core</groupId>
2829
<artifactId>jackson-databind</artifactId>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.springframework.grpc</groupId>
32-
<artifactId>spring-grpc-spring-boot-autoconfigure</artifactId>
33-
<version>${project.version}</version>
30+
<version>${jackson.version}</version>
3431
</dependency>
3532
</dependencies>
3633
<build>

‎spring-grpc-spring-boot-autoconfigure/pom.xml‎

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,79 +20,59 @@
2020
<developerConnection>[email protected]:spring-projects-experimental/spring-grpc.git</developerConnection>
2121
</scm>
2222

23-
<dependencies>
23+
<dependencyManagement>
24+
<dependencies>
25+
<dependency>
26+
<groupId>org.springframework.boot</groupId>
27+
<artifactId>spring-boot-dependencies</artifactId>
28+
<version>${spring-boot.version}</version>
29+
<type>pom</type>
30+
<scope>import</scope>
31+
</dependency>
32+
</dependencies>
33+
</dependencyManagement>
2434

35+
<dependencies>
2536
<dependency>
2637
<groupId>org.springframework.boot</groupId>
2738
<artifactId>spring-boot-configuration-processor</artifactId>
2839
<optional>true</optional>
2940
</dependency>
3041

31-
<dependency>
32-
<groupId>com.google.protobuf</groupId>
33-
<artifactId>protobuf-java</artifactId>
34-
<version>${protobuf-java.version}</version>
35-
<optional>true</optional>
36-
</dependency>
37-
3842
<!-- production dependencies -->
39-
4043
<dependency>
4144
<groupId>org.springframework.grpc</groupId>
4245
<artifactId>spring-grpc-core</artifactId>
4346
<version>${project.parent.version}</version>
4447
</dependency>
45-
4648
<dependency>
4749
<groupId>org.springframework.boot</groupId>
4850
<artifactId>spring-boot-starter</artifactId>
4951
</dependency>
50-
5152
<dependency>
5253
<groupId>io.grpc</groupId>
5354
<artifactId>grpc-netty-shaded</artifactId>
5455
<optional>true</optional>
5556
</dependency>
57+
<dependency>
58+
<groupId>com.google.protobuf</groupId>
59+
<artifactId>protobuf-java</artifactId>
60+
<optional>true</optional>
61+
</dependency>
5662

5763
<!-- test dependencies -->
58-
5964
<dependency>
6065
<groupId>org.springframework.grpc</groupId>
6166
<artifactId>spring-grpc-test</artifactId>
6267
<version>${project.parent.version}</version>
6368
<scope>test</scope>
6469
</dependency>
65-
6670
<dependency>
6771
<groupId>org.springframework.boot</groupId>
6872
<artifactId>spring-boot-starter-test</artifactId>
6973
<scope>test</scope>
7074
</dependency>
7175

72-
<dependency>
73-
<groupId>org.springframework.boot</groupId>
74-
<artifactId>spring-boot-testcontainers</artifactId>
75-
<scope>test</scope>
76-
</dependency>
77-
78-
<dependency>
79-
<groupId>org.testcontainers</groupId>
80-
<artifactId>testcontainers</artifactId>
81-
<scope>test</scope>
82-
</dependency>
83-
84-
<dependency>
85-
<groupId>org.awaitility</groupId>
86-
<artifactId>awaitility</artifactId>
87-
<scope>test</scope>
88-
</dependency>
89-
90-
<dependency>
91-
<groupId>io.micrometer</groupId>
92-
<artifactId>micrometer-observation-test</artifactId>
93-
<scope>test</scope>
94-
</dependency>
95-
9676
</dependencies>
9777

9878
</project>

‎spring-grpc-test/pom.xml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
</properties>
2727

2828
<dependencies>
29-
3029
<dependency>
3130
<groupId>org.springframework.grpc</groupId>
3231
<artifactId>spring-grpc-core</artifactId>
@@ -36,16 +35,5 @@
3635
<groupId>io.grpc</groupId>
3736
<artifactId>grpc-testing</artifactId>
3837
</dependency>
39-
40-
<dependency>
41-
<groupId>org.springframework.boot</groupId>
42-
<artifactId>spring-boot-starter-test</artifactId>
43-
<exclusions>
44-
<exclusion>
45-
<groupId>com.vaadin.external.google</groupId>
46-
<artifactId>android-json</artifactId>
47-
</exclusion>
48-
</exclusions>
49-
</dependency>
5038
</dependencies>
51-
</project>
39+
</project>

0 commit comments

Comments
 (0)