From 7b45121faacfc19e69438f783d44ce50d809fcd2 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 30 Jul 2015 18:31:45 +0200 Subject: [PATCH] Prepare upgrade to protobuf 3 Files .proto must declare: syntax = "proto2"; --- sonar-batch-protocol/src/main/protobuf/batch_input.proto | 1 + sonar-batch-protocol/src/main/protobuf/batch_report.proto | 1 + sonar-batch-protocol/src/main/protobuf/constants.proto | 2 ++ sonar-core/src/test/protobuf/test.proto | 1 + sonar-db/src/main/protobuf/file_sources.proto | 2 ++ 5 files changed, 7 insertions(+) diff --git a/sonar-batch-protocol/src/main/protobuf/batch_input.proto b/sonar-batch-protocol/src/main/protobuf/batch_input.proto index 22b68daad39..84a9c53d812 100644 --- a/sonar-batch-protocol/src/main/protobuf/batch_input.proto +++ b/sonar-batch-protocol/src/main/protobuf/batch_input.proto @@ -30,6 +30,7 @@ Notes are updated and committed for each change (see src/main/gen-java). */ +syntax = "proto2"; import "constants.proto"; diff --git a/sonar-batch-protocol/src/main/protobuf/batch_report.proto b/sonar-batch-protocol/src/main/protobuf/batch_report.proto index 52ad2f48fd9..76eec978266 100644 --- a/sonar-batch-protocol/src/main/protobuf/batch_report.proto +++ b/sonar-batch-protocol/src/main/protobuf/batch_report.proto @@ -30,6 +30,7 @@ Notes are updated and committed for each change (see src/main/gen-java). */ +syntax = "proto2"; import "constants.proto"; diff --git a/sonar-batch-protocol/src/main/protobuf/constants.proto b/sonar-batch-protocol/src/main/protobuf/constants.proto index 5dd0ce9c163..c0825ffefae 100644 --- a/sonar-batch-protocol/src/main/protobuf/constants.proto +++ b/sonar-batch-protocol/src/main/protobuf/constants.proto @@ -16,6 +16,8 @@ // along with this program; if not, write to the Free Software Foundation, // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +syntax = "proto2"; + option java_package = "org.sonar.batch.protocol"; option optimize_for = SPEED; diff --git a/sonar-core/src/test/protobuf/test.proto b/sonar-core/src/test/protobuf/test.proto index b3a6cc4b39c..fa51e06995b 100644 --- a/sonar-core/src/test/protobuf/test.proto +++ b/sonar-core/src/test/protobuf/test.proto @@ -18,6 +18,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +syntax = "proto2"; option java_package = "org.sonar.core.test"; option optimize_for = SPEED; diff --git a/sonar-db/src/main/protobuf/file_sources.proto b/sonar-db/src/main/protobuf/file_sources.proto index feafa462ea4..e174cc36b4a 100644 --- a/sonar-db/src/main/protobuf/file_sources.proto +++ b/sonar-db/src/main/protobuf/file_sources.proto @@ -20,6 +20,8 @@ // Structure of db column FILE_SOURCES.BINARY_DATA +syntax = "proto2"; + // Package must not be changed for backward-compatibility // with the DB rows inserted in DB before 5.2 package org.sonar.server.source.db; -- 2.39.5