Commit d643c5f0 authored by Dave Cridland's avatar Dave Cridland Committed by GitHub

Merge pull request #595 from max-allan-surevine/master

Forced set of JAVA_HOME
parents 8bdfc856 3d95570d
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<property name="copy.dbscripts" value="true"/> <property name="copy.dbscripts" value="true"/>
<property name="overwrite" value="true"/> <property name="overwrite" value="true"/>
<property name="installer.install4j.home" value="/home/j2ee-bamboo/install4j.5.1.11"/> <property name="installer.install4j.home" value="/home/bamboo/install4j.6.0.4"/>
<property name="installer.src" value="${basedir}/build/installer"/> <property name="installer.src" value="${basedir}/build/installer"/>
<property name="installer.dest.dir" value="${release.dest.dir}"/> <property name="installer.dest.dir" value="${release.dest.dir}"/>
<property name="installer.install4j.srcfile" value="${installer.src}/openfire.install4j"/> <property name="installer.install4j.srcfile" value="${installer.src}/openfire.install4j"/>
......
...@@ -13,7 +13,7 @@ ETCDIR := $(DEST)/etc/openfire ...@@ -13,7 +13,7 @@ ETCDIR := $(DEST)/etc/openfire
LOGDIR := $(DEST)/var/log/openfire LOGDIR := $(DEST)/var/log/openfire
VARDIR := $(DEST)/var/lib/openfire VARDIR := $(DEST)/var/lib/openfire
JAVA_HOME ?= /usr/lib/jvm/java-8-openjdk-amd64 JAVA_HOME := /usr/lib/jvm/java-8-openjdk-amd64
DEB_ANT_BUILDFILE := build/build.xml DEB_ANT_BUILDFILE := build/build.xml
DEB_ANT_CLEAN_TARGET := clean DEB_ANT_CLEAN_TARGET := clean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment