Merge pull request #3609 from vespa-engine/bjorncs/maven

Bjorncs/maven

3 files changed, 15 insertions, 8 deletions

diff --git a/dist/vespa.spec b/dist/vespa.spec
index a3e0ec4711f..bf6e49fdf85 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,8 +114,11 @@ 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
+mvn -nsu -T 2C install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
 cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DJAVA_HOME=/usr/lib/jvm/java-openjdk \
        -DEXTRA_LINK_DIRECTORY="%{_extra_link_directory}" \
@@ -147,18 +152,18 @@ chmod +x /etc/profile.d/vespa.sh
 exit 0
 
 %post
-%systemd_post vespa-configserver.service 
-%systemd_post vespa.service 
+%systemd_post vespa-configserver.service
+%systemd_post vespa.service
 
 %preun
 %systemd_preun vespa.service
 %systemd_preun vespa-configserver.service
 
 %postun
-%systemd_postun_with_restart vespa.service 
-%systemd_postun_with_restart vespa-configserver.service 
+%systemd_postun_with_restart vespa.service
+%systemd_postun_with_restart vespa-configserver.service
 rm -f /etc/profile.d/vespa.sh
-userdel vespa 
+userdel vespa
 
 %files
 %defattr(-,vespa,vespa,-)
diff --git a/travis/travis-build-cpp.sh b/travis/travis-build-cpp.sh
index 825da67bf54..bc2b564d13f 100755
--- a/travis/travis-build-cpp.sh
+++ b/travis/travis-build-cpp.sh
@@ -11,6 +11,7 @@ export CCACHE_MAXSIZE="1250M"
 export CCACHE_COMPRESS=1
 NUM_THREADS=4
 ccache --print-config
+source /etc/profile.d/devtoolset-6.sh || true
 
 cd ${BUILD_DIR}
 bash ${SOURCE_DIR}/bootstrap-cpp.sh ${SOURCE_DIR} ${BUILD_DIR}
diff --git a/travis/travis-build-java.sh b/travis/travis-build-java.sh
index 68341d784b5..a7b9f425758 100755
--- a/travis/travis-build-java.sh
+++ b/travis/travis-build-java.sh
@@ -7,5 +7,6 @@ NUM_THREADS=4
 
 cd "${SOURCE_DIR}"
 export MAVEN_OPTS="-Xms128m -Xmx512m"
+source /etc/profile.d/devtoolset-6.sh || true
 sh ./bootstrap.sh java
 mvn install -nsu -B -T ${NUM_THREADS} -V # Should ideally split out test phase, but some unit tests fails on 'mvn test'