You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2020/01/04 13:12:30 UTC
[bookkeeper] branch branch-4.10 updated: Account Apache Thrift and
Http Client files in LICENSE files - Fix build on Travis
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch branch-4.10
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/branch-4.10 by this push:
new 320248f Account Apache Thrift and Http Client files in LICENSE files - Fix build on Travis
320248f is described below
commit 320248fceb471a124600ea8b4111793816f53c63
Author: Enrico Olivelli <eo...@gmail.com>
AuthorDate: Sat Jan 4 14:10:31 2020 +0100
Account Apache Thrift and Http Client files in LICENSE files - Fix build on Travis
fixes #2227
Descriptions of the changes in this PR:
- Account Thrift and Http client in LICENSE files.
- Force using Maven 3.6.3 in MacOSx builds on Travis
- Test only with -Dstream profile
### Motivation
Those files are inside the binary packages but they are not taken into account in LICENSE file.
Travis started to report errors when Travis updated Maven version to 3.6.2 in Linux machines, MaxOSx machines are still with 3.3.9 and the build does not bundle all of the needed jars !
Master Issue: #2227
Reviewers: Jia Zhai <zh...@apache.org>, Sijie Guo <None>
This closes #2228 from eolivelli/fix/license-files
---
.travis.yml | 14 ++++-----
.travis_scripts/build.sh | 34 ++++++++++------------
.../src/main/resources/LICENSE-all.bin.txt | 7 ++++-
.../src/main/resources/LICENSE-bkctl.bin.txt | 6 ++++
.../src/main/resources/LICENSE-server.bin.txt | 6 ++++
5 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c9b09d1..4049992 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,20 +34,17 @@ matrix:
env: CUSTOM_JDK="oraclejdk8"
- os: linux
env: CUSTOM_JDK="oraclejdk11"
- - os: osx
- osx_image: xcode8
- env:
- - STREAM_DISABLED="true"
- - os: linux
- env:
- - CUSTOM_JDK="oraclejdk8"
- - STREAM_DISABLED="true"
before_install:
- |
echo "MAVEN_OPTS='-Xmx3072m -XX:MaxPermSize=512m'" > ~/.mavenrc
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
export JAVA_HOME=$(/usr/libexec/java_home);
+ echo "Forcing Maven 3.6.3 on osx as Travis in January 2020 still bundles 3.3.9"
+ wget https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip
+ unzip -qq apache-maven-3.6.3-bin.zip -d $PWD/..
+ export M2_HOME=$PWD/../apache-maven-3.6.3
+ export PATH=$M2_HOME/bin:$PATH
fi
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
jdk_switcher use "$CUSTOM_JDK";
@@ -75,3 +72,4 @@ script: .travis_scripts/build.sh
cache:
directories:
- $HOME/.m2
+ - $HOME/apache-maven-3.6.3
diff --git a/.travis_scripts/build.sh b/.travis_scripts/build.sh
index dcfc3e7..ee0157f 100755
--- a/.travis_scripts/build.sh
+++ b/.travis_scripts/build.sh
@@ -22,23 +22,19 @@ set -ev
BINDIR=`dirname "$0"`
BK_HOME=`cd $BINDIR/..;pwd`
-if [ "xtrue" == "x${STREAM_DISABLED}" ]; then
- mvn --batch-mode clean install -DskipTests
- # this command should be executed correctly
- ${BK_HOME}/bin/bookkeeper help
-else
- mvn --batch-mode clean apache-rat:check compile spotbugs:check install -DskipTests -Dstream
- $BK_HOME/dev/check-binary-license ./bookkeeper-dist/all/target/bookkeeper-all-*-bin.tar.gz;
- $BK_HOME/dev/check-binary-license ./bookkeeper-dist/server/target/bookkeeper-server-*-bin.tar.gz;
- $BK_HOME/dev/check-binary-license ./bookkeeper-dist/bkctl/target/bkctl-*-bin.tar.gz;
- if [ "$DLOG_MODIFIED" == "true" ]; then
- cd $BK_HOME/stream/distributedlog
- mvn --batch-mode clean package -Ddistributedlog
- fi
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$WEBSITE_MODIFIED" == "true" ]; then
- cd $BK_HOME/site
- make clean
- # run the docker image to build the website
- ./docker/ci.sh
- fi
+mvn -v
+
+mvn --batch-mode clean apache-rat:check compile spotbugs:check install -DskipTests -Dstream
+$BK_HOME/dev/check-binary-license ./bookkeeper-dist/all/target/bookkeeper-all-*-bin.tar.gz;
+$BK_HOME/dev/check-binary-license ./bookkeeper-dist/server/target/bookkeeper-server-*-bin.tar.gz;
+$BK_HOME/dev/check-binary-license ./bookkeeper-dist/bkctl/target/bkctl-*-bin.tar.gz;
+if [ "$DLOG_MODIFIED" == "true" ]; then
+ cd $BK_HOME/stream/distributedlog
+ mvn --batch-mode clean package -Ddistributedlog
+fi
+if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$WEBSITE_MODIFIED" == "true" ]; then
+ cd $BK_HOME/site
+ make clean
+ # run the docker image to build the website
+ ./docker/ci.sh
fi
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index fc52da9..d64529d 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -315,6 +315,9 @@ Apache Software License, Version 2.
- lib/com.google.errorprone-error_prone_annotations-2.1.2.jar [48]
- lib/org.apache.yetus-audience-annotations-0.5.0.jar [49]
- lib/org.jctools-jctools-core-2.1.2.jar [50]
+- lib/org.apache.httpcomponents-httpclient-4.4.1.jar [51]
+- lib/org.apache.httpcomponents-httpcore-4.4.1.jar [52]
+- lib/org.apache.thrift-libthrift-0.9.3.jar [53]
[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.9.7
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.9.7
@@ -365,7 +368,9 @@ Apache Software License, Version 2.
[48] Source available at https://github.com/google/error-prone/tree/v2.1.2
[49] Source available at https://github.com/apache/yetus/tree/rel/0.5.0
[50] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2
-
+[51] Source available at https://github.com/apache/httpcomponents-client/tree/rel/v4.4.1
+[52] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.1
+[53] Source available at https://github.com/apache/thrift/tree/0.9.3
------------------------------------------------------------------------------------
lib/io.netty-netty-3.10.1.Final.jar contains the extensions to Java Collections Framework which has
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index aedc7e3..68ee3f4 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -259,6 +259,9 @@ Apache Software License, Version 2.
- lib/com.google.errorprone-error_prone_annotations-2.1.2.jar [35]
- lib/org.apache.yetus-audience-annotations-0.5.0.jar [36]
- lib/org.jctools-jctools-core-2.1.2.jar [37]
+- lib/org.apache.httpcomponents-httpclient-4.4.1.jar [38]
+- lib/org.apache.httpcomponents-httpcore-4.4.1.jar [39]
+- lib/org.apache.thrift-libthrift-0.9.3.jar [40]
[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.8.9
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.8.9
@@ -289,6 +292,9 @@ Apache Software License, Version 2.
[35] Source available at https://github.com/google/error-prone/tree/v2.1.2
[36] Source available at https://github.com/apache/yetus/tree/rel/0.5.0
[37] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2
+[38] Source available at https://github.com/apache/httpcomponents-client/tree/rel/v4.4.1
+[39] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.1
+[30] Source available at https://github.com/apache/thrift/tree/0.9.3
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.32.Final.jar bundles some 3rd party dependencies
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index 44c1e47..c66df18 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -279,6 +279,9 @@ Apache Software License, Version 2.
- lib/com.google.errorprone-error_prone_annotations-2.1.2.jar [35]
- lib/org.apache.yetus-audience-annotations-0.5.0.jar [36]
- lib/org.jctools-jctools-core-2.1.2.jar [37]
+- lib/org.apache.httpcomponents-httpclient-4.4.1.jar [38]
+- lib/org.apache.httpcomponents-httpcore-4.4.1.jar [39]
+- lib/org.apache.thrift-libthrift-0.9.3.jar [40]
[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.8.9
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.8.9
@@ -317,6 +320,9 @@ Apache Software License, Version 2.
[35] Source available at https://github.com/google/error-prone/tree/v2.1.2
[36] Source available at https://github.com/apache/yetus/tree/rel/0.5.0
[37] Source available at https://github.com/JCTools/JCTools/tree/v2.1.2
+[38] Source available at https://github.com/apache/httpcomponents-client/tree/rel/v4.4.1
+[39] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.1
+[30] Source available at https://github.com/apache/thrift/tree/0.9.3
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.32.Final.jar bundles some 3rd party dependencies