Skip to content

Commit 8c68924

Browse files
lhotarizymap
authored andcommitted
[Build/Security] Upgrade Freebuilder version and fix the dependency
Fixes apache#2732 ### Motivation - Freebuilder 1.14.9 contains an outdate jquery js file which causes the library to be flagged as vulnerable with the highest threat level in Sonatype IQ vulnerability scanner. This also flags Bookkeeper and Pulsar as vulnerable with the highest threat level although it is a false positive and not an actual threat. - Freebuilder shouldn't be exposed as a transitive dependency - it's an annotation processor which should be defined - [optional in maven](https://github.com/inferred/FreeBuilder#maven) - [compileOnly in gradle](https://github.com/inferred/FreeBuilder#gradle) ### Changes - upgrade [Freebuilder](https://github.com/inferred/FreeBuilder) from 1.14.9 to 2.7.0 - make dependency optional in maven pom.xml - use `compileOnly` instead of `implementation` in gradle build Reviewers: Sijie Guo <None> This closes apache#2734 from lhotari/lh-fix-freebuilder-dependency-issue (cherry picked from commit a445728)
1 parent b768bbb commit 8c68924

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ Apache Software License, Version 2.
284284
- lib/org.apache.curator-curator-client-5.1.0.jar [34]
285285
- lib/org.apache.curator-curator-framework-5.1.0.jar [34]
286286
- lib/org.apache.curator-curator-recipes-5.1.0.jar [34]
287-
- lib/org.inferred-freebuilder-1.14.9.jar [35]
287+
- lib/org.inferred-freebuilder-2.7.0.jar [35]
288288
- lib/com.google.errorprone-error_prone_annotations-2.4.0.jar [36]
289289
- lib/org.apache.yetus-audience-annotations-0.5.0.jar [37]
290290
- lib/org.jctools-jctools-core-2.1.2.jar [38]
@@ -337,7 +337,7 @@ Apache Software License, Version 2.
337337
[32] Source available at https://github.com/square/okio/tree/okio-parent-1.13.0
338338
[33] Source available at https://github.com/grpc/grpc-java/tree/v1.33.0
339339
[34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.1.0
340-
[35] Source available at https://github.com/inferred/FreeBuilder/tree/v1.14.9
340+
[35] Source available at https://github.com/inferred/FreeBuilder/tree/v2.7.0
341341
[36] Source available at https://github.com/google/error-prone/tree/v2.4.0
342342
[37] Source available at https://github.com/apache/yetus/tree/rel/0.5.0
343343
[38] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2

bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Apache Software License, Version 2.
264264
- lib/org.apache.curator-curator-client-5.1.0.jar [33]
265265
- lib/org.apache.curator-curator-framework-5.1.0.jar [33]
266266
- lib/org.apache.curator-curator-recipes-5.1.0.jar [33]
267-
- lib/org.inferred-freebuilder-1.14.9.jar [34]
267+
- lib/org.inferred-freebuilder-2.7.0.jar [34]
268268
- lib/com.google.errorprone-error_prone_annotations-2.4.0.jar [35]
269269
- lib/org.apache.yetus-audience-annotations-0.5.0.jar [36]
270270
- lib/org.jctools-jctools-core-2.1.2.jar [37]
@@ -307,7 +307,7 @@ Apache Software License, Version 2.
307307
[31] Source available at https://github.com/square/okio/tree/okio-parent-1.13.0
308308
[32] Source available at https://github.com/grpc/grpc-java/tree/v1.33.0
309309
[33] Source available at https://github.com/apache/curator/tree/apache-curator-5.1.0
310-
[34] Source available at https://github.com/inferred/FreeBuilder/tree/v1.14.9
310+
[34] Source available at https://github.com/inferred/FreeBuilder/tree/v2.7.0
311311
[35] Source available at https://github.com/google/error-prone/tree/v2.4.0
312312
[36] Source available at https://github.com/apache/yetus/tree/rel/0.5.0
313313
[37] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2

bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ Apache Software License, Version 2.
284284
- lib/org.apache.curator-curator-client-5.1.0.jar [34]
285285
- lib/org.apache.curator-curator-framework-5.1.0.jar [34]
286286
- lib/org.apache.curator-curator-recipes-5.1.0.jar [34]
287-
- lib/org.inferred-freebuilder-1.14.9.jar [35]
287+
- lib/org.inferred-freebuilder-2.7.0.jar [35]
288288
- lib/com.google.errorprone-error_prone_annotations-2.4.0.jar [36]
289289
- lib/org.apache.yetus-audience-annotations-0.5.0.jar [37]
290290
- lib/org.jctools-jctools-core-2.1.2.jar [38]
@@ -335,7 +335,7 @@ Apache Software License, Version 2.
335335
[32] Source available at https://github.com/square/okio/tree/okio-parent-1.13.0
336336
[33] Source available at https://github.com/grpc/grpc-java/tree/v1.33.0
337337
[34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.1.0
338-
[35] Source available at https://github.com/inferred/FreeBuilder/tree/v1.14.9
338+
[35] Source available at https://github.com/inferred/FreeBuilder/tree/v2.7.0
339339
[36] Source available at https://github.com/google/error-prone/tree/v2.4.0
340340
[37] Source available at https://github.com/apache/yetus/tree/rel/0.5.0
341341
[38] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ depVersions = [
3939
dockerJava: "3.2.5",
4040
dropwizard: "3.2.5",
4141
errorprone: "2.1.2",
42-
freebuilder: "1.14.9",
42+
freebuilder: "2.7.0",
4343
gradleTooling: "4.0.1",
4444
grpc: "1.33.0",
4545
groovy: "2.5.8",

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<curator.version>5.1.0</curator.version>
128128
<dropwizard.version>3.2.5</dropwizard.version>
129129
<etcd.version>0.5.4</etcd.version>
130-
<freebuilder.version>1.14.9</freebuilder.version>
130+
<freebuilder.version>2.7.0</freebuilder.version>
131131
<google.code.version>3.0.2</google.code.version>
132132
<google.errorprone.version>2.4.0</google.errorprone.version>
133133
<grpc.version>1.33.0</grpc.version>
@@ -232,6 +232,7 @@
232232
<groupId>org.inferred</groupId>
233233
<artifactId>freebuilder</artifactId>
234234
<version>${freebuilder.version}</version>
235+
<optional>true</optional>
235236
</dependency>
236237

237238
<!-- logging dependencies -->

stream/clients/java/base/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
implementation project(':stream:proto')
2424

2525
implementation depLibs.commonsLang2
26-
implementation depLibs.freebuilder
26+
compileOnly depLibs.freebuilder
2727
implementation depLibs.grpc
2828
implementation depLibs.lombok
2929
implementation depLibs.slf4j

0 commit comments

Comments
 (0)