This is an automated email from the ASF dual-hosted git repository.
ayegorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 139eed311 [BUILD] fix master branch broken http-core license check
139eed311 is described below
commit 139eed311393c7077db6e7470c0f167e16b6b3b0
Author: ZhangJian He <[email protected]>
AuthorDate: Wed Apr 6 23:37:28 2022 +0800
[BUILD] fix master branch broken http-core license check
### Changes
- the bkctl and bk-server has different `http-core` version
- unify the `http-core` version to 4.4.15
Reviewers: Andrey Yegorov <None>, Nicolò Boschi <[email protected]>,
Enrico Olivelli <[email protected]>
This closes #3183 from Shoothzj/fix-broken-license-check
---
bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 2 +-
bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 2 +-
bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 2 +-
dependencies.gradle | 2 ++
pom.xml | 6 ++++++
5 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index d32c7aa29..d774144b4 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -298,7 +298,7 @@ Apache Software License, Version 2.
- lib/org.apache.yetus-audience-annotations-0.12.0.jar [37]
- lib/org.jctools-jctools-core-2.1.2.jar [38]
- lib/org.apache.httpcomponents-httpclient-4.5.13.jar [39]
-- lib/org.apache.httpcomponents-httpcore-4.4.13.jar [40]
+- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [40]
- lib/org.apache.thrift-libthrift-0.14.2.jar [41]
- lib/com.google.android-annotations-4.1.1.4.jar [42]
- lib/com.google.http-client-google-http-client-1.41.0.jar [43]
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index 1239d4a6b..36fe9a6b6 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -277,7 +277,7 @@ Apache Software License, Version 2.
- lib/org.apache.yetus-audience-annotations-0.12.0.jar [36]
- lib/org.jctools-jctools-core-2.1.2.jar [37]
- lib/org.apache.httpcomponents-httpclient-4.5.13.jar [38]
-- lib/org.apache.httpcomponents-httpcore-4.4.13.jar [39]
+- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [39]
- lib/org.apache.thrift-libthrift-0.14.2.jar [40]
- lib/com.google.android-annotations-4.1.1.4.jar [41]
- lib/com.google.auto.value-auto-value-annotations-1.9.jar [42]
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index 5dcf74d0a..1bf8f1f30 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -298,7 +298,7 @@ Apache Software License, Version 2.
- lib/org.apache.yetus-audience-annotations-0.12.0.jar [37]
- lib/org.jctools-jctools-core-2.1.2.jar [38]
- lib/org.apache.httpcomponents-httpclient-4.5.13.jar [39]
-- lib/org.apache.httpcomponents-httpcore-4.4.13.jar [40]
+- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [40]
- lib/org.apache.thrift-libthrift-0.14.2.jar [41]
- lib/com.google.android-annotations-4.1.1.4.jar [42]
- lib/com.google.http-client-google-http-client-1.41.0.jar [43]
diff --git a/dependencies.gradle b/dependencies.gradle
index 44289b035..569e537af 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -49,6 +49,7 @@ depVersions = [
hamcrest: "1.3",
hdrhistogram: "2.1.10",
httpclient: "4.5.13",
+ httpcore: "4.4.15",
jackson: "2.13.2",
jacksonBom: "2.13.2.20220324",
jacksonDatabind: "2.13.2.1",
@@ -151,6 +152,7 @@ depLibs = [
exclude group: 'commons-codec', module: 'commons-codec'
exclude group: 'commons-logging', module: 'commons-logging'
},
+ httpcore: "org.apache.httpcomponents:httpcore:${depVersions.httpcore}",
jacksonAnnotations:
"com.fasterxml.jackson.core:jackson-annotations:${depVersions.jackson}",
javaAnnotations:
"javax.annotation:javax.annotation-api:${depVersions.javaAnnotations}",
jacksonBom: "com.fasterxml.jackson:jackson-bom:${depVersions.jacksonBom}",
diff --git a/pom.xml b/pom.xml
index 12cbe4744..6d1f625f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,6 +159,7 @@
<prometheus.version>0.8.1</prometheus.version>
<datasketches.version>0.8.3</datasketches.version>
<httpclient.version>4.5.13</httpclient.version>
+ <httpcore.version>4.4.15</httpcore.version>
<protobuf.version>3.19.2</protobuf.version>
<protoc3.version>3.19.2</protoc3.version>
<protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
@@ -641,6 +642,11 @@
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
<!-- tools dependencies -->
<dependency>
