Merge pull request #131 from nicolasgarfinkiel/protobuf-java-upgrade

Upgraded protobuf-java to 4.28.3

.github/workflows/jackson-2.14.yaml

@@ -20,7 +20,3 @@ jobs:
           cache: maven
       - name: Build with Maven
         run: mvn -B verify -Ddep.jackson.version=2.14.3 -Ddep.jackson-databind.version=2.14.3 -Dbasepom.git-id.skip
-
-      # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-      - name: Update dependency graph
-        uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

.github/workflows/jackson-2.15.yaml

@@ -19,8 +19,4 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven
-        run: mvn -B verify -Ddep.jackson.version=2.15.3 -Ddep.jackson-databind.version=2.15.3 -Dbasepom.git-id.skip
-
-      # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-      - name: Update dependency graph
-        uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+        run: mvn -B verify -Ddep.jackson.version=2.15.4 -Ddep.jackson-databind.version=2.15.4 -Dbasepom.git-id.skip

.github/workflows/jackson-2.16.yaml

@@ -0,0 +1,22 @@
+name: Jackson-2.16
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B verify -Ddep.jackson.version=2.16.2 -Ddep.jackson-databind.version=2.16.2 -Dbasepom.git-id.skip

.github/workflows/jackson-2.17.yaml

@@ -0,0 +1,22 @@
+name: Jackson-2.17
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B verify -Ddep.jackson.version=2.17.3 -Ddep.jackson-databind.version=2.17.3 -Dbasepom.git-id.skip

.github/workflows/jackson-latest.yaml → .github/workflows/latest.yaml

@@ -1,4 +1,4 @@
-name: Jackson-Latest
+name: Latest
 
 on:
   push:
@@ -20,7 +20,3 @@ jobs:
           cache: maven
       - name: Build with Maven
         run: mvn -B verify -Dbasepom.git-id.skip
-
-      # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-      - name: Update dependency graph
-        uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

.github/workflows/protobuf-3.23.yaml

@@ -0,0 +1,22 @@
+name: Protobuf-3.23
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B verify -Ddep.protobuf-java.version=3.23.2 -Dbasepom.git-id.skip

.github/workflows/protobuf-3.25.yaml

@@ -0,0 +1,22 @@
+name: Protobuf-3.25
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B verify -Ddep.protobuf-java.version=3.25.5 -Dbasepom.git-id.skip

.github/workflows/protoc-3.23.yaml

@@ -0,0 +1,22 @@
+name: Protoc-3.23
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B verify -Ddep.protoc.version=3.23.2 -Dbasepom.git-id.skip

.github/workflows/protoc-3.25.yaml

@@ -0,0 +1,22 @@
+name: Protoc-3.25
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B verify -Ddep.protoc.version=3.25.5 -Dbasepom.git-id.skip

pom.xml

@@ -20,9 +20,11 @@
     <basepom.check.skip-dependency-versions-check>true</basepom.check.skip-dependency-versions-check>
     <basepom.check.skip-spotbugs>true</basepom.check.skip-spotbugs>
 
-    <dep.jackson.version>2.16.1</dep.jackson.version>
-    <dep.jackson-databind.version>2.16.1</dep.jackson-databind.version>
+    <dep.jackson.version>2.18.1</dep.jackson.version>
+    <dep.jackson-databind.version>2.18.1</dep.jackson-databind.version>
     <dep.javax-validation.version>2.0.1.Final</dep.javax-validation.version>
+    <dep.protobuf-java.version>4.28.3</dep.protobuf-java.version>
+    <dep.protoc.version>${dep.protobuf-java.version}</dep.protoc.version>
     <dep.scala.version>2.12.18</dep.scala.version>
   </properties>
 

src/main/java/com/hubspot/jackson/datatype/protobuf/builtin/serializers/MessageSerializer.java

@@ -10,7 +10,6 @@
 import com.fasterxml.jackson.databind.util.NameTransformer;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor.Syntax;
 import com.google.protobuf.ExtensionRegistry.ExtensionInfo;
 import com.google.protobuf.Message;
 import com.google.protobuf.MessageOrBuilder;
@@ -60,7 +59,7 @@ public void serialize(
     }
 
     boolean proto3 =
-      message.getDescriptorForType().getFile().getSyntax() == Syntax.PROTO3;
+      "proto3".equals(message.getDescriptorForType().getFile().toProto().getSyntax());
     Include include = serializerProvider
       .getConfig()
       .getDefaultPropertyInclusion()