[jakarta-taglibs-standard] 07/08: Transition to the Servlet API 3.1 (Closes: #780701, #801012)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 2 22:33:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jakarta-taglibs-standard.
commit 4c4f1c0f0aaf0404e1415c9a5b0f9d1a8c71bd7d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 2 23:17:25 2015 +0100
Transition to the Servlet API 3.1 (Closes: #780701, #801012)
---
debian/ant.properties | 4 +-
debian/changelog | 1 +
debian/control | 2 +-
debian/patches/01-jdbc-compatibility.patch | 40 ++++++++++
debian/patches/01_fix_build.diff | 42 ----------
debian/patches/02-servlet-api-compatibility.patch | 35 +++++++++
debian/patches/CVE-2015-0254.patch | 96 +++++++++++------------
debian/patches/series | 4 +-
debian/rules | 2 +-
9 files changed, 130 insertions(+), 96 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
index a89b6a8..4c1f151 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -2,6 +2,6 @@ build.dir=build
dist.dir=dist
ant.build.javac.source=1.5
ant.build.javac.target=1.5
-servlet24.jar=/usr/share/java/servlet-api-2.5.jar
-jsp20.jar=/usr/share/java/jsp-api-2.1.jar
+servlet24.jar=/usr/share/java/servlet-api-3.1.jar
+jsp20.jar=/usr/share/java/jsp-api-2.3.jar
xalan.jar=/usr/share/java/xalan2.jar
diff --git a/debian/changelog b/debian/changelog
index 4586409..68461a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jakarta-taglibs-standard (1.1.2-4) UNRELEASED; urgency=medium
* Team upload.
* Removed the Servlet, JSP and EL API jars from the classpath specified
in the manifest (Closes: #806905)
+ * Transition to the Servlet API 3.1 (Closes: #780701, #801012)
* debian/control:
- Removed the deprecated DM-Upload-Allowed field
- Standards-Version updated to 3.9.6 (no changes)
diff --git a/debian/control b/debian/control
index 91539fb..7d56b43 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
debhelper (>= 9),
javahelper,
maven-repo-helper (>= 1.5~)
-Build-Depends-Indep: default-jdk, libservlet2.5-java, libxalan2-java
+Build-Depends-Indep: default-jdk, libservlet3.1-java, libxalan2-java
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/jakarta-taglibs-standard.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jakarta-taglibs-standard.git
diff --git a/debian/patches/01-jdbc-compatibility.patch b/debian/patches/01-jdbc-compatibility.patch
new file mode 100644
index 0000000..e20c45a
--- /dev/null
+++ b/debian/patches/01-jdbc-compatibility.patch
@@ -0,0 +1,40 @@
+Description: Fix the compatibility with the latest JDBC API
+Author: Onkar Shinde <onshinde at ubuntu.com>
+Forwarded: not-needed
+--- a/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+@@ -25,6 +25,9 @@
+
+ import org.apache.taglibs.standard.resources.Resources;
+
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
++
+
+ /**
+ * <p>A simple <code>DataSource</code> wrapper for the standard
+@@ -111,5 +114,24 @@
+ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
+ }
+
++ /**
++ * Placeholder method to fix compilation.
++ */
++ public boolean isWrapperFor(Class iface) throws SQLException {
++ return true;
++ }
++
++ /**
++ * Placeholder method to fix compilation.
++ */
++ public Object unwrap(Class iface) throws SQLException {
++ return null;
++ }
+
++ /*
++ * JDBC 4.1
++ */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
diff --git a/debian/patches/01_fix_build.diff b/debian/patches/01_fix_build.diff
deleted file mode 100644
index 610bad4..0000000
--- a/debian/patches/01_fix_build.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Added method stubs to fix compilation against servlet-api-2.5.
-Forwarded: not-needed
-Author: Onkar Shinde <onshinde at ubuntu.com>
---- a/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2011-06-09 11:41:17.000000000 +0530
-+++ b/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2011-06-09 11:41:22.000000000 +0530
-@@ -111,5 +111,18 @@
- throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
- }
-
-+ /**
-+ * Placeholder method to fix compilation.
-+ */
-+ public boolean isWrapperFor(Class iface) throws SQLException {
-+ return true;
-+ }
-+
-+ /**
-+ * Placeholder method to fix compilation.
-+ */
-+ public Object unwrap(Class iface) throws SQLException {
-+ return null;
-+ }
-
- }
---- a/standard/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java 2011-06-09 11:41:17.000000000 +0530
-+++ b/standard/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java 2011-06-09 11:41:22.000000000 +0530
-@@ -21,6 +21,7 @@
- import java.util.HashMap;
- import java.util.Map;
-
-+import javax.el.ELContext;
- import javax.servlet.Servlet;
- import javax.servlet.ServletConfig;
- import javax.servlet.ServletContext;
-@@ -297,5 +298,7 @@
- public void include(java.lang.String relativeUrlPath, boolean flush) {}
- public ExpressionEvaluator getExpressionEvaluator() { return null; }
- public VariableResolver getVariableResolver() { return null; }
-+
-+ public ELContext getELContext() { return null; }
-
- }
diff --git a/debian/patches/02-servlet-api-compatibility.patch b/debian/patches/02-servlet-api-compatibility.patch
new file mode 100644
index 0000000..6ef0fbb
--- /dev/null
+++ b/debian/patches/02-servlet-api-compatibility.patch
@@ -0,0 +1,35 @@
+Description: Fix the compatibility with the latest Servlet API
+Forwarded: no
+--- a/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
+@@ -409,6 +409,12 @@
+ public void write(int b) throws IOException {
+ bos.write(b);
+ }
++
++ public boolean isReady() {
++ return true;
++ }
++
++ public void setWriteListener(javax.servlet.WriteListener listener) {}
+ };
+
+ /** 'True' if getWriter() was called; false otherwise. */
+--- a/standard/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
++++ b/standard/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
+@@ -21,6 +21,7 @@
+ import java.util.HashMap;
+ import java.util.Map;
+
++import javax.el.ELContext;
+ import javax.servlet.Servlet;
+ import javax.servlet.ServletConfig;
+ import javax.servlet.ServletContext;
+@@ -297,5 +298,7 @@
+ public void include(java.lang.String relativeUrlPath, boolean flush) {}
+ public ExpressionEvaluator getExpressionEvaluator() { return null; }
+ public VariableResolver getVariableResolver() { return null; }
++
++ public ELContext getELContext() { return null; }
+
+ }
diff --git a/debian/patches/CVE-2015-0254.patch b/debian/patches/CVE-2015-0254.patch
index cc2a804..fe46e41 100644
--- a/debian/patches/CVE-2015-0254.patch
+++ b/debian/patches/CVE-2015-0254.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
Last-Update: 2015-03-14
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.2/standard/src/javax/servlet/jsp/jstl/tlv/ParserUtil.java
++++ b/standard/src/javax/servlet/jsp/jstl/tlv/ParserUtil.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -99,8 +99,8 @@ Last-Update: 2015-03-14
+ }
+ }
+}
---- jakarta-taglibs-standard-1.1.2.orig/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
-+++ jakarta-taglibs-standard-1.1.2/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
+--- a/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
++++ b/standard/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
@@ -17,6 +17,7 @@
package javax.servlet.jsp.jstl.tlv;
@@ -109,7 +109,7 @@ Last-Update: 2015-03-14
import java.util.HashSet;
import java.util.Set;
import java.util.StringTokenizer;
-@@ -92,8 +93,7 @@ public class PermittedTaglibsTLV extends
+@@ -92,8 +93,7 @@
//*********************************************************************
// Validation entry point
@@ -119,7 +119,7 @@ Last-Update: 2015-03-14
try {
// initialize
-@@ -104,10 +104,7 @@ public class PermittedTaglibsTLV extends
+@@ -104,10 +104,7 @@
DefaultHandler h = new PermittedTaglibsHandler();
// parse the page
@@ -131,9 +131,9 @@ Last-Update: 2015-03-14
if (failed)
return vmFromString(
---- jakarta-taglibs-standard-1.1.2.orig/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
-+++ jakarta-taglibs-standard-1.1.2/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
-@@ -24,7 +24,6 @@ import javax.servlet.jsp.tagext.PageData
+--- a/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
++++ b/standard/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
+@@ -24,7 +24,6 @@
import javax.servlet.jsp.tagext.TagLibraryValidator;
import javax.servlet.jsp.tagext.ValidationMessage;
import javax.xml.parsers.ParserConfigurationException;
@@ -141,7 +141,7 @@ Last-Update: 2015-03-14
import javax.xml.parsers.SAXParserFactory;
import org.xml.sax.Attributes;
-@@ -100,32 +99,19 @@ public class ScriptFreeTLV extends TagLi
+@@ -100,32 +99,19 @@
* @return null, if the page is valid; otherwise, a ValidationMessage[]
* containing one or more messages indicating why the page is not valid.
*/
@@ -186,9 +186,9 @@ Last-Update: 2015-03-14
/**
* Handler for SAX events.
---- jakarta-taglibs-standard-1.1.2.orig/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
-@@ -45,6 +45,7 @@ import javax.servlet.jsp.tagext.BodyTagS
+--- a/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
+@@ -45,6 +45,7 @@
import javax.servlet.jsp.tagext.TryCatchFinally;
import org.apache.taglibs.standard.resources.Resources;
@@ -196,7 +196,7 @@ Last-Update: 2015-03-14
/**
* <p>Support for tag handlers for <import>, the general-purpose
-@@ -60,22 +61,6 @@ public abstract class ImportSupport exte
+@@ -60,22 +61,6 @@
//*********************************************************************
// Public constants
@@ -219,7 +219,7 @@ Last-Update: 2015-03-14
/** Default character encoding for response. */
public static final String DEFAULT_ENCODING = "ISO-8859-1";
-@@ -133,7 +118,7 @@ public abstract class ImportSupport exte
+@@ -133,7 +118,7 @@
throw new NullAttributeException("import", "url");
// Record whether our URL is absolute or relative
@@ -228,7 +228,7 @@ Last-Update: 2015-03-14
try {
// If we need to expose a Reader, we've got to do it right away
-@@ -494,43 +479,10 @@ public abstract class ImportSupport exte
+@@ -500,43 +485,10 @@
return urlWithParams;
}
@@ -272,9 +272,9 @@ Last-Update: 2015-03-14
* Strips a servlet session ID from <tt>url</tt>. The session ID
* is encoded as a URL "path parameter" beginning with "jsessionid=".
* We thus remove anything we find between ";jsessionid=" (inclusive)
---- jakarta-taglibs-standard-1.1.2.orig/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
-@@ -22,6 +22,8 @@ import javax.servlet.jsp.JspTagException
+--- a/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
+@@ -22,6 +22,8 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -283,7 +283,7 @@ Last-Update: 2015-03-14
/**
* <p>Support for tag handlers for <redirect>, JSTL 1.0's tag
* for redirecting to a new URL (with optional query parameters).</p>
-@@ -90,29 +92,30 @@ public abstract class RedirectSupport ex
+@@ -90,29 +92,30 @@
return EVAL_BODY_BUFFERED;
}
@@ -326,9 +326,9 @@ Last-Update: 2015-03-14
}
// Releases any resources we may have (or inherit)
---- jakarta-taglibs-standard-1.1.2.orig/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
-@@ -24,6 +24,7 @@ import javax.servlet.jsp.PageContext;
+--- a/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
+@@ -24,6 +24,7 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.resources.Resources;
@@ -336,7 +336,7 @@ Last-Update: 2015-03-14
/**
* <p>Support for tag handlers for <url>, the URL creation
-@@ -104,7 +105,7 @@ public abstract class UrlSupport extends
+@@ -104,7 +105,7 @@
result = params.aggregateParams(baseUrl);
// if the URL is relative, rewrite it
@@ -345,7 +345,7 @@ Last-Update: 2015-03-14
HttpServletResponse response =
((HttpServletResponse) pageContext.getResponse());
result = response.encodeURL(result);
-@@ -134,29 +135,32 @@ public abstract class UrlSupport extends
+@@ -134,29 +135,32 @@
public static String resolveUrl(
String url, String context, PageContext pageContext)
@@ -397,7 +397,7 @@ Last-Update: 2015-03-14
return (context + url);
}
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -531,8 +531,8 @@ Last-Update: 2015-03-14
+ }
+ }
+}
---- jakarta-taglibs-standard-1.1.2.orig/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
+--- a/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
@@ -16,36 +16,26 @@
package org.apache.taglibs.standard.tag.common.xml;
@@ -570,7 +570,7 @@ Last-Update: 2015-03-14
/**
* <p>Support for tag handlers for <parse>, the XML parsing tag.</p>
-@@ -68,12 +58,7 @@ public abstract class ParseSupport exten
+@@ -68,12 +58,7 @@
private String varDom; // 'varDom' attribute
private int scope; // processed 'scope' attr
private int scopeDom; // processed 'scopeDom' attr
@@ -584,7 +584,7 @@ Last-Update: 2015-03-14
//*********************************************************************
-@@ -89,76 +74,50 @@ public abstract class ParseSupport exten
+@@ -89,76 +74,50 @@
xml = null;
systemId = null;
filter = null;
@@ -694,7 +694,7 @@ Last-Update: 2015-03-14
}
// Releases any resources we may have (or inherit)
-@@ -171,126 +130,48 @@ public abstract class ParseSupport exten
+@@ -171,126 +130,48 @@
// Private utility methods
/** Parses the given InputSource after, applying the given XMLFilter. */
@@ -850,8 +850,8 @@ Last-Update: 2015-03-14
}
//*********************************************************************
---- jakarta-taglibs-standard-1.1.2.orig/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
+--- a/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
@@ -16,43 +16,29 @@
package org.apache.taglibs.standard.tag.common.xml;
@@ -897,7 +897,7 @@ Last-Update: 2015-03-14
/**
* <p>Support for tag handlers for <transform>, the XML transformation
-@@ -66,6 +52,7 @@ public abstract class TransformSupport e
+@@ -66,6 +52,7 @@
// Protected state
protected Object xml; // attribute
@@ -905,7 +905,7 @@ Last-Update: 2015-03-14
protected String xmlSystemId; // attribute
protected Object xslt; // attribute
protected String xsltSystemId; // attribute
-@@ -77,25 +64,22 @@ public abstract class TransformSupport e
+@@ -77,25 +64,22 @@
private String var; // 'var' attribute
private int scope; // processed 'scope' attr
private Transformer t; // actual Transformer
@@ -934,7 +934,7 @@ Last-Update: 2015-03-14
scope = PageContext.PAGE_SCOPE;
}
-@@ -104,107 +88,70 @@ public abstract class TransformSupport e
+@@ -104,107 +88,70 @@
// Tag logic
public int doStartTag() throws JspException {
@@ -1101,7 +1101,7 @@ Last-Update: 2015-03-14
}
// Releases any resources we may have (or inherit)
-@@ -212,6 +159,11 @@ public abstract class TransformSupport e
+@@ -212,6 +159,11 @@
init();
}
@@ -1113,7 +1113,7 @@ Last-Update: 2015-03-14
//*********************************************************************
// Public methods for subtags
-@@ -226,64 +178,67 @@ public abstract class TransformSupport e
+@@ -226,64 +178,67 @@
// Utility methods
/**
@@ -1232,7 +1232,7 @@ Last-Update: 2015-03-14
//*********************************************************************
// Tag attributes
-@@ -294,88 +249,4 @@ public abstract class TransformSupport e
+@@ -294,88 +249,4 @@
public void setScope(String scope) {
this.scope = Util.getScope(scope);
}
@@ -1322,7 +1322,7 @@ Last-Update: 2015-03-14
-
}
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1415,7 +1415,7 @@ Last-Update: 2015-03-14
+ }
+}
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
++++ b/standard/src/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
@@ -0,0 +1,279 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1696,8 +1696,8 @@ Last-Update: 2015-03-14
+ }
+ }
+}
---- jakarta-taglibs-standard-1.1.2.orig/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
+--- a/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
++++ b/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
@@ -17,6 +17,7 @@
package org.apache.taglibs.standard.tlv;
@@ -1706,7 +1706,7 @@ Last-Update: 2015-03-14
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-@@ -30,15 +31,15 @@ import javax.servlet.jsp.tagext.PageData
+@@ -30,15 +31,15 @@
import javax.servlet.jsp.tagext.TagData;
import javax.servlet.jsp.tagext.TagLibraryValidator;
import javax.servlet.jsp.tagext.ValidationMessage;
@@ -1725,7 +1725,7 @@ Last-Update: 2015-03-14
import org.xml.sax.helpers.DefaultHandler;
/**
-@@ -149,11 +150,19 @@ public abstract class JstlBaseTLV extend
+@@ -149,11 +150,19 @@
DefaultHandler h = getHandler();
// parse the page
@@ -1750,7 +1750,7 @@ Last-Update: 2015-03-14
if (messageVector.size() == 0)
return null;
-@@ -162,8 +171,6 @@ public abstract class JstlBaseTLV extend
+@@ -162,8 +171,6 @@
} catch (SAXException ex) {
return vmFromString(ex.toString());
@@ -1760,7 +1760,7 @@ Last-Update: 2015-03-14
return vmFromString(ex.toString());
}
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/util/UnclosableWriter.java
++++ b/standard/src/org/apache/taglibs/standard/util/UnclosableWriter.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1807,7 +1807,7 @@ Last-Update: 2015-03-14
+ }
+}
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/util/UrlUtil.java
++++ b/standard/src/org/apache/taglibs/standard/util/UrlUtil.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1890,7 +1890,7 @@ Last-Update: 2015-03-14
+ }
+}
--- /dev/null
-+++ jakarta-taglibs-standard-1.1.2/standard/src/org/apache/taglibs/standard/util/XmlUtil.java
++++ b/standard/src/org/apache/taglibs/standard/util/XmlUtil.java
@@ -0,0 +1,345 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/debian/patches/series b/debian/patches/series
index 88a1f4b..56884ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-01_fix_build.diff
-java7-compat.patch
+01-jdbc-compatibility.patch
+02-servlet-api-compatibility.patch
CVE-2015-0254.patch
diff --git a/debian/rules b/debian/rules
index bcae12e..9487ed2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/el-api-2.1.jar
+export CLASSPATH=/usr/share/java/el-api-3.0.jar
DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)-.*,\1,p')
MAVEN_REPO := http://repo1.maven.org/maven2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-taglibs-standard.git
More information about the pkg-java-commits
mailing list