Use maven instead of ant when building zookeeper

Test: zookeeper
pull/363/head
pataar 2021-06-30 10:27:13 +02:00
parent 2d863801ee
commit c9ebe98a61
1 changed files with 5 additions and 5 deletions

View File

@ -48,7 +48,7 @@ fi
# Reset the Internal Field Separator # Reset the Internal Field Separator
resetIFS() { resetIFS() {
IFS=' IFS='
' '
} }
@ -968,7 +968,7 @@ buildRequiredPackageLists() {
;; ;;
zookeeper@alpine) zookeeper@alpine)
if ! test -f /usr/local/include/zookeeper/zookeeper.h; then if ! test -f /usr/local/include/zookeeper/zookeeper.h; then
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile apache-ant automake libtool openjdk8" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile maven automake libtool openjdk8"
fi fi
;; ;;
zookeeper@debian) zookeeper@debian)
@ -1359,7 +1359,7 @@ installBundledModule() {
+ PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) + PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4) PHP_DBA_STD_RESULT(db4,Berkeley DB4)
EOF EOF
fi fi
docker-php-ext-configure dba --with-db4 docker-php-ext-configure dba --with-db4
@ -2209,7 +2209,7 @@ installRemoteModule() {
fi fi
installRemoteModule_src="$(getPackageSource https://downloads.apache.org/zookeeper/stable/$installRemoteModule_tmp)" installRemoteModule_src="$(getPackageSource https://downloads.apache.org/zookeeper/stable/$installRemoteModule_tmp)"
cd -- "$installRemoteModule_src" cd -- "$installRemoteModule_src"
ant compile_jute mvn -pl zookeeper-jute compile
cd - >/dev/null cd - >/dev/null
cd -- "$installRemoteModule_src/zookeeper-client/zookeeper-client-c" cd -- "$installRemoteModule_src/zookeeper-client/zookeeper-client-c"
autoreconf -if autoreconf -if
@ -2506,4 +2506,4 @@ for PHP_MODULE_TO_INSTALL in $PHP_MODULES_TO_INSTALL; do
installRemoteModule "$PHP_MODULE_TO_INSTALL" installRemoteModule "$PHP_MODULE_TO_INSTALL"
fi fi
done done
cleanup cleanup