Prepare upgrade to protobuf 3

Files .proto must declare: syntax = "proto2";

diff --git a/sonar-batch-protocol/src/main/protobuf/batch_input.proto b/sonar-batch-protocol/src/main/protobuf/batch_input.proto
index 22b68daad3982578ea75bacb3b300fe4c308f0ff..84a9c53d812457052fb53799152473899793eb27 100644 (file)
--- 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 52ad2f48fd9fb86305e8ee0a0ee91a8194f153eb..76eec978266a8bda7182ea05e0902b71f6f794ce 100644 (file)
--- 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 5dd0ce9c163a9b1ee37e1a78af4c9a33f843a4d9..c0825ffefae22497c3366136a1f75d6d53cc5f86 100644 (file)
--- 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 b3a6cc4b39cfa49b9ea4d6238aaaceaef2b98c55..fa51e06995b83050b761c2a79641ad139012b3d2 100644 (file)
--- 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 feafa462ea4b1345c56d4c096b659f2eda06acd2..e174cc36b4ae041e3570e2bac76732f0eabaca6f 100644 (file)
--- 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;