From 2e39ff52bec004b03c6e5db05b9ab23582bcf32e Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Tue, 16 Aug 2022 11:05:58 -0400
Subject: [PATCH] fix: add maven placeholder to protobuf-java-format-shaded
module, match version number to mirroring client (#3741)
* fix: add maven placeholder to protobuf-java-format-shaded module
* change version of artifact to match mirroring client
* format
* fix other versions
* fix
* don't shade placeholder class
---
.../pom.xml | 2 +-
.../protobuf-java-format-shaded/pom.xml | 3 ++-
...enPlaceholderProtobufJavaFormatShaded.java | 26 +++++++++++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/src/main/java/com/google/cloud/bigtable/mirroring/protobuf_java_format_shaded/MavenPlaceholderProtobufJavaFormatShaded.java
diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml
index 625fc0c586..97ebb02908 100644
--- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml
+++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml
@@ -81,7 +81,7 @@ limitations under the License.
com.google.cloud.bigtable
protobuf-java-format-shaded
- 1.4
+ 0.1.0
compile
diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml
index dc4aaf88a6..e5f057b96e 100644
--- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml
+++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml
@@ -11,7 +11,7 @@
protobuf-java-format-shaded
- 1.4
+ 0.1.0
This is a wrapper around `com.googlecode.protobuf-java-format:protobuf-java-format` that rewrites the bytecode to use `org.apache.hadoop.hbase.shaded.com.google.protobuf` instead of plain
@@ -54,6 +54,7 @@
*:*
META-INF/MANIFEST.MF
+ com/google/cloud/bigtable/mirroring/protobuf_java_format_shaded/MavenPlaceholderProtobufJavaFormatShaded.class
diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/src/main/java/com/google/cloud/bigtable/mirroring/protobuf_java_format_shaded/MavenPlaceholderProtobufJavaFormatShaded.java b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/src/main/java/com/google/cloud/bigtable/mirroring/protobuf_java_format_shaded/MavenPlaceholderProtobufJavaFormatShaded.java
new file mode 100644
index 0000000000..e0c6a3cb1a
--- /dev/null
+++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/src/main/java/com/google/cloud/bigtable/mirroring/protobuf_java_format_shaded/MavenPlaceholderProtobufJavaFormatShaded.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.cloud.bigtable.mirroring.protobuf_java_format_shaded;
+
+/**
+ * This class is here to force generation of source javadoc jars so that the maven release process
+ * doesn't complain. The shading plugin generated a shaded jar of bigtable-hbase, but it doesn't
+ * generate javadoc or source files; this class is here as a hack and better methods should be
+ * employed.
+ */
+public final class MavenPlaceholderProtobufJavaFormatShaded {
+ private MavenPlaceholderProtobufJavaFormatShaded() {}
+}