diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml index bdf80c9865af..f7fdca95bb75 100644 --- a/.github/workflows/test_java.yml +++ b/.github/workflows/test_java.yml @@ -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 @@ -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 diff --git a/java/core/BUILD.bazel b/java/core/BUILD.bazel index d695ab0ad033..5bf52209a9c6 100644 --- a/java/core/BUILD.bazel +++ b/java/core/BUILD.bazel @@ -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", @@ -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", @@ -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(""), diff --git a/java/core/pom.xml b/java/core/pom.xml deleted file mode 100644 index ee75cf4674c8..000000000000 --- a/java/core/pom.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - 4.0.0 - - com.google.protobuf - protobuf-parent - 4.28.0 - - - protobuf-java - bundle - - Protocol Buffers [Core] - - Core Protocol Buffers library. Protocol Buffers are a way of encoding structured data in an - efficient yet extensible format. - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - com.google.guava - guava - test - - - com.google.truth - truth - test - - - - - - - - ${protobuf.source.dir} - - google/protobuf/any.proto - google/protobuf/api.proto - google/protobuf/descriptor.proto - google/protobuf/duration.proto - google/protobuf/empty.proto - google/protobuf/field_mask.proto - google/protobuf/source_context.proto - google/protobuf/struct.proto - google/protobuf/timestamp.proto - google/protobuf/type.proto - google/protobuf/wrappers.proto - google/protobuf/compiler/plugin.proto - - - - ${protobuf.java_source.dir} - - google/protobuf/java_features.proto - - - - - - ${protobuf.source.dir} - - google/protobuf/testdata/golden_message_oneof_implemented - google/protobuf/testdata/golden_packed_fields_message - - - - - - - - maven-antrun-plugin - - - - generate-sources - generate-sources - - - - - - - run - - - - - - generate-test-sources - generate-test-sources - - - - - - - run - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-generated-sources - generate-sources - - add-source - - - - ${generated.sources.dir} - - - - - add-generated-test-sources - generate-test-sources - - add-test-source - - - - ${generated.testsources.dir} - - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - com.google.protobuf - https://developers.google.com/protocol-buffers/ - com.google.protobuf - com.google.protobuf;version=${project.version} - sun.misc;resolution:=optional,* - - - - - - - diff --git a/java/kotlin-lite/BUILD.bazel b/java/kotlin-lite/BUILD.bazel index 362a8bf3051d..4d5577048580 100644 --- a/java/kotlin-lite/BUILD.bazel +++ b/java/kotlin-lite/BUILD.bazel @@ -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", ], diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml deleted file mode 100644 index 4435507fd63c..000000000000 --- a/java/kotlin-lite/pom.xml +++ /dev/null @@ -1,237 +0,0 @@ - - - 4.0.0 - - com.google.protobuf - protobuf-parent - 4.28.0 - - - protobuf-kotlin-lite - - Protocol Buffers [Kotlin-Lite] - - Lite version of Kotlin Protocol Buffers library. This version is optimized for code size, but does - not guarantee API/ABI stability. - - - - 1.6.0 - - - - - ${project.groupId} - protobuf-javalite - ${project.version} - - - junit - junit - test - - - org.mockito - mockito-core - test - - - com.google.guava - guava - test - - - com.google.guava - guava-testlib - test - - - com.google.truth - truth - test - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - - - - - - - ${protobuf.source.dir} - - google/protobuf/testdata/golden_message_oneof_implemented - google/protobuf/testdata/golden_packed_fields_message - - - - - - - maven-resources-plugin - 3.1.0 - - - copy-kotlin-source-files - generate-sources - - copy-resources - - - ${generated.sources.dir}/com/google/protobuf - - - ${basedir}/../kotlin/src/main/kotlin/com/google/protobuf - - ByteStrings.kt - DslList.kt - DslMap.kt - DslProxy.kt - ExtensionList.kt - OnlyForUseByGeneratedProtoCode.kt - ProtoDslMarker.kt - UnmodifiableCollections.kt - - - - - - - copy-test-source-files - generate-test-sources - - copy-resources - - - ${generated.testsources.dir}/com/google/protobuf - - - ${basedir}/../core/src/test/java/com/google/protobuf - - TestUtilLite.java - - - - - - - - - - - maven-antrun-plugin - - - - generate-sources - generate-sources - - - - - - - run - - - - - - generate-test-sources - generate-test-sources - - - - - - - run - - - - - process-lite-sources - generate-test-sources - - - - - - - run - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-generated-sources - generate-sources - - add-source - - - - ${generated.sources.dir} - - - - - - add-generated-test-sources - generate-test-sources - - add-test-source - - - - ${generated.testsources.dir} - - - - - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - true - - - compile - compile - - - ${project.basedir}/src/main/kotlin - ${generated.sources.dir} - - - - - test-compile - test-compile - - - ${project.basedir}/src/test/kotlin - ${generated.testsources.dir} - - - - - - - - diff --git a/java/lite/BUILD.bazel b/java/lite/BUILD.bazel index 68033946e986..f19cc38dd0a0 100644 --- a/java/lite/BUILD.bazel +++ b/java/lite/BUILD.bazel @@ -90,7 +90,6 @@ pkg_files( "generate-sources-build.xml", "generate-test-sources-build.xml", "lite.awk", - "pom.xml", "pom_template.xml", "process-lite-sources-build.xml", ], diff --git a/java/lite/pom.xml b/java/lite/pom.xml deleted file mode 100644 index d2da13084652..000000000000 --- a/java/lite/pom.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - 4.0.0 - - com.google.protobuf - protobuf-parent - 4.28.0 - - - protobuf-javalite - bundle - - Protocol Buffers [Lite] - - Lite version of Protocol Buffers library. This version is optimized for code size, but does - not guarantee API/ABI stability. - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - com.google.guava - guava - test - - - com.google.truth - truth - test - - - - - - - - ${protobuf.source.dir} - - google/protobuf/any.proto - google/protobuf/api.proto - google/protobuf/descriptor.proto - google/protobuf/duration.proto - google/protobuf/empty.proto - google/protobuf/field_mask.proto - google/protobuf/source_context.proto - google/protobuf/struct.proto - google/protobuf/timestamp.proto - google/protobuf/type.proto - google/protobuf/wrappers.proto - - - - ${protobuf.java_source.dir} - - google/protobuf/java_features.proto - - - - - - ${protobuf.source.dir} - - google/protobuf/testdata/golden_message_oneof_implemented - google/protobuf/testdata/golden_packed_fields_message - - - - - - - maven-resources-plugin - 3.1.0 - - - copy-source-files - generate-sources - - copy-resources - - - ${generated.sources.dir}/com/google/protobuf - - - ${basedir}/../core/src/main/java/com/google/protobuf - - - AbstractMessageLite.java - AbstractParser.java - AbstractProtobufList.java - AllocatedBuffer.java - Android.java - ArrayDecoders.java - BinaryReader.java - BinaryWriter.java - BooleanArrayList.java - BufferAllocator.java - ByteBufferWriter.java - ByteOutput.java - ByteString.java - CanIgnoreReturnValue.java - CheckReturnValue.java - CodedInputStream.java - CodedInputStreamReader.java - CodedOutputStream.java - CodedOutputStreamWriter.java - CompileTimeConstant.java - DoubleArrayList.java - ExperimentalApi.java - ExtensionLite.java - ExtensionRegistryFactory.java - ExtensionRegistryLite.java - ExtensionSchema.java - ExtensionSchemaLite.java - ExtensionSchemas.java - FieldInfo.java - FieldSet.java - FieldType.java - FloatArrayList.java - GeneratedMessageInfoFactory.java - GeneratedMessageLite.java - InlineMe.java - IntArrayList.java - Internal.java - InvalidProtocolBufferException.java - IterableByteBufferInputStream.java - Java8Compatibility.java - JavaType.java - LazyField.java - LazyFieldLite.java - LazyStringArrayList.java - LazyStringList.java - ListFieldSchema.java - ListFieldSchemaLite.java - ListFieldSchemas.java - LongArrayList.java - ManifestSchemaFactory.java - MapEntryLite.java - MapFieldLite.java - MapFieldSchema.java - MapFieldSchemaLite.java - MapFieldSchemas.java - MessageInfo.java - MessageInfoFactory.java - MessageLite.java - MessageLiteOrBuilder.java - MessageLiteToString.java - MessageSchema.java - MessageSetSchema.java - MutabilityOracle.java - NewInstanceSchema.java - NewInstanceSchemaLite.java - NewInstanceSchemas.java - NioByteString.java - OneofInfo.java - Parser.java - PrimitiveNonBoxingCollection.java - ProtoSyntax.java - Protobuf.java - ProtobufArrayList.java - ProtocolStringList.java - RawMessageInfo.java - Reader.java - RopeByteString.java - RuntimeVersion.java - Schema.java - SchemaFactory.java - SchemaUtil.java - SmallSortedMap.java - StructuralMessageInfo.java - TextFormatEscaper.java - UninitializedMessageException.java - UnknownFieldSchema.java - UnknownFieldSetLite.java - UnknownFieldSetLiteSchema.java - UnmodifiableLazyStringList.java - UnsafeByteOperations.java - UnsafeUtil.java - Utf8.java - WireFormat.java - Writer.java - - - - - - - copy-test-source-files - generate-test-sources - - copy-resources - - - ${generated.testsources.dir}/com/google/protobuf - - - ${basedir}/../core/src/test/java/com/google/protobuf - - - - AbstractMessageTest.java - AbstractProto2SchemaTest.java - AnyTest.java - CodedInputStreamTest.java - DeprecatedFieldTest.java - DescriptorsTest.java - DiscardUnknownFieldsTest.java - DynamicMessageTest.java - ExtensionRegistryFactoryTest.java - FieldPresenceTest.java - ForceFieldBuildersPreRun.java - GeneratedMessageTest.java - LazyFieldTest.java - LazyStringEndToEndTest.java - LazilyParsedMessageSetTest.java - MapForProto2Test.java - MapTest.java - MessageTest.java - NestedBuildersTest.java - PackedFieldTest.java - ParserTest.java - ParseExceptionsTest.java - Proto2ExtensionLookupSchemaTest.java - Proto2SchemaTest.java - Proto2UnknownEnumValueTest.java - RepeatedFieldBuilderTest.java - ServiceTest.java - SingleFieldBuilderTest.java - TestBadIdentifiers.java - TextFormatParseInfoTreeTest.java - TextFormatParseLocationTest.java - TextFormatPerformanceTest.java - TextFormatTest.java - TestUtil.java - TypeRegistryTest.java - UnknownEnumValueTest.java - UnknownFieldSetLiteTest.java - UnknownFieldSetPerformanceTest.java - UnknownFieldSetTest.java - WellKnownTypesTest.java - WireFormatTest.java - - - - - - - - - - - maven-antrun-plugin - - - - generate-sources - generate-sources - - - - - - - run - - - - - - generate-test-sources - generate-test-sources - - - - - - - run - - - - - process-lite-sources - generate-test-sources - - - - - - - run - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-generated-sources - generate-sources - - add-source - - - - ${generated.sources.dir} - - - - - - add-generated-test-sources - generate-test-sources - - add-test-source - - - - ${generated.testsources.dir} - - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - com.google.protobuf - https://developers.google.com/protocol-buffers/ - com.google.protobuf - com.google.protobuf;version=${project.version} - sun.misc;resolution:=optional,* - - - - - - - diff --git a/java/util/BUILD.bazel b/java/util/BUILD.bazel index 6b2da2b25b45..271bee1c1034 100644 --- a/java/util/BUILD.bazel +++ b/java/util/BUILD.bazel @@ -105,7 +105,6 @@ pkg_files( "src/test/**/*.proto", ]) + [ "BUILD.bazel", - "pom.xml", "pom_template.xml", ], strip_prefix = strip_prefix.from_root(""), diff --git a/java/util/pom.xml b/java/util/pom.xml deleted file mode 100644 index 775d50c828b5..000000000000 --- a/java/util/pom.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - 4.0.0 - - com.google.protobuf - protobuf-parent - 4.28.0 - - - protobuf-java-util - bundle - - Protocol Buffers [Util] - Utilities for Protocol Buffers - - - - ${project.groupId} - protobuf-java - - - com.google.guava - guava - - - com.google.errorprone - error_prone_annotations - 2.5.1 - - - com.google.j2objc - j2objc-annotations - 2.8 - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.google.guava - guava-testlib - test - - - com.google.code.gson - gson - 2.8.9 - - - junit - junit - - - org.mockito - mockito-core - test - - - com.google.truth - truth - test - - - - - - ../core/src/test/proto - - - - - - maven-antrun-plugin - - - - generate-test-sources - generate-test-sources - - - - - - - - - - - - - - - - - run - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-generated-test-sources - generate-test-sources - - add-test-source - - - - ${generated.testsources.dir} - - - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java18 - 1.0 - - - net.sf.androidscents.signature - android-api-level-21 - 5.0.1_r2 - - - - - android - test - - check - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - com.google.protobuf.util - https://developers.google.com/protocol-buffers/ - com.google.protobuf.util - com.google.protobuf.util;version=${project.version} - - - - - - - maven-assembly-plugin - - - jar-with-dependencies - - - - - -