diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-09-25 18:09:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 18:09:24 +0200 |
| commit | bf9f38acf780948512aa78e9cb9d43fe35d7a5ab (patch) | |
| tree | db2e0a0030399918498018dca787e9f3951736c1 | |
| parent | 8f7f39fcadd35b2cbcab0263fd74c7554ae388b3 (diff) | |
| parent | b29fc04853afa8247f420187590f9bd3e965c219 (diff) | |
Merge pull request #3529 from vespa-engine/bjorncs/revert-maven-33
Bjorncs/revert maven 33
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/README.md b/README.md index 762990a3127..51ecc5fb02e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Travis-CI build status: [ installed. +C++ building is supported on CentOS 7. The Java source can be built on any platform having Java 8 and Maven installed. We recommend using the following environment: [Create C++ dev environment on CentOS using VirtualBox and Vagrant](vagrant/README.md). You can also setup CentOS 7 natively and install the following build dependencies: diff --git a/dist/vespa.spec b/dist/vespa.spec index d034d1de051..eae6a0b3817 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -30,14 +30,12 @@ BuildRequires: libatomic BuildRequires: Judy-devel %if 0%{?centos} BuildRequires: cmake3 -BuildRequires: rh-maven33 BuildRequires: llvm3.9-devel BuildRequires: vespa-boost-devel >= 1.59.0-6 BuildRequires: vespa-zookeeper-c-client-devel >= 3.4.9-6 %endif %if 0%{?fedora} BuildRequires: cmake >= 3.9.1 -BuildRequires: maven %if 0%{?fc25} BuildRequires: llvm-devel >= 3.9.1 BuildRequires: boost-devel >= 1.60 @@ -51,6 +49,7 @@ BuildRequires: zookeeper-devel >= 3.4.9 BuildRequires: lz4-devel BuildRequires: libzstd-devel BuildRequires: zlib-devel +BuildRequires: maven BuildRequires: libicu-devel BuildRequires: java-1.8.0-openjdk-devel BuildRequires: openssl-devel @@ -114,9 +113,6 @@ Vespa - The open big data serving engine %if 0%{?_devtoolset_enable:1} source %{_devtoolset_enable} || true %endif -%if 0%{?centos} -scl enable rh-maven33 bash -%endif sh bootstrap.sh java mvn -nsu -T 2C install -DskipTests -Dmaven.javadoc.skip=true cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ |