diff --git a/LICENSE.txt b/LICENSE.txt index e93798548..250261d98 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -121,7 +121,6 @@ Applications: Copyright 2000-2004 Mort Bay Consulting Pty. Ltd. See licenses/LICENSE-Apache1.1.txt See licenses/LICENSE-Apache2.0.txt - See licenses/NOTICE-Ant.txt See licenses/NOTICE-Commons-Logging.txt JRobin 1.4.0: diff --git a/build.xml b/build.xml index fc251a40a..f9dc3611b 100644 --- a/build.xml +++ b/build.xml @@ -72,7 +72,6 @@ - @@ -103,7 +102,7 @@ - + @@ -210,7 +209,6 @@ - @@ -396,7 +394,6 @@ - @@ -491,7 +488,7 @@ - + diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config index 42958ba77..e35484de1 100644 --- a/installer/resources/wrapper.config +++ b/installer/resources/wrapper.config @@ -46,18 +46,17 @@ wrapper.java.classpath.11=lib/jasper-compiler.jar wrapper.java.classpath.12=lib/jasper-runtime.jar wrapper.java.classpath.13=lib/commons-logging.jar wrapper.java.classpath.14=lib/commons-el.jar -wrapper.java.classpath.15=lib/ant.jar # java service wrapper, BSD -wrapper.java.classpath.16=lib/wrapper.jar +wrapper.java.classpath.15=lib/wrapper.jar # systray, LGPL -wrapper.java.classpath.17=lib/systray.jar -wrapper.java.classpath.18=lib/systray4j.jar +wrapper.java.classpath.16=lib/systray.jar +wrapper.java.classpath.17=lib/systray4j.jar # BOB -wrapper.java.classpath.19=lib/BOB.jar +wrapper.java.classpath.18=lib/BOB.jar # desktopgui -wrapper.java.classpath.20=lib/appframework.jar -wrapper.java.classpath.21=lib/swing-worker.jar -wrapper.java.classpath.22=lib/desktopgui.jar +wrapper.java.classpath.19=lib/appframework.jar +wrapper.java.classpath.20=lib/swing-worker.jar +wrapper.java.classpath.21=lib/desktopgui.jar # Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=. diff --git a/licenses/NOTICE-Ant.txt b/licenses/NOTICE-Ant.txt deleted file mode 100644 index 1fb6dde47..000000000 --- a/licenses/NOTICE-Ant.txt +++ /dev/null @@ -1,15 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to the section 4 d of == - == the Apache License, Version 2.0, == - == in this case for the Apache Ant distribution. == - ========================================================================= - - This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). - - This product includes also software developed by : - - the W3C consortium (http://www.w3c.org) , - - the SAX project (http://www.saxproject.org) - - Please read the different LICENSE files present in the root directory of - this distribution.