Skip to content

Commit ddbe9d7

Browse files
pkwarrendependabot[bot]
pkwarren
and
dependabot[bot]
authored
Update Maven dependencies (#1218)
Update Maven dependencies to the latest. Add Guava as a compile dependency. Clean up build to use dependency management. Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent c220710 commit ddbe9d7

File tree

7 files changed

+159
-200
lines changed

7 files changed

+159
-200
lines changed

‎.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ __pycache__/
3939
/tests/harness/cases/**/*.h
4040

4141
/java/.idea
42-
/java/**/.project
42+
/java/**/*.class
4343
/java/**/*.iml
44+
/java/**/.project
45+
/java/**/dependency-reduced-pom.xml
4446
/java/**/target
45-
/java/**/*.class
4647
.vscode
4748
.project
4849
.classpath

‎java/pgv-java-grpc/pom.xml

+27-22
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,60 @@
1010
<artifactId>pgv-java-grpc</artifactId>
1111
<name>PGV-Java gRPC Interceptors</name>
1212

13-
<dependencyManagement>
14-
<dependencies>
15-
<dependency>
16-
<groupId>io.grpc</groupId>
17-
<artifactId>grpc-bom</artifactId>
18-
<version>${grpc.version}</version>
19-
<type>pom</type>
20-
<scope>import</scope>
21-
</dependency>
22-
</dependencies>
23-
</dependencyManagement>
24-
2513
<dependencies>
2614
<dependency>
2715
<groupId>com.google.api.grpc</groupId>
2816
<artifactId>proto-google-common-protos</artifactId>
29-
<version>${proto-google-common-protos.version}</version>
3017
</dependency>
3118
<dependency>
32-
<groupId>io.grpc</groupId>
33-
<artifactId>grpc-core</artifactId>
19+
<groupId>com.google.protobuf</groupId>
20+
<artifactId>protobuf-java</artifactId>
3421
</dependency>
3522
<dependency>
3623
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-testing</artifactId>
38-
<scope>test</scope>
24+
<artifactId>grpc-api</artifactId>
3925
</dependency>
4026
<dependency>
4127
<groupId>io.grpc</groupId>
4228
<artifactId>grpc-protobuf</artifactId>
4329
</dependency>
30+
<dependency>
31+
<groupId>com.google.guava</groupId>
32+
<artifactId>guava</artifactId>
33+
<scope>runtime</scope>
34+
</dependency>
4435
<dependency>
4536
<groupId>io.grpc</groupId>
4637
<artifactId>grpc-stub</artifactId>
4738
<scope>test</scope>
4839
</dependency>
4940
<dependency>
50-
<groupId>javax.annotation</groupId>
51-
<artifactId>javax.annotation-api</artifactId>
52-
<version>1.3.2</version>
41+
<groupId>io.grpc</groupId>
42+
<artifactId>grpc-testing</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>io.grpc</groupId>
47+
<artifactId>grpc-util</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>junit</groupId>
52+
<artifactId>junit</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.assertj</groupId>
57+
<artifactId>assertj-core</artifactId>
5358
<scope>test</scope>
5459
</dependency>
5560
<!-- Depend on artifacts to ensure they are built before this module -->
5661
<dependency>
5762
<groupId>build.buf.protoc-gen-validate</groupId>
5863
<artifactId>protoc-gen-validate</artifactId>
5964
<version>${project.version}</version>
60-
<type>pom</type>
65+
<classifier>${os.detected.classifier}</classifier>
66+
<type>exe</type>
6167
<scope>test</scope>
6268
</dependency>
6369
<dependency>
@@ -67,7 +73,6 @@
6773
</dependency>
6874
</dependencies>
6975

70-
7176
<build>
7277
<extensions>
7378
<extension>

‎java/pgv-java-stub/pom.xml

+16-5
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
<name>PGV-Java Stubs</name>
1212

1313
<dependencies>
14+
<dependency>
15+
<groupId>com.google.guava</groupId>
16+
<artifactId>guava</artifactId>
17+
</dependency>
1418
<dependency>
1519
<groupId>com.google.re2j</groupId>
1620
<artifactId>re2j</artifactId>
17-
<version>${re2j.version}</version>
1821
</dependency>
1922
<dependency>
2023
<groupId>commons-validator</groupId>
@@ -30,19 +33,27 @@
3033
<dependency>
3134
<groupId>com.google.protobuf</groupId>
3235
<artifactId>protobuf-java</artifactId>
33-
<version>${google.protobuf.version}</version>
3436
</dependency>
3537
<dependency>
3638
<groupId>com.google.protobuf</groupId>
3739
<artifactId>protobuf-java-util</artifactId>
38-
<version>${google.protobuf.version}</version>
3940
</dependency>
40-
<!-- Depend on artifacts to ensure they are built before this module -->
4141
<dependency>
4242
<groupId>build.buf.protoc-gen-validate</groupId>
4343
<artifactId>protoc-gen-validate</artifactId>
4444
<version>${project.version}</version>
45-
<type>pom</type>
45+
<classifier>${os.detected.classifier}</classifier>
46+
<type>exe</type>
47+
<scope>test</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>junit</groupId>
51+
<artifactId>junit</artifactId>
52+
<scope>test</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.assertj</groupId>
56+
<artifactId>assertj-core</artifactId>
4657
<scope>test</scope>
4758
</dependency>
4859
</dependencies>

‎java/pgv-java-validation/dependency-reduced-pom.xml

-142
This file was deleted.

‎java/pgv-java-validation/pom.xml

+25-2
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,41 @@
2121
<version>${project.version}</version>
2222
</dependency>
2323

24+
<dependency>
25+
<groupId>com.google.guava</groupId>
26+
<artifactId>guava</artifactId>
27+
</dependency>
2428
<dependency>
2529
<groupId>com.google.protobuf</groupId>
2630
<artifactId>protobuf-java</artifactId>
27-
<version>${google.protobuf.version}</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>com.google.protobuf</groupId>
34+
<artifactId>protobuf-java-util</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>com.google.re2j</groupId>
38+
<artifactId>re2j</artifactId>
2839
</dependency>
2940

3041
<!-- Depend on artifacts to ensure they are built before this module -->
3142
<dependency>
3243
<groupId>build.buf.protoc-gen-validate</groupId>
3344
<artifactId>protoc-gen-validate</artifactId>
3445
<version>${project.version}</version>
35-
<type>pom</type>
46+
<classifier>${os.detected.classifier}</classifier>
47+
<scope>test</scope>
48+
<type>exe</type>
49+
</dependency>
50+
<dependency>
51+
<groupId>junit</groupId>
52+
<artifactId>junit</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.assertj</groupId>
57+
<artifactId>assertj-core</artifactId>
58+
<scope>test</scope>
3659
</dependency>
3760
</dependencies>
3861

‎java/pgv-test-coverage-report/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,21 @@
3535
</dependencies>
3636
<build>
3737
<plugins>
38+
<plugin>
39+
<groupId>org.apache.maven.plugins</groupId>
40+
<artifactId>maven-dependency-plugin</artifactId>
41+
<version>3.8.1</version>
42+
<executions>
43+
<execution>
44+
<id>analyze</id>
45+
<goals>
46+
<goal>analyze-only</goal>
47+
</goals>
48+
<!-- Disable dependency analysis for test coverage module -->
49+
<phase>none</phase>
50+
</execution>
51+
</executions>
52+
</plugin>
3853
<plugin>
3954
<groupId>org.jacoco</groupId>
4055
<artifactId>jacoco-maven-plugin</artifactId>

0 commit comments

Comments
 (0)