summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@oath.com>2019-01-23 14:25:13 +0100
committerArnstein Ressem <aressem@oath.com>2019-01-23 14:25:13 +0100
commit1a0ce61af6e287a4d366d81abe93c7efe4700c6e (patch)
tree8d7365e675e383e45de4adca89d91e909b48f80b /dist
parentb1e4eb6eff7bc470a62e83a373f50f54dcadf84c (diff)
Copr does not allow using the alternatives command. Setting JAVA_HOME is enough for mvn to pick up JDK 11.
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec5
1 files changed, 3 insertions, 2 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index b2d9499085f..e7da84afdfa 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -155,9 +155,10 @@ source %{_devtoolset_enable} || true
%if 0%{?_rhmaven35_enable:1}
source %{_rhmaven35_enable} || true
%endif
-alternatives --set java java-11-openjdk.x86_64
-alternatives --set javac java-11-openjdk.x86_64
+
+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
export FACTORY_VESPA_VERSION=%{version}
+
sh bootstrap.sh java
mvn --batch-mode -nsu -T 1 install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \