[MINOR UPDATE] Bump protobuf-java from 3.16.1 to 3.16.3 (#2671)

apache · Dec 26, 2022 · d738df2 · d738df2
1 parent 85aa70c
commit d738df2
Show file tree

Hide file tree

Showing 20 changed files with 5,699 additions and 7,548 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -88,16 +88,16 @@ jobs:
         run: |
           sudo apt update -y && sudo apt install -y libboost-all-dev libzookeeper-mt-dev libsasl2-dev cmake libcppunit-dev checkinstall && \
           pushd .. && \
-          if [ -f $HOME/protobuf/protobuf_3.16.1* ]; then \
-            sudo dpkg -i $HOME/protobuf/protobuf_3.16.1*; \
+          if [ -f $HOME/protobuf/protobuf_3.16.3* ]; then \
+            sudo dpkg -i $HOME/protobuf/protobuf_3.16.3*; \
           else \
-            wget https://github.com/protocolbuffers/protobuf/releases/download/v3.16.1/protobuf-java-3.16.1.zip && \
-            unzip protobuf-java-3.16.1.zip && pushd protobuf-3.16.1 && \
+            wget https://github.com/protocolbuffers/protobuf/releases/download/v3.16.3/protobuf-java-3.16.3.zip && \
+            unzip protobuf-java-3.16.3.zip && pushd protobuf-3.16.3 && \
             ./configure && sudo make && sudo checkinstall -y && \
             if [ ! -d $HOME/protobuf ]; then \
               mkdir -p $HOME/protobuf; \
             fi && \
-            mv protobuf_3.16.1* $HOME/protobuf/ && popd; \
+            mv protobuf_3.16.3* $HOME/protobuf/ && popd; \
           fi && \
           sudo ldconfig && popd; \
       # Builds Drill project, performs license checkstyle goal and regenerates java and C++ protobuf files

diff --git a/.travis.yml b/.travis.yml
@@ -55,16 +55,16 @@ before_install:
     if [ $PHASE = "build_checkstyle_protobuf" ]; then \
       sudo apt-get install -y libboost-all-dev libzookeeper-mt-dev libsasl2-dev cmake libcppunit-dev checkinstall && \
       pushd .. && \
-      if [ -f $HOME/protobuf/protobuf_3.16.1* ]; then \
-        sudo dpkg -i $HOME/protobuf/protobuf_3.16.1*; \
+      if [ -f $HOME/protobuf/protobuf_3.16.3* ]; then \
+        sudo dpkg -i $HOME/protobuf/protobuf_3.16.3*; \
       else \
-        wget https://github.com/protocolbuffers/protobuf/releases/download/v3.16.1/protobuf-java-3.16.1.zip && \
-        unzip protobuf-java-3.16.1.zip && pushd protobuf-3.16.1 && \
+        wget https://github.com/protocolbuffers/protobuf/releases/download/v3.16.3/protobuf-java-3.16.3.zip && \
+        unzip protobuf-java-3.16.3.zip && pushd protobuf-3.16.3 && \
         ./configure && sudo make && sudo checkinstall -y && \
         if [ ! -d $HOME/protobuf ]; then \
           mkdir -p $HOME/protobuf; \
         fi && \
-        mv protobuf_3.16.1* $HOME/protobuf/ && popd; \
+        mv protobuf_3.16.3* $HOME/protobuf/ && popd; \
       fi && \
       sudo ldconfig && popd; \
     fi

diff --git a/contrib/native/client/src/include/drill/protobuf/Types.pb.h b/contrib/native/client/src/include/drill/protobuf/Types.pb.h
diff --git a/contrib/native/client/src/protobuf/BitControl.pb.h b/contrib/native/client/src/protobuf/BitControl.pb.h
diff --git a/contrib/native/client/src/protobuf/BitData.pb.h b/contrib/native/client/src/protobuf/BitData.pb.h
diff --git a/contrib/native/client/src/protobuf/Coordination.pb.h b/contrib/native/client/src/protobuf/Coordination.pb.h
diff --git a/contrib/native/client/src/protobuf/ExecutionProtos.pb.h b/contrib/native/client/src/protobuf/ExecutionProtos.pb.h
diff --git a/contrib/native/client/src/protobuf/GeneralRPC.pb.h b/contrib/native/client/src/protobuf/GeneralRPC.pb.h
diff --git a/contrib/native/client/src/protobuf/SchemaDef.pb.h b/contrib/native/client/src/protobuf/SchemaDef.pb.h
diff --git a/contrib/native/client/src/protobuf/User.pb.h b/contrib/native/client/src/protobuf/User.pb.h
diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.h b/contrib/native/client/src/protobuf/UserBitShared.pb.h
diff --git a/pom.xml b/pom.xml
@@ -110,7 +110,7 @@
     <commons.net.version>3.9.0</commons.net.version>
     <commons.validator.version>1.6</commons.validator.version>
     <commons.text.version>1.10.0</commons.text.version>
-    <protobuf.version>3.16.1</protobuf.version>
+    <protobuf.version>3.16.3</protobuf.version>
     <protostuff.version>1.7.1</protostuff.version>
     <codemodel.version>2.6</codemodel.version>
     <joda.version>2.10.5</joda.version>