Skip to content

Commit 80cd20b

Browse files
jhaberjhaber
authored
Merge pull request #131 from nicolasgarfinkiel/protobuf-java-upgrade
Upgraded protobuf-java to 4.28.3
2 parents c540d67 + 50f6aa8 commit 80cd20b

File tree

14 files changed

+139
-71
lines changed

14 files changed

+139
-71
lines changed

‎.github/workflows/jackson-2.12.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.github/workflows/jackson-2.13.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.github/workflows/jackson-2.14.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@ jobs:
2020
cache: maven
2121
- name: Build with Maven
2222
run: mvn -B verify -Ddep.jackson.version=2.14.3 -Ddep.jackson-databind.version=2.14.3 -Dbasepom.git-id.skip
23-
24-
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
25-
- name: Update dependency graph
26-
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

‎.github/workflows/jackson-2.15.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,4 @@ jobs:
1919
distribution: 'temurin'
2020
cache: maven
2121
- name: Build with Maven
22-
run: mvn -B verify -Ddep.jackson.version=2.15.3 -Ddep.jackson-databind.version=2.15.3 -Dbasepom.git-id.skip
23-
24-
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
25-
- name: Update dependency graph
26-
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
22+
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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Jackson-2.16
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v3
17+
with:
18+
java-version: '17'
19+
distribution: 'temurin'
20+
cache: maven
21+
- name: Build with Maven
22+
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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Jackson-2.17
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v3
17+
with:
18+
java-version: '17'
19+
distribution: 'temurin'
20+
cache: maven
21+
- name: Build with Maven
22+
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 renamed to ‎.github/workflows/latest.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Jackson-Latest
1+
name: Latest
22

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

‎.github/workflows/protobuf-3.23.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Protobuf-3.23
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v3
17+
with:
18+
java-version: '17'
19+
distribution: 'temurin'
20+
cache: maven
21+
- name: Build with Maven
22+
run: mvn -B verify -Ddep.protobuf-java.version=3.23.2 -Dbasepom.git-id.skip

‎.github/workflows/protobuf-3.25.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Protobuf-3.25
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v3
17+
with:
18+
java-version: '17'
19+
distribution: 'temurin'
20+
cache: maven
21+
- name: Build with Maven
22+
run: mvn -B verify -Ddep.protobuf-java.version=3.25.5 -Dbasepom.git-id.skip

‎.github/workflows/protoc-3.23.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Protoc-3.23
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v3
17+
with:
18+
java-version: '17'
19+
distribution: 'temurin'
20+
cache: maven
21+
- name: Build with Maven
22+
run: mvn -B verify -Ddep.protoc.version=3.23.2 -Dbasepom.git-id.skip

‎.github/workflows/protoc-3.25.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Protoc-3.25
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v3
17+
with:
18+
java-version: '17'
19+
distribution: 'temurin'
20+
cache: maven
21+
- name: Build with Maven
22+
run: mvn -B verify -Ddep.protoc.version=3.25.5 -Dbasepom.git-id.skip

‎pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
<basepom.check.skip-dependency-versions-check>true</basepom.check.skip-dependency-versions-check>
2121
<basepom.check.skip-spotbugs>true</basepom.check.skip-spotbugs>
2222

23-
<dep.jackson.version>2.16.1</dep.jackson.version>
24-
<dep.jackson-databind.version>2.16.1</dep.jackson-databind.version>
23+
<dep.jackson.version>2.18.1</dep.jackson.version>
24+
<dep.jackson-databind.version>2.18.1</dep.jackson-databind.version>
2525
<dep.javax-validation.version>2.0.1.Final</dep.javax-validation.version>
26+
<dep.protobuf-java.version>4.28.3</dep.protobuf-java.version>
27+
<dep.protoc.version>${dep.protobuf-java.version}</dep.protoc.version>
2628
<dep.scala.version>2.12.18</dep.scala.version>
2729
</properties>
2830

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.fasterxml.jackson.databind.util.NameTransformer;
1111
import com.google.protobuf.Descriptors.Descriptor;
1212
import com.google.protobuf.Descriptors.FieldDescriptor;
13-
import com.google.protobuf.Descriptors.FileDescriptor.Syntax;
1413
import com.google.protobuf.ExtensionRegistry.ExtensionInfo;
1514
import com.google.protobuf.Message;
1615
import com.google.protobuf.MessageOrBuilder;
@@ -60,7 +59,7 @@ public void serialize(
6059
}
6160

6261
boolean proto3 =
63-
message.getDescriptorForType().getFile().getSyntax() == Syntax.PROTO3;
62+
"proto3".equals(message.getDescriptorForType().getFile().toProto().getSyntax());
6463
Include include = serializerProvider
6564
.getConfig()
6665
.getDefaultPropertyInclusion()

‎src/test/java/com/hubspot/jackson/datatype/protobuf/util/CompileCustomProtobufs.java

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)