diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-09-25 16:26:53 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-10-02 11:58:02 +0200 |
| commit | 0af2ef70356568b50d4b0f9eecf6536b82bd61cb (patch) | |
| tree | 0da4e5d29f883771d526fb5bc170a13604601602 /dist | |
| parent | f7545172a59fb08ea39d1342ebfd1f0ebf1b6a52 (diff) | |
Use Maven 3.3
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index a3e0ec4711f..58a598cfe99 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -16,12 +16,14 @@ URL: http://vespa.ai Source0: vespa-%{version}.tar.gz %if 0%{?centos} -BuildRequires: epel-release +BuildRequires: epel-release BuildRequires: centos-release-scl BuildRequires: devtoolset-6-gcc-c++ BuildRequires: devtoolset-6-libatomic-devel BuildRequires: devtoolset-6-binutils +BuildRequires: rh-maven33 %define _devtoolset_enable /opt/rh/devtoolset-6/enable +%define _rhmaven33_enable /opt/rh/rh-maven33/enable %endif %if 0%{?fedora} BuildRequires: gcc-c++ @@ -36,6 +38,7 @@ 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 @@ -49,7 +52,6 @@ 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 @@ -112,6 +114,9 @@ Vespa - The open big data serving engine %if 0%{?_devtoolset_enable:1} source %{_devtoolset_enable} || true %endif +%if 0%{?_rhmaven33_enable:1} +source %{_rhmaven33_enable} || true +%endif sh bootstrap.sh java mvn -nsu -T 2C install -DskipTests -Dmaven.javadoc.skip=true cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ |