Skip to content

Commit

Permalink
Download freemarker.jar from apache.org
Browse files Browse the repository at this point in the history
...as the old sourceforge location no longer works
(for whatever reason)
  • Loading branch information
janvrany committed Mar 1, 2022
1 parent cf121f4 commit 3469611
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
freemarker*
*freemarker*
openj9-openjdk-jdk11
*.trc
*.txt
Expand Down
2 changes: 1 addition & 1 deletion configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ bash configure \
--disable-warnings-as-errors-openj9 \
--with-build-jdk=$JAVA_HOME \
--with-boot-jdk=$JAVA_HOME \
--with-freemarker-jar="${HERE}/freemarker-2.3.8/lib/freemarker.jar" \
--with-freemarker-jar="$(ls ${HERE}/apache-freemarker-*-bin/freemarker.jar | tail -1)" \
--with-noncompressedrefs \
--with-extra-cflags="${CFLAGS}" \
--with-extra-cxxflags="${CXXFLAGS}" \
Expand Down
6 changes: 3 additions & 3 deletions prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
: ${omr_repo:='https://github.com/eclipse/openj9-omr'}
: ${omr_branch:='openj9'}

: ${freemarker_version:='2.3.8'}
: ${freemarker_url:="https://sourceforge.net/projects/freemarker/files/freemarker/${freemarker_version}/freemarker-${freemarker_version}.tar.gz"}
: ${freemarker_version:='2.3.31'}
: ${freemarker_url:="https://dlcdn.apache.org/freemarker/engine/${freemarker_version}/binaries/apache-freemarker-${freemarker_version}-bin.tar.gz"}

if [ ! -d openj9-openjdk-jdk11 ]; then
git clone --branch "$openjdk_branch" "$openjdk_repo" openj9-openjdk-jdk11 --depth 1
Expand All @@ -24,7 +24,7 @@ if [ ! -d openj9-openjdk-jdk11/openj9 ]; then
git clone --branch "$openj9_branch" "$openj9_repo" openj9-openjdk-jdk11/openj9
fi

if [ ! -f "freemarker-${freemarker_version}/lib/freemarker.jar" ]; then
if [ ! -f "apache-freemarker-${freemarker_version}-bin/freemarker.jar" ]; then
wget -O freemarker.tar.gz "${freemarker_url}"
tar -xf freemarker.tar.gz
fi

0 comments on commit 3469611

Please sign in to comment.