You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2020/03/12 15:32:41 UTC
[hbase] branch master updated: HBASE-23971 protoc warns: "no
protobuf syntax specified" (#1278)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new abf0a22 HBASE-23971 protoc warns: "no protobuf syntax specified" (#1278)
abf0a22 is described below
commit abf0a22259775c86c07179bfe2523c6d49371c55
Author: WenFeiYi <we...@gmail.com>
AuthorDate: Thu Mar 12 23:32:22 2020 +0800
HBASE-23971 protoc warns: "no protobuf syntax specified" (#1278)
Signed-off-by: stack <st...@apache.org>
---
hbase-endpoint/src/main/protobuf/Aggregate.proto | 1 +
hbase-endpoint/src/main/protobuf/BulkDelete.proto | 4 +--
.../ColumnAggregationNullResponseProtocol.proto | 2 ++
.../main/protobuf/ColumnAggregationProtocol.proto | 2 ++
.../ColumnAggregationWithErrorsProtocol.proto | 2 ++
.../main/protobuf/DummyRegionServerEndpoint.proto | 2 +-
hbase-endpoint/src/main/protobuf/Export.proto | 2 +-
.../main/protobuf/IncrementCounterProcessor.proto | 3 +-
hbase-examples/src/main/protobuf/Examples.proto | 3 +-
.../src/main/protobuf/RefreshHFiles.proto | 2 +-
.../src/main/protobuf/RSGroup.proto | 2 +-
.../src/main/protobuf/RSGroupAdmin.proto | 2 +-
.../src/main/protobuf/AccessControl.proto | 1 +
hbase-protocol/src/main/protobuf/Admin.proto | 1 +
.../src/main/protobuf/Authentication.proto | 1 +
hbase-protocol/src/main/protobuf/Cell.proto | 1 +
hbase-protocol/src/main/protobuf/Client.proto | 1 +
hbase-protocol/src/main/protobuf/ClusterId.proto | 1 +
.../src/main/protobuf/ClusterStatus.proto | 1 +
hbase-protocol/src/main/protobuf/Comparator.proto | 1 +
hbase-protocol/src/main/protobuf/Encryption.proto | 1 +
.../src/main/protobuf/ErrorHandling.proto | 1 +
hbase-protocol/src/main/protobuf/FS.proto | 1 +
hbase-protocol/src/main/protobuf/Filter.proto | 1 +
hbase-protocol/src/main/protobuf/HBase.proto | 1 +
hbase-protocol/src/main/protobuf/HFile.proto | 1 +
.../src/main/protobuf/LoadBalancer.proto | 1 +
hbase-protocol/src/main/protobuf/MapReduce.proto | 1 +
.../src/main/protobuf/MultiRowMutation.proto | 1 +
.../src/main/protobuf/PingProtocol.proto | 2 ++
hbase-protocol/src/main/protobuf/Quota.proto | 2 +-
hbase-protocol/src/main/protobuf/RPC.proto | 1 +
hbase-protocol/src/main/protobuf/RSGroup.proto | 2 +-
.../src/main/protobuf/RSGroupAdmin.proto | 2 +-
.../src/main/protobuf/RowProcessor.proto | 2 ++
hbase-protocol/src/main/protobuf/Snapshot.proto | 1 +
.../src/main/protobuf/TestProcedure.proto | 2 ++
hbase-protocol/src/main/protobuf/Tracing.proto | 1 +
.../src/main/protobuf/VisibilityLabels.proto | 3 +-
hbase-protocol/src/main/protobuf/WAL.proto | 1 +
hbase-protocol/src/main/protobuf/ZooKeeper.proto | 1 +
hbase-protocol/src/main/protobuf/test.proto | 1 +
.../src/main/protobuf/test_rpc_service.proto | 2 ++
hbase-rest/src/main/protobuf/CellMessage.proto | 35 ++++++++++----------
hbase-rest/src/main/protobuf/CellSetMessage.proto | 37 +++++++++++-----------
.../src/main/protobuf/ColumnSchemaMessage.proto | 35 ++++++++++----------
.../main/protobuf/NamespacePropertiesMessage.proto | 35 ++++++++++----------
.../src/main/protobuf/NamespacesMessage.proto | 37 +++++++++++-----------
hbase-rest/src/main/protobuf/ScannerMessage.proto | 35 ++++++++++----------
.../protobuf/StorageClusterStatusMessage.proto | 35 ++++++++++----------
.../src/main/protobuf/TableInfoMessage.proto | 35 ++++++++++----------
.../src/main/protobuf/TableListMessage.proto | 35 ++++++++++----------
.../src/main/protobuf/TableSchemaMessage.proto | 35 ++++++++++----------
hbase-rest/src/main/protobuf/VersionMessage.proto | 35 ++++++++++----------
.../TestUsersOperationsWithSecureHadoop.java | 7 +++-
55 files changed, 260 insertions(+), 203 deletions(-)
diff --git a/hbase-endpoint/src/main/protobuf/Aggregate.proto b/hbase-endpoint/src/main/protobuf/Aggregate.proto
index 4d32e70..bf1adcb 100644
--- a/hbase-endpoint/src/main/protobuf/Aggregate.proto
+++ b/hbase-endpoint/src/main/protobuf/Aggregate.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-endpoint/src/main/protobuf/BulkDelete.proto b/hbase-endpoint/src/main/protobuf/BulkDelete.proto
index c2ec8ca..bd85f9c 100644
--- a/hbase-endpoint/src/main/protobuf/BulkDelete.proto
+++ b/hbase-endpoint/src/main/protobuf/BulkDelete.proto
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.coprocessor.example.generated";
@@ -48,4 +48,4 @@ message BulkDeleteResponse {
service BulkDeleteService {
rpc delete(BulkDeleteRequest)
returns (BulkDeleteResponse);
-}
\ No newline at end of file
+}
diff --git a/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto b/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto
index b4dc01e..36c03ee 100644
--- a/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto
+++ b/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
+
// Coprocessor test
option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
option java_outer_classname = "ColumnAggregationWithNullResponseProtos";
diff --git a/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto b/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto
index ad1acda..e7b301d 100644
--- a/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto
+++ b/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
+
// Coprocessor test
option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
option java_outer_classname = "ColumnAggregationProtos";
diff --git a/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto b/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto
index 7808949..04f0741 100644
--- a/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto
+++ b/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
+
// Coprocessor test
option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
option java_outer_classname = "ColumnAggregationWithErrorsProtos";
diff --git a/hbase-endpoint/src/main/protobuf/DummyRegionServerEndpoint.proto b/hbase-endpoint/src/main/protobuf/DummyRegionServerEndpoint.proto
index 8894718..4225ba4 100644
--- a/hbase-endpoint/src/main/protobuf/DummyRegionServerEndpoint.proto
+++ b/hbase-endpoint/src/main/protobuf/DummyRegionServerEndpoint.proto
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+syntax = "proto2";
package hbase.test.pb;
// Coprocessor test
diff --git a/hbase-endpoint/src/main/protobuf/Export.proto b/hbase-endpoint/src/main/protobuf/Export.proto
index 5e6c262..e33a2c0 100644
--- a/hbase-endpoint/src/main/protobuf/Export.proto
+++ b/hbase-endpoint/src/main/protobuf/Export.proto
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto b/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto
index b8c77ca..aefdc9d 100644
--- a/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto
+++ b/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
option java_outer_classname = "IncrementCounterProcessorTestProtos";
@@ -52,4 +53,4 @@ message TimeoutProcessorRequest {
}
message TimeoutProcessorResponse {
-}
\ No newline at end of file
+}
diff --git a/hbase-examples/src/main/protobuf/Examples.proto b/hbase-examples/src/main/protobuf/Examples.proto
index ed9ed07..cfcaa91 100644
--- a/hbase-examples/src/main/protobuf/Examples.proto
+++ b/hbase-examples/src/main/protobuf/Examples.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.coprocessor.example.generated";
@@ -35,4 +36,4 @@ service RowCountService {
returns (CountResponse);
rpc getKeyValueCount(CountRequest)
returns (CountResponse);
-}
\ No newline at end of file
+}
diff --git a/hbase-examples/src/main/protobuf/RefreshHFiles.proto b/hbase-examples/src/main/protobuf/RefreshHFiles.proto
index 11cbab0..3cdc3f9 100644
--- a/hbase-examples/src/main/protobuf/RefreshHFiles.proto
+++ b/hbase-examples/src/main/protobuf/RefreshHFiles.proto
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-protocol-shaded/src/main/protobuf/RSGroup.proto b/hbase-protocol-shaded/src/main/protobuf/RSGroup.proto
index ede2b13..bfa54c1 100644
--- a/hbase-protocol-shaded/src/main/protobuf/RSGroup.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/RSGroup.proto
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.shaded.protobuf.generated";
diff --git a/hbase-protocol-shaded/src/main/protobuf/RSGroupAdmin.proto b/hbase-protocol-shaded/src/main/protobuf/RSGroupAdmin.proto
index 895f50e..6c522c6 100644
--- a/hbase-protocol-shaded/src/main/protobuf/RSGroupAdmin.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/RSGroupAdmin.proto
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.shaded.protobuf.generated";
diff --git a/hbase-protocol/src/main/protobuf/AccessControl.proto b/hbase-protocol/src/main/protobuf/AccessControl.proto
index e175e6a..c35bb5b 100644
--- a/hbase-protocol/src/main/protobuf/AccessControl.proto
+++ b/hbase-protocol/src/main/protobuf/AccessControl.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-protocol/src/main/protobuf/Admin.proto b/hbase-protocol/src/main/protobuf/Admin.proto
index 2c1d174..68194d6 100644
--- a/hbase-protocol/src/main/protobuf/Admin.proto
+++ b/hbase-protocol/src/main/protobuf/Admin.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers that are used for Admin service.
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/Authentication.proto b/hbase-protocol/src/main/protobuf/Authentication.proto
index 2f64799..aa0211f 100644
--- a/hbase-protocol/src/main/protobuf/Authentication.proto
+++ b/hbase-protocol/src/main/protobuf/Authentication.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-protocol/src/main/protobuf/Cell.proto b/hbase-protocol/src/main/protobuf/Cell.proto
index e518e65..f962808 100644
--- a/hbase-protocol/src/main/protobuf/Cell.proto
+++ b/hbase-protocol/src/main/protobuf/Cell.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// Cell and KeyValue protos
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/Client.proto b/hbase-protocol/src/main/protobuf/Client.proto
index 59cb0e2..a8454f9 100644
--- a/hbase-protocol/src/main/protobuf/Client.proto
+++ b/hbase-protocol/src/main/protobuf/Client.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers that are used for Client service.
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/ClusterId.proto b/hbase-protocol/src/main/protobuf/ClusterId.proto
index aed8cfc..8d916a6 100644
--- a/hbase-protocol/src/main/protobuf/ClusterId.proto
+++ b/hbase-protocol/src/main/protobuf/ClusterId.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers that are shared throughout HBase
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/ClusterStatus.proto b/hbase-protocol/src/main/protobuf/ClusterStatus.proto
index 0b36414..a41ac71 100644
--- a/hbase-protocol/src/main/protobuf/ClusterStatus.proto
+++ b/hbase-protocol/src/main/protobuf/ClusterStatus.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers that are used for ClustStatus
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/Comparator.proto b/hbase-protocol/src/main/protobuf/Comparator.proto
index 802021f..0a59cf3 100644
--- a/hbase-protocol/src/main/protobuf/Comparator.proto
+++ b/hbase-protocol/src/main/protobuf/Comparator.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers that are used for filters
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/Encryption.proto b/hbase-protocol/src/main/protobuf/Encryption.proto
index 97ab5b2..e08ca2b 100644
--- a/hbase-protocol/src/main/protobuf/Encryption.proto
+++ b/hbase-protocol/src/main/protobuf/Encryption.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers used for encryption
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/ErrorHandling.proto b/hbase-protocol/src/main/protobuf/ErrorHandling.proto
index be9a743..c57a6d2 100644
--- a/hbase-protocol/src/main/protobuf/ErrorHandling.proto
+++ b/hbase-protocol/src/main/protobuf/ErrorHandling.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers that are used for error handling
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/FS.proto b/hbase-protocol/src/main/protobuf/FS.proto
index 9e93120..0906179 100644
--- a/hbase-protocol/src/main/protobuf/FS.proto
+++ b/hbase-protocol/src/main/protobuf/FS.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers that are written into the filesystem
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/Filter.proto b/hbase-protocol/src/main/protobuf/Filter.proto
index 8a0a9bf..0b4c201 100644
--- a/hbase-protocol/src/main/protobuf/Filter.proto
+++ b/hbase-protocol/src/main/protobuf/Filter.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers that are used for filters
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/HBase.proto b/hbase-protocol/src/main/protobuf/HBase.proto
index a824f5e..f324aae 100644
--- a/hbase-protocol/src/main/protobuf/HBase.proto
+++ b/hbase-protocol/src/main/protobuf/HBase.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers that are shared throughout HBase
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/HFile.proto b/hbase-protocol/src/main/protobuf/HFile.proto
index 5c5e4f3..df8f57e 100644
--- a/hbase-protocol/src/main/protobuf/HFile.proto
+++ b/hbase-protocol/src/main/protobuf/HFile.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/LoadBalancer.proto b/hbase-protocol/src/main/protobuf/LoadBalancer.proto
index f9c5d0d..0c08821 100644
--- a/hbase-protocol/src/main/protobuf/LoadBalancer.proto
+++ b/hbase-protocol/src/main/protobuf/LoadBalancer.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// This file contains protocol buffers to represent the state of the load balancer.
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/MapReduce.proto b/hbase-protocol/src/main/protobuf/MapReduce.proto
index f96ffdf..7fb6850 100644
--- a/hbase-protocol/src/main/protobuf/MapReduce.proto
+++ b/hbase-protocol/src/main/protobuf/MapReduce.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
//This file includes protocol buffers used in MapReduce only.
package hbase.pb;
diff --git a/hbase-protocol/src/main/protobuf/MultiRowMutation.proto b/hbase-protocol/src/main/protobuf/MultiRowMutation.proto
index f55739f..d3140e9 100644
--- a/hbase-protocol/src/main/protobuf/MultiRowMutation.proto
+++ b/hbase-protocol/src/main/protobuf/MultiRowMutation.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
import "Client.proto";
diff --git a/hbase-protocol/src/main/protobuf/PingProtocol.proto b/hbase-protocol/src/main/protobuf/PingProtocol.proto
index ef63ee0..9a64599 100644
--- a/hbase-protocol/src/main/protobuf/PingProtocol.proto
+++ b/hbase-protocol/src/main/protobuf/PingProtocol.proto
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
+
// Coprocessor test
option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated";
option java_outer_classname = "PingProtos";
diff --git a/hbase-protocol/src/main/protobuf/Quota.proto b/hbase-protocol/src/main/protobuf/Quota.proto
index 8e5c17c..fa5462c 100644
--- a/hbase-protocol/src/main/protobuf/Quota.proto
+++ b/hbase-protocol/src/main/protobuf/Quota.proto
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-protocol/src/main/protobuf/RPC.proto b/hbase-protocol/src/main/protobuf/RPC.proto
index 8413d25..25e0514 100644
--- a/hbase-protocol/src/main/protobuf/RPC.proto
+++ b/hbase-protocol/src/main/protobuf/RPC.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
import "Tracing.proto";
diff --git a/hbase-protocol/src/main/protobuf/RSGroup.proto b/hbase-protocol/src/main/protobuf/RSGroup.proto
index 7358941..31a7716 100644
--- a/hbase-protocol/src/main/protobuf/RSGroup.proto
+++ b/hbase-protocol/src/main/protobuf/RSGroup.proto
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-protocol/src/main/protobuf/RSGroupAdmin.proto b/hbase-protocol/src/main/protobuf/RSGroupAdmin.proto
index 416097b..b73e370 100644
--- a/hbase-protocol/src/main/protobuf/RSGroupAdmin.proto
+++ b/hbase-protocol/src/main/protobuf/RSGroupAdmin.proto
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-protocol/src/main/protobuf/RowProcessor.proto b/hbase-protocol/src/main/protobuf/RowProcessor.proto
index cf2f30f..b2ed362 100644
--- a/hbase-protocol/src/main/protobuf/RowProcessor.proto
+++ b/hbase-protocol/src/main/protobuf/RowProcessor.proto
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
+
/**
* Defines a protocol to perform multi row transactions.
* See BaseRowProcessorEndpoint for the implementation.
diff --git a/hbase-protocol/src/main/protobuf/Snapshot.proto b/hbase-protocol/src/main/protobuf/Snapshot.proto
index ae1a1e6..59a65a9 100644
--- a/hbase-protocol/src/main/protobuf/Snapshot.proto
+++ b/hbase-protocol/src/main/protobuf/Snapshot.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-protocol/src/main/protobuf/TestProcedure.proto b/hbase-protocol/src/main/protobuf/TestProcedure.proto
index de74f36..982ea67 100644
--- a/hbase-protocol/src/main/protobuf/TestProcedure.proto
+++ b/hbase-protocol/src/main/protobuf/TestProcedure.proto
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
+
option java_package = "org.apache.hadoop.hbase.ipc.protobuf.generated";
option java_outer_classname = "TestProcedureProtos";
option java_generic_services = true;
diff --git a/hbase-protocol/src/main/protobuf/Tracing.proto b/hbase-protocol/src/main/protobuf/Tracing.proto
index 5a64cfc..4fa1ab8 100644
--- a/hbase-protocol/src/main/protobuf/Tracing.proto
+++ b/hbase-protocol/src/main/protobuf/Tracing.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-protocol/src/main/protobuf/VisibilityLabels.proto b/hbase-protocol/src/main/protobuf/VisibilityLabels.proto
index d2dc44d..44d0dfc 100644
--- a/hbase-protocol/src/main/protobuf/VisibilityLabels.proto
+++ b/hbase-protocol/src/main/protobuf/VisibilityLabels.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
@@ -80,4 +81,4 @@ service VisibilityLabelsService {
returns (GetAuthsResponse);
rpc listLabels(ListLabelsRequest)
returns (ListLabelsResponse);
-}
\ No newline at end of file
+}
diff --git a/hbase-protocol/src/main/protobuf/WAL.proto b/hbase-protocol/src/main/protobuf/WAL.proto
index 7272fa9..f24ea0f 100644
--- a/hbase-protocol/src/main/protobuf/WAL.proto
+++ b/hbase-protocol/src/main/protobuf/WAL.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
package hbase.pb;
option java_package = "org.apache.hadoop.hbase.protobuf.generated";
diff --git a/hbase-protocol/src/main/protobuf/ZooKeeper.proto b/hbase-protocol/src/main/protobuf/ZooKeeper.proto
index 418f817..e06f4a0 100644
--- a/hbase-protocol/src/main/protobuf/ZooKeeper.proto
+++ b/hbase-protocol/src/main/protobuf/ZooKeeper.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
// ZNode data in hbase are serialized protobufs with a four byte
// 'magic' 'PBUF' prefix.
diff --git a/hbase-protocol/src/main/protobuf/test.proto b/hbase-protocol/src/main/protobuf/test.proto
index 72b68e9..89d4786 100644
--- a/hbase-protocol/src/main/protobuf/test.proto
+++ b/hbase-protocol/src/main/protobuf/test.proto
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
option java_package = "org.apache.hadoop.hbase.ipc.protobuf.generated";
option java_outer_classname = "TestProtos";
diff --git a/hbase-protocol/src/main/protobuf/test_rpc_service.proto b/hbase-protocol/src/main/protobuf/test_rpc_service.proto
index 5f91dc4..7c67ef2 100644
--- a/hbase-protocol/src/main/protobuf/test_rpc_service.proto
+++ b/hbase-protocol/src/main/protobuf/test_rpc_service.proto
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+syntax = "proto2";
+
option java_package = "org.apache.hadoop.hbase.ipc.protobuf.generated";
option java_outer_classname = "TestRpcServiceProtos";
option java_generic_services = true;
diff --git a/hbase-rest/src/main/protobuf/CellMessage.proto b/hbase-rest/src/main/protobuf/CellMessage.proto
index 8d45154..0170be8 100644
--- a/hbase-rest/src/main/protobuf/CellMessage.proto
+++ b/hbase-rest/src/main/protobuf/CellMessage.proto
@@ -1,20 +1,21 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
package org.apache.hadoop.hbase.rest.protobuf.generated;
message Cell {
diff --git a/hbase-rest/src/main/protobuf/CellSetMessage.proto b/hbase-rest/src/main/protobuf/CellSetMessage.proto
index 4774a8d..b43482c 100644
--- a/hbase-rest/src/main/protobuf/CellSetMessage.proto
+++ b/hbase-rest/src/main/protobuf/CellSetMessage.proto
@@ -1,24 +1,25 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
+package org.apache.hadoop.hbase.rest.protobuf.generated;
import "CellMessage.proto";
-package org.apache.hadoop.hbase.rest.protobuf.generated;
-
message CellSet {
message Row {
required bytes key = 1;
diff --git a/hbase-rest/src/main/protobuf/ColumnSchemaMessage.proto b/hbase-rest/src/main/protobuf/ColumnSchemaMessage.proto
index 05e33b6..c6c957d 100644
--- a/hbase-rest/src/main/protobuf/ColumnSchemaMessage.proto
+++ b/hbase-rest/src/main/protobuf/ColumnSchemaMessage.proto
@@ -1,20 +1,21 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
package org.apache.hadoop.hbase.rest.protobuf.generated;
message ColumnSchema {
diff --git a/hbase-rest/src/main/protobuf/NamespacePropertiesMessage.proto b/hbase-rest/src/main/protobuf/NamespacePropertiesMessage.proto
index 3e00075..5858aef 100644
--- a/hbase-rest/src/main/protobuf/NamespacePropertiesMessage.proto
+++ b/hbase-rest/src/main/protobuf/NamespacePropertiesMessage.proto
@@ -1,20 +1,21 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
package org.apache.hadoop.hbase.rest.protobuf.generated;
message NamespaceProperties {
diff --git a/hbase-rest/src/main/protobuf/NamespacesMessage.proto b/hbase-rest/src/main/protobuf/NamespacesMessage.proto
index 2c5cbb3..0d1c857 100644
--- a/hbase-rest/src/main/protobuf/NamespacesMessage.proto
+++ b/hbase-rest/src/main/protobuf/NamespacesMessage.proto
@@ -1,22 +1,23 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
package org.apache.hadoop.hbase.rest.protobuf.generated;
message Namespaces {
repeated string namespace = 1;
-}
\ No newline at end of file
+}
diff --git a/hbase-rest/src/main/protobuf/ScannerMessage.proto b/hbase-rest/src/main/protobuf/ScannerMessage.proto
index 185eac6..08e3408 100644
--- a/hbase-rest/src/main/protobuf/ScannerMessage.proto
+++ b/hbase-rest/src/main/protobuf/ScannerMessage.proto
@@ -1,20 +1,21 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
package org.apache.hadoop.hbase.rest.protobuf.generated;
message Scanner {
diff --git a/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto b/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto
index e073110..7b9c40c 100644
--- a/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto
+++ b/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto
@@ -1,20 +1,21 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
package org.apache.hadoop.hbase.rest.protobuf.generated;
message StorageClusterStatus {
diff --git a/hbase-rest/src/main/protobuf/TableInfoMessage.proto b/hbase-rest/src/main/protobuf/TableInfoMessage.proto
index 674499c..d0b1121 100644
--- a/hbase-rest/src/main/protobuf/TableInfoMessage.proto
+++ b/hbase-rest/src/main/protobuf/TableInfoMessage.proto
@@ -1,20 +1,21 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
package org.apache.hadoop.hbase.rest.protobuf.generated;
message TableInfo {
diff --git a/hbase-rest/src/main/protobuf/TableListMessage.proto b/hbase-rest/src/main/protobuf/TableListMessage.proto
index fbd76ea..6439948 100644
--- a/hbase-rest/src/main/protobuf/TableListMessage.proto
+++ b/hbase-rest/src/main/protobuf/TableListMessage.proto
@@ -1,20 +1,21 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
package org.apache.hadoop.hbase.rest.protobuf.generated;
message TableList {
diff --git a/hbase-rest/src/main/protobuf/TableSchemaMessage.proto b/hbase-rest/src/main/protobuf/TableSchemaMessage.proto
index 47a4da5..5ee2e96 100644
--- a/hbase-rest/src/main/protobuf/TableSchemaMessage.proto
+++ b/hbase-rest/src/main/protobuf/TableSchemaMessage.proto
@@ -1,20 +1,21 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
import "ColumnSchemaMessage.proto";
package org.apache.hadoop.hbase.rest.protobuf.generated;
diff --git a/hbase-rest/src/main/protobuf/VersionMessage.proto b/hbase-rest/src/main/protobuf/VersionMessage.proto
index cc107b3..8f5ddeb9 100644
--- a/hbase-rest/src/main/protobuf/VersionMessage.proto
+++ b/hbase-rest/src/main/protobuf/VersionMessage.proto
@@ -1,20 +1,21 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+syntax = "proto2";
package org.apache.hadoop.hbase.rest.protobuf.generated;
message Version {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java
index d240f91..807dd50 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.AuthUtil;
@@ -64,7 +65,11 @@ public class TestUsersOperationsWithSecureHadoop {
private static String CLIENT_NAME;
@BeforeClass
- public static void setUp() throws Exception {
+ public static void destroyAndSetup() throws Exception {
+ //destroy localhost kerberos users
+ Process process = Runtime.getRuntime().exec(new String[]{"bash", "-c", "kdestroy"});
+ process.waitFor(2, TimeUnit.SECONDS);
+ // setup mini kdc
KDC = TEST_UTIL.setupMiniKdc(KEYTAB_FILE);
PRINCIPAL = "hbase/" + HOST;
CLIENT_NAME = "foo";