Remove unused dependency on commons-daemon
This commit is contained in:
parent
3438c66895
commit
5e1b6dae43
|
@ -95,7 +95,6 @@ BuildRequires: ant
|
||||||
BuildRequires: ecj >= 1:4.6.3
|
BuildRequires: ecj >= 1:4.6.3
|
||||||
BuildRequires: findutils
|
BuildRequires: findutils
|
||||||
BuildRequires: apache-commons-collections
|
BuildRequires: apache-commons-collections
|
||||||
BuildRequires: apache-commons-daemon
|
|
||||||
BuildRequires: apache-commons-dbcp
|
BuildRequires: apache-commons-dbcp
|
||||||
BuildRequires: apache-commons-pool
|
BuildRequires: apache-commons-pool
|
||||||
BuildRequires: java-devel >= 1:1.8.0
|
BuildRequires: java-devel >= 1:1.8.0
|
||||||
|
@ -110,7 +109,6 @@ BuildRequires: geronimo-jaxrpc
|
||||||
BuildRequires: wsdl4j
|
BuildRequires: wsdl4j
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
|
|
||||||
Requires: apache-commons-daemon
|
|
||||||
Requires: apache-commons-collections
|
Requires: apache-commons-collections
|
||||||
Requires: apache-commons-dbcp
|
Requires: apache-commons-dbcp
|
||||||
Requires: apache-commons-pool
|
Requires: apache-commons-pool
|
||||||
|
@ -191,7 +189,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
|
||||||
%{ant} -Dbase.path="." \
|
%{ant} -Dbase.path="." \
|
||||||
-Dbuild.compiler="modern" \
|
-Dbuild.compiler="modern" \
|
||||||
-Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \
|
-Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \
|
||||||
-Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \
|
-Dcommons-daemon.jar="HACK" \
|
||||||
-Dcommons-daemon.native.src.tgz="HACK" \
|
-Dcommons-daemon.native.src.tgz="HACK" \
|
||||||
-Djdt.jar="$(build-classpath ecj)" \
|
-Djdt.jar="$(build-classpath ecj)" \
|
||||||
-Dtomcat-native.tar.gz="HACK" \
|
-Dtomcat-native.tar.gz="HACK" \
|
||||||
|
|
|
@ -34,7 +34,7 @@ export CLASSPATH
|
||||||
MAIN_CLASS="org.apache.catalina.startup.Tool"
|
MAIN_CLASS="org.apache.catalina.startup.Tool"
|
||||||
BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
|
BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
|
||||||
BASE_OPTIONS=""
|
BASE_OPTIONS=""
|
||||||
BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
|
BASE_JARS="tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
|
||||||
|
|
||||||
# Set parameters
|
# Set parameters
|
||||||
set_classpath $BASE_JARS
|
set_classpath $BASE_JARS
|
||||||
|
|
|
@ -34,7 +34,7 @@ export CLASSPATH
|
||||||
MAIN_CLASS="org.apache.catalina.startup.Tool"
|
MAIN_CLASS="org.apache.catalina.startup.Tool"
|
||||||
BASE_OPTIONS=""
|
BASE_OPTIONS=""
|
||||||
BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
|
BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
|
||||||
BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
|
BASE_JARS="tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
|
||||||
|
|
||||||
# Set parameters
|
# Set parameters
|
||||||
set_classpath $BASE_JARS
|
set_classpath $BASE_JARS
|
||||||
|
|
Loading…
Reference in New Issue