fix: add maven placeholder to protobuf-java-format-shaded module, mat…

…ch 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
googleapis · Aug 16, 2022 · 2e39ff5 · 2e39ff5
1 parent 93a4c6f
commit 2e39ff5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/.../bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml b/.../bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml
@@ -81,7 +81,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.cloud.bigtable</groupId>
       <artifactId>protobuf-java-format-shaded</artifactId>
-      <version>1.4</version>
+      <version>0.1.0</version> <!-- {x-version-update:bigtable-hbase-mirroring:current} -->
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/...ng-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml b/...ng-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml
@@ -11,7 +11,7 @@
   </parent>
 
   <artifactId>protobuf-java-format-shaded</artifactId>
-  <version>1.4</version>
+  <version>0.1.0</version> <!-- {x-version-update:bigtable-hbase-mirroring:current} -->
 
   <description>
     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 @@
                   <artifact>*:*</artifact>
                   <excludes>
                     <exclude>META-INF/MANIFEST.MF</exclude>
+                    <exclude>com/google/cloud/bigtable/mirroring/protobuf_java_format_shaded/MavenPlaceholderProtobufJavaFormatShaded.class</exclude>
                   </excludes>
                 </filter>
               </filters>

diff --git a/...table/mirroring/protobuf_java_format_shaded/MavenPlaceholderProtobufJavaFormatShaded.java b/...table/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() {}
+}