update protobuf 3.11.4

* supposed to be more native image friendly for Cloudstate
2020-05-04 08:39:19 +02:00 · 2020-05-04 08:39:19 +02:00 · d2afff6bfc
commit d2afff6bfc
parent 2104849658
17 changed files with 45 additions and 17 deletions
--- a/akka-cluster-metrics/src/main/java/akka/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
+++ b/akka-cluster-metrics/src/main/java/akka/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-cluster-sharding-typed/src/main/java/akka/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
+++ b/akka-cluster-sharding-typed/src/main/java/akka/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-cluster-tools/src/main/java/akka/cluster/client/protobuf/msg/ClusterClientMessages.java
+++ b/akka-cluster-tools/src/main/java/akka/cluster/client/protobuf/msg/ClusterClientMessages.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-cluster-tools/src/main/java/akka/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
+++ b/akka-cluster-tools/src/main/java/akka/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-cluster/src/main/java/akka/cluster/protobuf/msg/ClusterMessages.java
+++ b/akka-cluster/src/main/java/akka/cluster/protobuf/msg/ClusterMessages.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-multi-node-testkit/src/main/java/akka/remote/testconductor/TestConductorProtocol.java
+++ b/akka-multi-node-testkit/src/main/java/akka/remote/testconductor/TestConductorProtocol.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-persistence/src/main/java/akka/persistence/serialization/MessageFormats.java
+++ b/akka-persistence/src/main/java/akka/persistence/serialization/MessageFormats.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-remote-tests/src/test/java/akka/remote/artery/protobuf/TestMessages.java
+++ b/akka-remote-tests/src/test/java/akka/remote/artery/protobuf/TestMessages.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-remote/src/main/java/akka/remote/ArteryControlFormats.java
+++ b/akka-remote/src/main/java/akka/remote/ArteryControlFormats.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-remote/src/main/java/akka/remote/ContainerFormats.java
+++ b/akka-remote/src/main/java/akka/remote/ContainerFormats.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-remote/src/main/java/akka/remote/SystemMessageFormats.java
+++ b/akka-remote/src/main/java/akka/remote/SystemMessageFormats.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-remote/src/main/java/akka/remote/WireFormats.java
+++ b/akka-remote/src/main/java/akka/remote/WireFormats.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
@ -7671,19 +7671,25 @@ public final class WireFormats {

    /**
     * <code>repeated string tags = 12;</code>
+     * @return A list containing the tags.
     */
    java.util.List<java.lang.String>
        getTagsList();
    /**
     * <code>repeated string tags = 12;</code>
+     * @return The count of tags.
     */
    int getTagsCount();
    /**
     * <code>repeated string tags = 12;</code>
+     * @param index The index of the element to return.
+     * @return The tags at the given index.
     */
    java.lang.String getTags(int index);
    /**
     * <code>repeated string tags = 12;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the tags at the given index.
     */
    akka.protobufv3.internal.ByteString
        getTagsBytes(int index);
@ -8194,6 +8200,7 @@ public final class WireFormats {
    private akka.protobufv3.internal.LazyStringList tags_;
    /**
     * <code>repeated string tags = 12;</code>
+     * @return A list containing the tags.
     */
    public akka.protobufv3.internal.ProtocolStringList
        getTagsList() {
@ -8201,18 +8208,23 @@ public final class WireFormats {
    }
    /**
     * <code>repeated string tags = 12;</code>
+     * @return The count of tags.
     */
    public int getTagsCount() {
      return tags_.size();
    }
    /**
     * <code>repeated string tags = 12;</code>
+     * @param index The index of the element to return.
+     * @return The tags at the given index.
     */
    public java.lang.String getTags(int index) {
      return tags_.get(index);
    }
    /**
     * <code>repeated string tags = 12;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the tags at the given index.
     */
    public akka.protobufv3.internal.ByteString
        getTagsBytes(int index) {
@ -9514,6 +9526,7 @@ public final class WireFormats {
      }
      /**
       * <code>repeated string tags = 12;</code>
+       * @return A list containing the tags.
       */
      public akka.protobufv3.internal.ProtocolStringList
          getTagsList() {
@ -9521,18 +9534,23 @@ public final class WireFormats {
      }
      /**
       * <code>repeated string tags = 12;</code>
+       * @return The count of tags.
       */
      public int getTagsCount() {
        return tags_.size();
      }
      /**
       * <code>repeated string tags = 12;</code>
+       * @param index The index of the element to return.
+       * @return The tags at the given index.
       */
      public java.lang.String getTags(int index) {
        return tags_.get(index);
      }
      /**
       * <code>repeated string tags = 12;</code>
+       * @param index The index of the value to return.
+       * @return The bytes of the tags at the given index.
       */
      public akka.protobufv3.internal.ByteString
          getTagsBytes(int index) {
@ -9540,6 +9558,9 @@ public final class WireFormats {
      }
      /**
       * <code>repeated string tags = 12;</code>
+       * @param index The index to set the value at.
+       * @param value The tags to set.
+       * @return This builder for chaining.
       */
      public Builder setTags(
          int index, java.lang.String value) {
@ -9553,6 +9574,8 @@ public final class WireFormats {
      }
      /**
       * <code>repeated string tags = 12;</code>
+       * @param value The tags to add.
+       * @return This builder for chaining.
       */
      public Builder addTags(
          java.lang.String value) {
@ -9566,6 +9589,8 @@ public final class WireFormats {
      }
      /**
       * <code>repeated string tags = 12;</code>
+       * @param values The tags to add.
+       * @return This builder for chaining.
       */
      public Builder addAllTags(
          java.lang.Iterable<java.lang.String> values) {
@ -9577,6 +9602,7 @@ public final class WireFormats {
      }
      /**
       * <code>repeated string tags = 12;</code>
+       * @return This builder for chaining.
       */
      public Builder clearTags() {
        tags_ = akka.protobufv3.internal.LazyStringArrayList.EMPTY;
@ -9586,6 +9612,8 @@ public final class WireFormats {
      }
      /**
       * <code>repeated string tags = 12;</code>
+       * @param value The bytes of the tags to add.
+       * @return This builder for chaining.
       */
      public Builder addTagsBytes(
          akka.protobufv3.internal.ByteString value) {
--- a/akka-remote/src/test/java/akka/remote/ProtobufProtocol.java
+++ b/akka-remote/src/test/java/akka/remote/ProtobufProtocol.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-remote/src/test/java/akka/remote/protobuf/v3/ProtobufProtocolV3.java
+++ b/akka-remote/src/test/java/akka/remote/protobuf/v3/ProtobufProtocolV3.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/akka-stream/src/main/java/akka/stream/StreamRefMessages.java
+++ b/akka-stream/src/main/java/akka/stream/StreamRefMessages.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
 */

 // Generated by the protocol buffer compiler.  DO NOT EDIT!
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@ -22,7 +22,7 @@ object Dependencies {
  val agronaVersion = "1.4.1"
  val nettyVersion = "3.10.6.Final"
  val jacksonVersion = "2.10.4"
-  val protobufJavaVersion = "3.10.0"
+  val protobufJavaVersion = "3.11.4"
  val logbackVersion = "1.2.3"

  val scala212Version = "2.12.11"
--- a/project/Protobuf.scala
+++ b/project/Protobuf.scala
@ -32,7 +32,7 @@ object Protobuf {
    Compile / unmanagedJars ++= Seq(
        baseDirectory.value / ".." / "akka-protobuf-v3" / "target" / s"scala-${scalaBinaryVersion.value}" / s"akka-protobuf-v3-assembly-${version.value}.jar"),
    protoc := "protoc",
-    protocVersion := "3.10.0",
+    protocVersion := "3.11.4",
    generate := {
      val sourceDirs = paths.value
      val targetDirs = outputPaths.value