This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new c2d7f14 Remove cppunit-dev dependency (#3680)
c2d7f14 is described below
commit c2d7f14158775511e1774cbae8f7aedd2312d14e
Author: bed debug <[email protected]>
AuthorDate: Tue Mar 9 00:47:27 2021 -0800
Remove cppunit-dev dependency (#3680)
Co-authored-by: Huijun Wu <[email protected]>
---
docker/compile/Dockerfile.centos7 | 1 -
docker/compile/Dockerfile.debian10 | 1 -
docker/compile/Dockerfile.ubuntu18.04 | 1 -
docker/compile/Dockerfile.ubuntu20.04 | 1 -
docker/test/Dockerfile.centos7 | 1 -
docker/test/Dockerfile.ubuntu18.04 | 1 -
third_party/zookeeper/BUILD | 4 ++--
vagrant/init.sh | 2 +-
website2/docs/compiling-linux.md | 4 ++--
website2/docs/compiling-osx.md | 1 -
website2/docs/compiling-overview.md | 1 -
website2/website/scripts/Dockerfile.ubuntu18.04 | 1 -
12 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/docker/compile/Dockerfile.centos7
b/docker/compile/Dockerfile.centos7
index 06c4402..da2a8b9 100644
--- a/docker/compile/Dockerfile.centos7
+++ b/docker/compile/Dockerfile.centos7
@@ -25,7 +25,6 @@ RUN yum -y install \
ant \
automake \
curl \
- cppunit-devel \
cmake \
openssl-devel \
file \
diff --git a/docker/compile/Dockerfile.debian10
b/docker/compile/Dockerfile.debian10
index ccb652e..14df2de 100644
--- a/docker/compile/Dockerfile.debian10
+++ b/docker/compile/Dockerfile.debian10
@@ -27,7 +27,6 @@ RUN apt-get update && apt-get -y install \
cmake \
curl \
git \
- libcppunit-dev \
libssl-dev \
libtool \
libtool-bin \
diff --git a/docker/compile/Dockerfile.ubuntu18.04
b/docker/compile/Dockerfile.ubuntu18.04
index 08860e9..aed799a 100644
--- a/docker/compile/Dockerfile.ubuntu18.04
+++ b/docker/compile/Dockerfile.ubuntu18.04
@@ -27,7 +27,6 @@ RUN apt-get update && apt-get -y install \
automake \
libtool-bin \
libunwind8 \
- libcppunit-dev \
patch \
python3-dev \
python3-venv \
diff --git a/docker/compile/Dockerfile.ubuntu20.04
b/docker/compile/Dockerfile.ubuntu20.04
index 79f877a..aa92fae 100644
--- a/docker/compile/Dockerfile.ubuntu20.04
+++ b/docker/compile/Dockerfile.ubuntu20.04
@@ -29,7 +29,6 @@ RUN apt-get update && apt-get -y install \
automake \
libtool-bin \
libunwind8 \
- libcppunit-dev \
patch \
python-is-python3 \
python3-dev \
diff --git a/docker/test/Dockerfile.centos7 b/docker/test/Dockerfile.centos7
index d95e101..4a81ced 100644
--- a/docker/test/Dockerfile.centos7
+++ b/docker/test/Dockerfile.centos7
@@ -32,7 +32,6 @@ RUN yum -y install \
git \
kernel-devel \
libtool \
- cppunit-devel \
make \
patch \
python3-devel \
diff --git a/docker/test/Dockerfile.ubuntu18.04
b/docker/test/Dockerfile.ubuntu18.04
index 61f0118..11f1bcc 100644
--- a/docker/test/Dockerfile.ubuntu18.04
+++ b/docker/test/Dockerfile.ubuntu18.04
@@ -26,7 +26,6 @@ RUN apt-get update && apt-get -y install \
automake \
libtool-bin \
libunwind8 \
- libcppunit-dev \
patch \
python3-dev \
python3-venv \
diff --git a/third_party/zookeeper/BUILD b/third_party/zookeeper/BUILD
index 0735ef4..80b9f88 100644
--- a/third_party/zookeeper/BUILD
+++ b/third_party/zookeeper/BUILD
@@ -31,7 +31,7 @@ genrule(
"ant compile_jute",
"cd $$TMP_DIR/zookeeper-client/zookeeper-client-c",
"autoreconf -if",
- "./configure --prefix=$$INSTALL_DIR --enable-shared=no",
+ "./configure --prefix=$$INSTALL_DIR --disable-shared
--without-cppunit",
"make install",
"rm -rf $$TMP_DIR",
]),
@@ -46,7 +46,7 @@ genrule(
"ant compile_jute",
"cd $$TMP_DIR/zookeeper-client/zookeeper-client-c",
"autoreconf -if",
- "./configure --prefix=$$INSTALL_DIR --enable-shared=no",
+ "./configure --prefix=$$INSTALL_DIR --disable-shared
--without-cppunit",
"make install",
"rm -rf $$TMP_DIR",
]),
diff --git a/vagrant/init.sh b/vagrant/init.sh
index a68e732..a0a27e8 100644
--- a/vagrant/init.sh
+++ b/vagrant/init.sh
@@ -103,7 +103,7 @@ REMOVED
apt-get -qy update
# install deps
-apt-get install -qy ant vim zip mc curl wget openjdk-11-jdk scala git
python3-setuptools python3-venv python3-dev libtool-bin libcppunit-dev
python-is-python3
+apt-get install -qy ant vim zip mc curl wget openjdk-11-jdk scala git
python3-setuptools python3-venv python3-dev libtool-bin python-is-python3
# install_mesos $mode
if [ $mode == "master" ]; then
diff --git a/website2/docs/compiling-linux.md b/website2/docs/compiling-linux.md
index f080467..b3ce933 100644
--- a/website2/docs/compiling-linux.md
+++ b/website2/docs/compiling-linux.md
@@ -40,7 +40,7 @@ $ sudo apt-get upgrade -y
```bash
$ sudo apt-get install git build-essential automake cmake libtool-bin zip ant \
- libunwind-setjmp0-dev zlib1g-dev unzip pkg-config python3-setuptools
libcppunit-dev -y
+ libunwind-setjmp0-dev zlib1g-dev unzip pkg-config python3-setuptools -y
```
#### Step 3 --- Set the following environment variables
@@ -154,7 +154,7 @@ To build Heron on a fresh CentOS 7 installation:
### Step 1 --- Install the required dependencies
```bash
-$ sudo yum install gcc gcc-c++ kernel-devel wget unzip zlib-devel zip git
automake cmake patch libtool cppunit-devel ant pkg-config -y
+$ sudo yum install gcc gcc-c++ kernel-devel wget unzip zlib-devel zip git
automake cmake patch libtool ant pkg-config -y
```
### Step 2 --- Install libunwind from source
diff --git a/website2/docs/compiling-osx.md b/website2/docs/compiling-osx.md
index 936dd73..05fea51 100644
--- a/website2/docs/compiling-osx.md
+++ b/website2/docs/compiling-osx.md
@@ -46,7 +46,6 @@ brew install automake
brew install cmake
brew install libtool
brew install ant
-brew install cppunit
brew install pkg-config
```
diff --git a/website2/docs/compiling-overview.md
b/website2/docs/compiling-overview.md
index e93f986..087cdaf 100644
--- a/website2/docs/compiling-overview.md
+++ b/website2/docs/compiling-overview.md
@@ -53,7 +53,6 @@ You must have the following installed to compile Heron:
* [Python](https://www.python.org/) >= 3.8
* [Perl](https://www.perl.org/) >= 5.8.8
* [Ant] (https://ant.apache.org/) >= 1.10.0
-* [CppUnit] (https://freedesktop.org/wiki/Software/cppunit/) >= 1.10.1
* [Pkg-Config] (https://www.freedesktop.org/wiki/Software/pkg-config/) >=
0.29.2
Export the `CC` and `CXX` environment variables with a path specific to your
diff --git a/website2/website/scripts/Dockerfile.ubuntu18.04
b/website2/website/scripts/Dockerfile.ubuntu18.04
index e3e3c27..fe263e9 100644
--- a/website2/website/scripts/Dockerfile.ubuntu18.04
+++ b/website2/website/scripts/Dockerfile.ubuntu18.04
@@ -28,7 +28,6 @@ RUN apt-get update && apt-get -y install \
curl \
g++ \
git \
- libcppunit-dev \
libtool-bin \
libunwind8 \
openjdk-11-jdk-headless \
