Skip to content

Commit 2e39ff5

Browse files
authored
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
1 parent 93a4c6f commit 2e39ff5

File tree

3 files changed

+29
-2
lines changed

3 files changed

+29
-2
lines changed

hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ limitations under the License.
8181
<dependency>
8282
<groupId>com.google.cloud.bigtable</groupId>
8383
<artifactId>protobuf-java-format-shaded</artifactId>
84-
<version>1.4</version>
84+
<version>0.1.0</version> <!-- {x-version-update:bigtable-hbase-mirroring:current} -->
8585
<scope>compile</scope>
8686
</dependency>
8787
<dependency>

hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<artifactId>protobuf-java-format-shaded</artifactId>
14-
<version>1.4</version>
14+
<version>0.1.0</version> <!-- {x-version-update:bigtable-hbase-mirroring:current} -->
1515

1616
<description>
1717
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 @@
5454
<artifact>*:*</artifact>
5555
<excludes>
5656
<exclude>META-INF/MANIFEST.MF</exclude>
57+
<exclude>com/google/cloud/bigtable/mirroring/protobuf_java_format_shaded/MavenPlaceholderProtobufJavaFormatShaded.class</exclude>
5758
</excludes>
5859
</filter>
5960
</filters>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright 2022 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.google.cloud.bigtable.mirroring.protobuf_java_format_shaded;
17+
18+
/**
19+
* This class is here to force generation of source javadoc jars so that the maven release process
20+
* doesn't complain. The shading plugin generated a shaded jar of bigtable-hbase, but it doesn't
21+
* generate javadoc or source files; this class is here as a hack and better methods should be
22+
* employed.
23+
*/
24+
public final class MavenPlaceholderProtobufJavaFormatShaded {
25+
private MavenPlaceholderProtobufJavaFormatShaded() {}
26+
}

0 commit comments

Comments
 (0)