Changeset 1af23a4 for build.xml

Timestamp:

Oct 10, 2016 12:31:28 PM (3 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

72105e2

Parents:

6b7d22c2

Message:

Debian: Don't use glassfish-javaee.jar for jstl.jar (ticket #1793)

File:

• build.xml (modified) (3 diffs)

build.xml

@@ -1267 +1267 @@
 
     <!-- todo handle alt package too -->
+    <!--
+       glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
     <target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
+    -->
+    <target name="copyjstl-unlesspkg" >
         <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
     </target>
@@ -2193 +2197 @@
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
             <!-- libjstl1.1-java or glassfish-javaee -->
+          <!--
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
+           -->
             <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
@@ -2276 +2282 @@
            -->
             <!-- libjstl1.1-java or glassfish-javaee -->
+          <!--
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
+           -->
             <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />