Skip to content

Commit

Permalink
Update Maven dependencies (#1218)
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@pkwarren @dependabot
pkwarren and dependabot[bot] authored Jan 6, 2025
1 parent c220710 commit ddbe9d7
Show file tree
Hide file tree
Showing 7 changed files with 159 additions and 200 deletions.
5 changes: 3 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ __pycache__/
/tests/harness/cases/**/*.h

/java/.idea
/java/**/.project
/java/**/*.class
/java/**/*.iml
/java/**/.project
/java/**/dependency-reduced-pom.xml
/java/**/target
/java/**/*.class
.vscode
.project
.classpath
Expand Down
49 changes: 27 additions & 22 deletions java/pgv-java-grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,54 +10,60 @@
<artifactId>pgv-java-grpc</artifactId>
<name>PGV-Java gRPC Interceptors</name>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>${proto-google-common-protos.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<scope>test</scope>
<artifactId>grpc-api</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<!-- Depend on artifacts to ensure they are built before this module -->
<dependency>
<groupId>build.buf.protoc-gen-validate</groupId>
<artifactId>protoc-gen-validate</artifactId>
<version>${project.version}</version>
<type>pom</type>
<classifier>${os.detected.classifier}</classifier>
<type>exe</type>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -67,7 +73,6 @@
</dependency>
</dependencies>


<build>
<extensions>
<extension>
Expand Down
21 changes: 16 additions & 5 deletions java/pgv-java-stub/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@
<name>PGV-Java Stubs</name>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
<version>${re2j.version}</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
Expand All @@ -30,19 +33,27 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${google.protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${google.protobuf.version}</version>
</dependency>
<!-- Depend on artifacts to ensure they are built before this module -->
<dependency>
<groupId>build.buf.protoc-gen-validate</groupId>
<artifactId>protoc-gen-validate</artifactId>
<version>${project.version}</version>
<type>pom</type>
<classifier>${os.detected.classifier}</classifier>
<type>exe</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
142 changes: 0 additions & 142 deletions java/pgv-java-validation/dependency-reduced-pom.xml
View file

This file was deleted.

27 changes: 25 additions & 2 deletions java/pgv-java-validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,41 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${google.protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
</dependency>

<!-- Depend on artifacts to ensure they are built before this module -->
<dependency>
<groupId>build.buf.protoc-gen-validate</groupId>
<artifactId>protoc-gen-validate</artifactId>
<version>${project.version}</version>
<type>pom</type>
<classifier>${os.detected.classifier}</classifier>
<scope>test</scope>
<type>exe</type>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
15 changes: 15 additions & 0 deletions java/pgv-test-coverage-report/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.1</version>
<executions>
<execution>
<id>analyze</id>
<goals>
<goal>analyze-only</goal>
</goals>
<!-- Disable dependency analysis for test coverage module -->
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down
Loading

0 comments on commit ddbe9d7

Please sign in to comment.