From 892342747620cb125aa26f6f175b8d172fe6933e Mon Sep 17 00:00:00 2001
From: Markus Mandalka <github@mandalka.name>
Date: Mon, 20 Dec 2021 07:46:40 +0100
Subject: [PATCH] Move environment variables of Tika version and url to
 separate config file for build of all different packages and images so we
 have not to upgrade multiple files on new Tika releases.

---
 build-deb           | 12 ++++++------
 src/tika-server.deb |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-deb b/build-deb
index 7cf47d5..5ffbba2 100755
--- a/build-deb
+++ b/build-deb
@@ -1,9 +1,5 @@
 #/bin/bash
 
-TIKA_VERSION=2.2.0
-TIKA_URL=https://archive.apache.org/dist/tika/$TIKA_VERSION/tika-server-standard-$TIKA_VERSION.jar
-
-
 VERSION=`date +%y.%m.%d`
 PACKAGE=open-semantic-search_${VERSION}.deb
 BUILDDIR=/tmp/open-semantic-search-$$.deb
@@ -14,7 +10,6 @@ echo "Building ${PACKAGE} in temp directory ${BUILDDIR}"
 mkdir ${BUILDDIR}
 mkdir ${BUILDDIR}/opt
 
-
 cp -a DEBIAN ${BUILDDIR}/
 
 
@@ -134,6 +129,9 @@ cp src/solr-synonames/synonames2solr.py ${BUILDDIR}/usr/lib/python3/dist-package
 # Include tika-server.deb
 #
 
+# read $TIKA_VERSION and $TIKA_URL from config file tika-version.env
+source src/tika-server.deb/tika-version.env
+
 # if not yet there, download Tika-server binary release
 if [ ! -f "src/tika-server.deb/usr/share/java/tika-server-standard-$TIKA_VERSION.jar" ]; then
     echo "Downloading Tika"
@@ -141,7 +139,9 @@ if [ ! -f "src/tika-server.deb/usr/share/java/tika-server-standard-$TIKA_VERSION
 fi
 
 cp -a src/tika-server.deb/etc ${BUILDDIR}/
-cp -a src/tika-server.deb/usr ${BUILDDIR}/
+
+mkdir -p ${BUILDDIR}/usr/share/java/
+cp src/tika-server.deb/usr/share/java/tika-server-standard-$TIKA_VERSION.jar ${BUILDDIR}/usr/share/java/
 
 ln -s tika-server-standard-$TIKA_VERSION.jar ${BUILDDIR}/usr/share/java/tika-server-standard.jar
 
diff --git a/src/tika-server.deb b/src/tika-server.deb
index 6d0ccc1..d23620e 160000
--- a/src/tika-server.deb
+++ b/src/tika-server.deb
@@ -1 +1 @@
-Subproject commit 6d0ccc15e592e3cbfc639f383c6e35c82920025b
+Subproject commit d23620eb63628168ce7acdc83dcba270f586aa84