Skip to content

Commit f5ffaf9

Browse files
deannagarciacopybara-github
authored andcommitted
Remove unused pom.xml files.
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
1 parent 0f02d84 commit f5ffaf9

File tree

9 files changed

+2
-942
lines changed

9 files changed

+2
-942
lines changed

.github/workflows/test_java.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ jobs:
9797
bash: |
9898
set -ex
9999
bazel build //java:release
100+
mvn install:install-file -Dfile=java/bom/pom.xml -DpomFile=java/bom/pom.xml
101+
mvn install:install-file -Dfile=java/pom.xml -DpomFile=java/pom.xml
100102
mvn install:install-file -Dfile=bazel-bin/java/core/core_mvn-project.jar -DpomFile=bazel-bin/java/core/core_mvn-pom.xml
101103
mvn install:install-file -Dfile=bazel-bin/java/core/lite_mvn-project.jar -DpomFile=bazel-bin/java/core/lite_mvn-pom.xml
102104
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
@@ -105,7 +107,3 @@ jobs:
105107
- name: Clean up
106108
run: |
107109
sudo rm -rf _build
108-
- name: Validate Protobuf BOM
109-
uses: googleapis/java-cloud-bom/tests/validate-bom@fd56f04bb0bc581776a74031591f0b3bc5e7920a # v26.13.0
110-
with:
111-
bom-path: java/bom/pom.xml

java/core/BUILD.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ load("//java/internal:testing.bzl", "junit_tests")
1313
load("//upb/cmake:build_defs.bzl", "staleness_test")
1414

1515
LITE_SRCS = [
16-
# Keep in sync with `//java/lite:pom.xml`.
1716
"src/main/java/com/google/protobuf/AbstractMessageLite.java",
1817
"src/main/java/com/google/protobuf/AbstractParser.java",
1918
"src/main/java/com/google/protobuf/AbstractProtobufList.java",
@@ -523,7 +522,6 @@ protobuf_java_library(
523522
)
524523

525524
LITE_TEST_EXCLUSIONS = [
526-
# Keep in sync with //java/lite:pom.xml id=copy-test-source-files execution.
527525
"src/test/java/com/google/protobuf/AbstractMessageTest.java",
528526
"src/test/java/com/google/protobuf/AbstractProto2SchemaTest.java",
529527
"src/test/java/com/google/protobuf/AnyTest.java",
@@ -602,7 +600,6 @@ pkg_files(
602600
"BUILD.bazel",
603601
"generate-sources-build.xml",
604602
"generate-test-sources-build.xml",
605-
"pom.xml",
606603
"pom_template.xml",
607604
],
608605
strip_prefix = strip_prefix.from_root(""),

java/core/pom.xml

Lines changed: 0 additions & 164 deletions
This file was deleted.

java/kotlin-lite/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ pkg_files(
233233
"generate-sources-build.xml",
234234
"generate-test-sources-build.xml",
235235
"lite.awk",
236-
"pom.xml",
237236
"pom_template.xml",
238237
"process-lite-sources-build.xml",
239238
],

0 commit comments

Comments
 (0)