{
* {@code src}'s position after consuming from the stream.
*
* For example:
+ *
*
* Foo.Builder builder = ...
* CodedInputStream is = inputStreamFromByteRange(src);
@@ -76,6 +81,7 @@ public abstract class PBType implements DataType {
* {@code dst}'s position after writing to the stream.
*
* For example:
+ *
*
* CodedOutputStream os = outputStreamFromByteRange(dst);
* int before = os.spaceLeft(), after, written;
diff --git a/hbase-protocol-shaded/src/main/protobuf/server/coprocessor/examples/BulkDelete.proto b/hbase-examples/src/main/protobuf/BulkDelete.proto
similarity index 100%
rename from hbase-protocol-shaded/src/main/protobuf/server/coprocessor/examples/BulkDelete.proto
rename to hbase-examples/src/main/protobuf/BulkDelete.proto
diff --git a/hbase-protocol-shaded/src/main/protobuf/server/coprocessor/examples/RefreshHFiles.proto b/hbase-examples/src/main/protobuf/RefreshHFiles.proto
similarity index 100%
rename from hbase-protocol-shaded/src/main/protobuf/server/coprocessor/examples/RefreshHFiles.proto
rename to hbase-examples/src/main/protobuf/RefreshHFiles.proto
diff --git a/hbase-protocol-shaded/src/main/protobuf/server/coprocessor/examples/RowCount.proto b/hbase-examples/src/main/protobuf/RowCount.proto
similarity index 100%
rename from hbase-protocol-shaded/src/main/protobuf/server/coprocessor/examples/RowCount.proto
rename to hbase-examples/src/main/protobuf/RowCount.proto
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java
index 5ca3cf4e5cd..7c193d3b655 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java
@@ -19,7 +19,6 @@ package org.apache.hadoop.hbase.types;
import static org.junit.Assert.assertEquals;
-import com.google.protobuf.ByteString;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.example.protobuf.generated.CellMessage;
import org.apache.hadoop.hbase.testclassification.MiscTests;
@@ -30,6 +29,8 @@ import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.hbase.thirdparty.com.google.protobuf.ByteString;
+
@Category({ SmallTests.class, MiscTests.class })
public class TestPBCell {
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 2b3c7fe9827..6d8b0ab5775 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -33,20 +33,10 @@
true
- 3.5.1-1
+ -->
+ 3.11.4
-
-
- src/main/
-
- **/*.proto
-
-
-
@@ -88,7 +78,6 @@
com.google.protobuf:protoc:${internal.protobuf.version}:exe:${os.detected.classifier}
- false
true