diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2018-05-28 15:38:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 15:38:43 +0200 |
| commit | db9f6be0b4c84766873107ced59ab6d287840861 (patch) | |
| tree | f66f27ed8b5a830e6fe64ae024c27d5d26ef20d6 /dist | |
| parent | 0ae5384783538969dc2b6e1d6ba71030e8562fb4 (diff) | |
| parent | f5e7bc3108a185c9c522dc96970025465ccd0906 (diff) | |
Merge pull request #5948 from vespa-engine/gjoranv/maven35
Use maven 3.5 (per now gives 3.5.0)
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index b34949ad573..0e3cabcea80 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -21,9 +21,9 @@ BuildRequires: centos-release-scl BuildRequires: devtoolset-7-gcc-c++ BuildRequires: devtoolset-7-libatomic-devel BuildRequires: devtoolset-7-binutils -BuildRequires: rh-maven33 +BuildRequires: rh-maven35 %define _devtoolset_enable /opt/rh/devtoolset-7/enable -%define _rhmaven33_enable /opt/rh/rh-maven33/enable +%define _rhmaven35_enable /opt/rh/rh-maven35/enable %endif %if 0%{?fedora} BuildRequires: gcc-c++ @@ -158,8 +158,8 @@ 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 +%if 0%{?_rhmaven35_enable:1} +source %{_rhmaven35_enable} || true %endif sh bootstrap.sh java mvn --batch-mode -nsu -T 2C install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true |