Skip to content

Commit

Permalink
Remove unused pom.xml files.
Browse files Browse the repository at this point in the history
We mostly use generated pom files in our release currently, so we can delete all the files that aren't used and the tools to update them.

Note, java/bom/pom.xml java/pom.xml and java/protoc/pom.xml are all still used at release and java/kotlin/pom.xml is used for documentation so all of those need to stay for now.

PiperOrigin-RevId: 659664012
  • Loading branch information
deannagarcia authored and zhangskz committed Aug 5, 2024
1 parent 6a7e215 commit aaf5f79
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 942 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/test_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ jobs:
bash: |
set -ex
bazel build //java:release
mvn install:install-file -Dfile=java/bom/pom.xml -DpomFile=java/bom/pom.xml
mvn install:install-file -Dfile=java/pom.xml -DpomFile=java/pom.xml
mvn install:install-file -Dfile=bazel-bin/java/core/core_mvn-project.jar -DpomFile=bazel-bin/java/core/core_mvn-pom.xml
mvn install:install-file -Dfile=bazel-bin/java/core/lite_mvn-project.jar -DpomFile=bazel-bin/java/core/lite_mvn-pom.xml
mvn install:install-file -Dfile=bazel-bin/java/kotlin-lite/kotlin-lite_mvn-project.jar -DpomFile=bazel-bin/java/kotlin-lite/kotlin-lite_mvn-pom.xml
Expand All @@ -95,7 +97,3 @@ jobs:
- name: Clean up
run: |
sudo rm -rf _build
- name: Validate Protobuf BOM
uses: googleapis/java-cloud-bom/tests/validate-bom@fd56f04bb0bc581776a74031591f0b3bc5e7920a # v26.13.0
with:
bom-path: java/bom/pom.xml
3 changes: 0 additions & 3 deletions java/core/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ load("//java/internal:testing.bzl", "junit_tests")
load("//upb/cmake:build_defs.bzl", "staleness_test")

LITE_SRCS = [
# Keep in sync with `//java/lite:pom.xml`.
"src/main/java/com/google/protobuf/AbstractMessageLite.java",
"src/main/java/com/google/protobuf/AbstractParser.java",
"src/main/java/com/google/protobuf/AbstractProtobufList.java",
Expand Down Expand Up @@ -523,7 +522,6 @@ protobuf_java_library(
)

LITE_TEST_EXCLUSIONS = [
# Keep in sync with //java/lite:pom.xml id=copy-test-source-files execution.
"src/test/java/com/google/protobuf/AbstractMessageTest.java",
"src/test/java/com/google/protobuf/AbstractProto2SchemaTest.java",
"src/test/java/com/google/protobuf/AnyTest.java",
Expand Down Expand Up @@ -602,7 +600,6 @@ pkg_files(
"BUILD.bazel",
"generate-sources-build.xml",
"generate-test-sources-build.xml",
"pom.xml",
"pom_template.xml",
],
strip_prefix = strip_prefix.from_root(""),
Expand Down
164 changes: 0 additions & 164 deletions java/core/pom.xml

This file was deleted.

1 change: 0 additions & 1 deletion java/kotlin-lite/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ pkg_files(
"generate-sources-build.xml",
"generate-test-sources-build.xml",
"lite.awk",
"pom.xml",
"pom_template.xml",
"process-lite-sources-build.xml",
],
Expand Down
Loading

0 comments on commit aaf5f79

Please sign in to comment.