diff --git a/.gitignore b/.gitignore
index 4229c3a5a..d6f7c6dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/java/pgv-java-grpc/pom.xml b/java/pgv-java-grpc/pom.xml
index 3de173c43..d4fab1ef6 100644
--- a/java/pgv-java-grpc/pom.xml
+++ b/java/pgv-java-grpc/pom.xml
@@ -10,46 +10,51 @@
pgv-java-grpc
PGV-Java gRPC Interceptors
-
-
-
- io.grpc
- grpc-bom
- ${grpc.version}
- pom
- import
-
-
-
-
com.google.api.grpc
proto-google-common-protos
- ${proto-google-common-protos.version}
- io.grpc
- grpc-core
+ com.google.protobuf
+ protobuf-java
io.grpc
- grpc-testing
- test
+ grpc-api
io.grpc
grpc-protobuf
+
+ com.google.guava
+ guava
+ runtime
+
io.grpc
grpc-stub
test
- javax.annotation
- javax.annotation-api
- 1.3.2
+ io.grpc
+ grpc-testing
+ test
+
+
+ io.grpc
+ grpc-util
+ test
+
+
+ junit
+ junit
+ test
+
+
+ org.assertj
+ assertj-core
test
@@ -57,7 +62,8 @@
build.buf.protoc-gen-validate
protoc-gen-validate
${project.version}
- pom
+ ${os.detected.classifier}
+ exe
test
@@ -67,7 +73,6 @@
-
diff --git a/java/pgv-java-stub/pom.xml b/java/pgv-java-stub/pom.xml
index e36f462d6..7f988d23b 100644
--- a/java/pgv-java-stub/pom.xml
+++ b/java/pgv-java-stub/pom.xml
@@ -11,10 +11,13 @@
PGV-Java Stubs
+
+ com.google.guava
+ guava
+
com.google.re2j
re2j
- ${re2j.version}
commons-validator
@@ -30,19 +33,27 @@
com.google.protobuf
protobuf-java
- ${google.protobuf.version}
com.google.protobuf
protobuf-java-util
- ${google.protobuf.version}
-
build.buf.protoc-gen-validate
protoc-gen-validate
${project.version}
- pom
+ ${os.detected.classifier}
+ exe
+ test
+
+
+ junit
+ junit
+ test
+
+
+ org.assertj
+ assertj-core
test
diff --git a/java/pgv-java-validation/dependency-reduced-pom.xml b/java/pgv-java-validation/dependency-reduced-pom.xml
deleted file mode 100644
index 814a3f3ae..000000000
--- a/java/pgv-java-validation/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
- pgv-java
- build.buf.protoc-gen-validate
- VERSION
-
- 4.0.0
- pgv-java-validation
- PGV-Java Validation Harness
-
-
-
- kr.motd.maven
- os-maven-plugin
- 1.7.1
-
-
-
-
- org.xolstice.maven.plugins
- protobuf-maven-plugin
- ${protobuf.maven.plugin.version}
-
-
- protoc-java
-
- compile
-
-
- ../../
-
- tests/harness/harness.proto
- tests/harness/cases/*.proto
- tests/harness/cases/other_package/*.proto
- tests/harness/cases/yet_another_package/*.proto
- tests/harness/cases/sort/*.proto
-
-
-
-
- protoc-java-pgv
-
- compile-custom
-
-
- ../../
- lang=java
-
- tests/harness/cases/*.proto
- tests/harness/cases/other_package/*.proto
- tests/harness/cases/yet_another_package/*.proto
-
- java-pgv
- build.buf.protoc-gen-validate:protoc-gen-validate:${project.version}:exe:${os.detected.classifier}
-
-
-
-
- com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}
-
-
-
- maven-shade-plugin
- 3.5.1
-
-
- package
-
- shade
-
-
- java-harness
-
-
-
- io.envoyproxy.pgv.validation.JavaHarness
-
-
-
-
-
-
-
-
- org.jacoco
- jacoco-maven-plugin
- 0.8.10
-
-
-
- prepare-agent
-
-
-
- report
- prepare-package
-
- report
-
-
-
-
-
-
-
-
- build.buf.protoc-gen-validate
- protoc-gen-validate
- VERSION
- pom
- compile
-
-
- junit
- junit
- 4.13.2
- test
-
-
- hamcrest-core
- org.hamcrest
-
-
-
-
- org.assertj
- assertj-core
- 3.24.2
- test
-
-
- byte-buddy
- net.bytebuddy
-
-
-
-
-
- true
-
-
diff --git a/java/pgv-java-validation/pom.xml b/java/pgv-java-validation/pom.xml
index dc9745474..1f698ad96 100644
--- a/java/pgv-java-validation/pom.xml
+++ b/java/pgv-java-validation/pom.xml
@@ -21,10 +21,21 @@
${project.version}
+
+ com.google.guava
+ guava
+
com.google.protobuf
protobuf-java
- ${google.protobuf.version}
+
+
+ com.google.protobuf
+ protobuf-java-util
+
+
+ com.google.re2j
+ re2j
@@ -32,7 +43,19 @@
build.buf.protoc-gen-validate
protoc-gen-validate
${project.version}
- pom
+ ${os.detected.classifier}
+ test
+ exe
+
+
+ junit
+ junit
+ test
+
+
+ org.assertj
+ assertj-core
+ test
diff --git a/java/pgv-test-coverage-report/pom.xml b/java/pgv-test-coverage-report/pom.xml
index 244a895ce..812d39eed 100644
--- a/java/pgv-test-coverage-report/pom.xml
+++ b/java/pgv-test-coverage-report/pom.xml
@@ -35,6 +35,21 @@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.8.1
+
+
+ analyze
+
+ analyze-only
+
+
+ none
+
+
+
org.jacoco
jacoco-maven-plugin
diff --git a/java/pom.xml b/java/pom.xml
index b879c2370..b37174f64 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -27,45 +27,71 @@
-
-
- elliotmjackson
- Elliot Jackson
- ejackson@buf.build
-
-
-
UTF-8
3.22.2
- 4.28.3
+ 33.3.1-android
+ 4.29.2
0.6.1
1.7
1.9.0
- 1.68.1
+ 1.69.0
4.13.2
- 3.26.3
+ 3.27.2
8
1.8
- 2.49.0
+ 2.50.0
-
-
- junit
- junit
- ${junit.version}
- test
-
-
- org.assertj
- assertj-core
- ${assertj.version}
- test
-
-
+
+
+
+ com.google.protobuf
+ protobuf-bom
+ ${google.protobuf.version}
+ import
+ pom
+
+
+ io.grpc
+ grpc-bom
+ ${grpc.version}
+ pom
+ import
+
+
+
+ com.google.api.grpc
+ proto-google-common-protos
+ ${proto-google-common-protos.version}
+
+
+ com.google.guava
+ guava
+ ${google.guava.version}
+
+
+ com.google.re2j
+ re2j
+ ${re2j.version}
+
+
+
+ junit
+ junit
+ ${junit.version}
+ test
+
+
+ org.assertj
+ assertj-core
+ ${assertj.version}
+ test
+
+
+
@@ -81,6 +107,26 @@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.8.1
+
+
+ analyze
+
+ analyze-only
+
+
+ true
+
+ build.buf.protoc-gen-validate:protoc-gen-validate
+
+
+
+
+
+
org.apache.maven.plugins
maven-surefire-plugin
@@ -93,7 +139,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.11.1
+ 3.11.2
false
true