[jakarta-jmeter] 39/60: New upstream release (2.11) Added new dependencies on librsyntaxtextarea-java and libmongodb-java Removed 03_bouncycastle_update.patch (fixed upstream)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Mar 29 22:43:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jakarta-jmeter.
commit 2e77600c456a17d95b52387b15445de48d2502eb
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jul 17 15:29:35 2014 +0000
New upstream release (2.11)
Added new dependencies on librsyntaxtextarea-java and libmongodb-java
Removed 03_bouncycastle_update.patch (fixed upstream)
---
debian/changelog | 6 +-
debian/control | 1 +
debian/jmeter.classpath | 2 +-
debian/patches/01_improve_cli_help.patch | 15 +--
debian/patches/02_disable_components.patch | 10 +-
debian/patches/03_bouncycastle_update.patch | 24 ----
debian/patches/04_java8_compatibility.patch | 23 +++-
debian/patches/05_ignore-jodd.patch | 202 +++++++++++++++++++++++++++-
debian/patches/series | 1 -
debian/rules | 2 +-
10 files changed, 231 insertions(+), 55 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 84bcdd9..c9205fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-jakarta-jmeter (2.9-1) UNRELEASED; urgency=medium
+jakarta-jmeter (2.11-1) UNRELEASED; urgency=medium
* New upstream release
- Refreshed the patches
- - Added a dependency on libtika-java
+ - Added new dependencies on libtika-java, librsyntaxtextarea-java
+ and libmongodb-java
+ - Removed 03_bouncycastle_update.patch (fixed upstream)
* Use XZ compression for the upstream tarball
-- Emmanuel Bourg <ebourg at apache.org> Thu, 17 Jul 2014 13:02:56 +0200
diff --git a/debian/control b/debian/control
index e77e518..15a8cb1 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Build-Depends-Indep: default-jdk,
libjtidy-java,
liboro-java,
librhino-java,
+ librsyntaxtextarea-java,
libtika-java,
libxalan2-java,
libxmlgraphics-commons-java,
diff --git a/debian/jmeter.classpath b/debian/jmeter.classpath
index a7bee84..64ac841 100644
--- a/debian/jmeter.classpath
+++ b/debian/jmeter.classpath
@@ -1,6 +1,6 @@
usr/share/jmeter/lib/jorphan.jar /usr/share/java/avalon-framework.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logger.jar /usr/share/java/excalibur-logkit.jar
usr/share/jmeter/lib/ext/ApacheJMeter_components.jar /usr/share/java/bcmail.jar /usr/share/java/bcprov.jar /usr/share/java/bsf.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/java/jcharts.jar /usr/share/java/jdom1.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar
-usr/share/jmeter/lib/ext/ApacheJMeter_core.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xmlgraphics-commons.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/tika-core.jar /usr/share/java/tika-parsers.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_core.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xmlgraphics-commons.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/tika-core.jar /usr/share/java/tika-parsers.jar /usr/share/java/rsyntaxtext [...]
usr/share/jmeter/lib/ext/ApacheJMeter_functions.jar /usr/share/java/commons-io.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar
usr/share/jmeter/lib/ext/ApacheJMeter_monitors.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar
usr/share/jmeter/lib/ext/ApacheJMeter_report.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/jcharts.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar
diff --git a/debian/patches/01_improve_cli_help.patch b/debian/patches/01_improve_cli_help.patch
index 22aaf8e..60b2e14 100644
--- a/debian/patches/01_improve_cli_help.patch
+++ b/debian/patches/01_improve_cli_help.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/src/core/org/apache/jmeter/JMeter.java
+++ b/src/core/org/apache/jmeter/JMeter.java
-@@ -284,8 +284,7 @@
+@@ -286,8 +286,7 @@
}
if (null != error) {
System.err.println("Error: " + error);
@@ -13,7 +13,7 @@ Forwarded: no
return;
}
try {
-@@ -354,7 +353,10 @@
+@@ -356,7 +355,10 @@
System.out.println(JMeterUtils.getJMeterCopyright());
System.out.println("Version " + JMeterUtils.getJMeterVersion());
} else if (parser.getArgumentById(HELP_OPT) != null) {
@@ -25,7 +25,7 @@ Forwarded: no
} else if (parser.getArgumentById(SERVER_OPT) != null) {
// Start the server
try {
-@@ -390,9 +392,8 @@
+@@ -392,9 +394,8 @@
}
}
} catch (IllegalUserActionException e) {
@@ -37,13 +37,6 @@ Forwarded: no
} catch (Throwable e) {
log.fatalError("An error occurred: ",e);
System.out.println("An error occurred: " + e.getMessage());
-@@ -1165,4 +1166,4 @@
-
- return socket;
- }
--}
-\ No newline at end of file
-+}
--- /dev/null
+++ b/src/core/org/apache/jmeter/examples.txt
@@ -0,0 +1,19 @@
@@ -68,7 +61,7 @@ Forwarded: no
+ or jmeter-server
--- a/build.xml
+++ b/build.xml
-@@ -947,7 +947,7 @@
+@@ -980,7 +980,7 @@
<exclude name="*eucJP*"/>
</fileset>
<!-- This file is used by the jmeter -h option -->
diff --git a/debian/patches/02_disable_components.patch b/debian/patches/02_disable_components.patch
index 8e325df..fc64984 100644
--- a/debian/patches/02_disable_components.patch
+++ b/debian/patches/02_disable_components.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
Author: Onkar Shinde <onshinde at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -589,9 +589,10 @@
+@@ -599,9 +599,10 @@
<target name="compile-http" depends="compile-jorphan,compile-core,compile-components" description="Compile components specific to HTTP sampling.">
<mkdir dir="${build.http}"/>
<!-- Directory needs to exist, or jar will fail -->
@@ -16,7 +16,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
<classpath>
<pathelement location="${build.jorphan}"/>
<pathelement location="${build.core}"/>
-@@ -738,7 +739,7 @@
+@@ -748,7 +749,7 @@
</javac>
</target>
@@ -25,7 +25,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
<target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components.">
<mkdir dir="${build.examples}"/>
-@@ -991,14 +992,14 @@
+@@ -1024,14 +1025,14 @@
</jar>
<!-- jdbc -->
@@ -42,12 +42,12 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
<!-- java -->
<jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
-@@ -2175,7 +2176,7 @@
+@@ -2236,7 +2237,7 @@
packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
excludepackagenames="org.apache.jorphan.timer">
<classpath refid="classpath"/>
- <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+ <link href="file:///usr/share/doc/default-jdk-doc/api/"/>
</javadoc>
+ <patch-javadoc dir="${dest.docs.api}" docencoding="${javadoc.encoding}"/>
</target>
-
diff --git a/debian/patches/03_bouncycastle_update.patch b/debian/patches/03_bouncycastle_update.patch
deleted file mode 100644
index 3e764d1..0000000
--- a/debian/patches/03_bouncycastle_update.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Update to compile against the latest versions of Bouncy Castle
-Author: Emmanuel Bourg <ebourg at apache.org>
-Origin: vendor
-Forwarded: yes
-Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54776
---- a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
-+++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
-@@ -52,6 +52,7 @@
- import org.bouncycastle.cms.CMSException;
- import org.bouncycastle.cms.SignerInformation;
- import org.bouncycastle.cms.SignerInformationStore;
-+import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
- import org.bouncycastle.jce.PrincipalUtil;
- import org.bouncycastle.jce.X509Principal;
- import org.bouncycastle.jce.provider.BouncyCastleProvider;
-@@ -152,7 +153,7 @@
- if (signerIt.hasNext()) {
-
- SignerInformation signer = (SignerInformation) signerIt.next();
-- Iterator<?> certIt = certs.getCertificates(signer.getSID()).iterator();
-+ Iterator<?> certIt = certs.getCertificates(new JcaX509CertSelectorConverter().getCertSelector(signer.getSID())).iterator();
-
- if (certIt.hasNext()) {
- // the signer certificate
diff --git a/debian/patches/04_java8_compatibility.patch b/debian/patches/04_java8_compatibility.patch
index 4fa0d83..d6e1d86 100644
--- a/debian/patches/04_java8_compatibility.patch
+++ b/debian/patches/04_java8_compatibility.patch
@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360
--- a/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
+++ b/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
-@@ -117,7 +117,7 @@
+@@ -116,7 +116,7 @@
/** {@inheritDoc} */
@Override
@@ -16,7 +16,7 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360
data.put(newKey, tree);
--- a/src/jorphan/org/apache/jorphan/collections/HashTree.java
+++ b/src/jorphan/org/apache/jorphan/collections/HashTree.java
-@@ -770,7 +770,7 @@
+@@ -763,7 +763,7 @@
* Finds the given current key, and replaces it with the given new key. Any
* tree structure found under the original key is moved to the new key.
*/
@@ -27,7 +27,7 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360
data.put(newKey, tree);
--- a/src/core/org/apache/jmeter/JMeter.java
+++ b/src/core/org/apache/jmeter/JMeter.java
-@@ -858,7 +858,7 @@
+@@ -861,7 +861,7 @@
HashTree replacementTree = rc.getReplacementSubTree();
if (replacementTree != null) {
convertSubTree(replacementTree);
@@ -35,8 +35,8 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360
+ tree.replaceKey(item, rc);
tree.set(rc, replacementTree);
}
- } else { // null subTree
-@@ -884,14 +884,14 @@
+ }
+@@ -886,14 +886,14 @@
HashTree replacementTree = rc.getReplacementSubTree();
if (replacementTree != null) {
convertSubTree(replacementTree);
@@ -55,7 +55,16 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360
tree.remove(item);
--- a/src/core/org/apache/jmeter/engine/ConvertListeners.java
+++ b/src/core/org/apache/jmeter/engine/ConvertListeners.java
-@@ -63,13 +63,13 @@
+@@ -62,7 +62,7 @@
+ // Used for remote notification of threads start/stop,see BUG 54152
+ try {
+ RemoteThreadsListenerWrapper wrapper = new RemoteThreadsListenerWrapper(new RemoteThreadsListenerImpl());
+- subTree.replace(item, wrapper);
++ subTree.replaceKey(item, wrapper);
+ } catch (RemoteException e) {
+ log.error("Error replacing "+RemoteThreadsListenerTestElement.class.getName()
+ +" by wrapper:"+RemoteThreadsListenerWrapper.class.getName(), e);
+@@ -78,13 +78,13 @@
RemoteSampleListener rtl = new RemoteSampleListenerImpl(item);
if (item instanceof TestStateListener && item instanceof SampleListener) { // TL - all
RemoteListenerWrapper wrap = new RemoteListenerWrapper(rtl);
@@ -74,7 +83,7 @@ Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360
}
--- a/src/core/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/org/apache/jmeter/gui/action/Save.java
-@@ -165,7 +165,7 @@
+@@ -211,7 +211,7 @@
JMeterTreeNode item = (JMeterTreeNode) iter.next();
convertSubTree(tree.getTree(item));
TestElement testElement = item.getTestElement(); // requires JMeterTreeNode
diff --git a/debian/patches/05_ignore-jodd.patch b/debian/patches/05_ignore-jodd.patch
index f5f6e20..9cbdc5a 100644
--- a/debian/patches/05_ignore-jodd.patch
+++ b/debian/patches/05_ignore-jodd.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/src/components/org/apache/jmeter/extractor/JoddExtractor.java
+++ /dev/null
-@@ -1,97 +0,0 @@
+@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
@@ -24,7 +24,6 @@ Forwarded: not-needed
-
-package org.apache.jmeter.extractor;
-
--import java.util.LinkedList;
-import java.util.List;
-
-import jodd.lagarto.dom.LagartoDOMBuilder;
@@ -77,7 +76,7 @@ Forwarded: not-needed
- jodd.lagarto.dom.Document doc = domBuilder.parse(inputString);
- nodeSelector = new NodeSelector(doc);
- }
-- LinkedList<Node> elements = nodeSelector.select(expression);
+- List<Node> elements = nodeSelector.select(expression);
- int size = elements.size();
- for (int i = 0; i < size; i++) {
- Node element = elements.get(i);
@@ -101,3 +100,200 @@ Forwarded: not-needed
- }
- }
-}
+--- a/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
++++ b/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
+@@ -44,7 +44,7 @@
+ public static final String EXTRACTOR_JODD = "JODD"; //$NON-NLS-1$
+
+ public static String[] getImplementations(){
+- return new String[]{EXTRACTOR_JSOUP,EXTRACTOR_JODD};
++ return new String[]{EXTRACTOR_JSOUP};
+ }
+
+ public static final String DEFAULT_EXTRACTOR = ""; // $NON-NLS-1$
+@@ -213,8 +213,8 @@
+ boolean useDefaultExtractor = DEFAULT_EXTRACTOR.equals(impl);
+ if (useDefaultExtractor || EXTRACTOR_JSOUP.equals(impl)) {
+ return new JSoupExtractor();
+- } else if (EXTRACTOR_JODD.equals(impl)) {
+- return new JoddExtractor();
++ //} else if (EXTRACTOR_JODD.equals(impl)) {
++ // return new JoddExtractor();
+ } else {
+ throw new IllegalArgumentException("Extractor implementation:"+ impl+" is unknown");
+ }
+--- a/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
++++ b/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
+@@ -1,172 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements. See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.jmeter.protocol.http.parser;
+-
+-import java.net.MalformedURLException;
+-import java.net.URL;
+-import java.util.Collections;
+-import java.util.Iterator;
+-
+-import jodd.lagarto.EmptyTagVisitor;
+-import jodd.lagarto.LagartoException;
+-import jodd.lagarto.LagartoParser;
+-import jodd.lagarto.Tag;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.jmeter.protocol.http.util.ConversionUtils;
+-import org.apache.jorphan.logging.LoggingManager;
+-import org.apache.log.Logger;
+-
+-/**
+- * Parser based on Lagarto
+- * @since 2.10
+- */
+-public class LagartoBasedHtmlParser extends HTMLParser {
+- private static final Logger log = LoggingManager.getLoggerForClass();
+-
+- /*
+- * A dummy class to pass the pointer of URL.
+- */
+- private static class URLPointer {
+- private URLPointer(URL newUrl) {
+- url = newUrl;
+- }
+- private URL url;
+- }
+-
+- private static final class JMeterTagVisitor extends EmptyTagVisitor {
+-
+- private URLCollection urls;
+- private URLPointer baseUrl;
+-
+- /**
+- * @param baseUrl
+- * @param urls
+- */
+- public JMeterTagVisitor(final URLPointer baseUrl, URLCollection urls) {
+- this.urls = urls;
+- this.baseUrl = baseUrl;
+- }
+-
+- private final void extractAttribute(Tag tag, String attributeName) {
+- String url = tag.getAttributeValue(attributeName, false);
+- if (!StringUtils.isEmpty(url)) {
+- urls.addURL(url, baseUrl.url);
+- }
+- }
+- /*
+- * (non-Javadoc)
+- *
+- * @see jodd.lagarto.EmptyTagVisitor#script(jodd.lagarto.Tag,
+- * java.lang.CharSequence)
+- */
+- @Override
+- public void script(Tag tag, CharSequence body) {
+- extractAttribute(tag, ATT_SRC);
+- }
+-
+- /*
+- * (non-Javadoc)
+- *
+- * @see jodd.lagarto.EmptyTagVisitor#tag(jodd.lagarto.Tag)
+- */
+- @Override
+- public void tag(Tag tag) {
+-
+- String tagName = tag.getName().toLowerCase();
+- if (tagName.equals(TAG_BODY)) {
+- extractAttribute(tag, ATT_BACKGROUND);
+- } else if (tagName.equals(TAG_BASE)) {
+- String baseref = tag.getAttributeValue(ATT_HREF, false);
+- try {
+- if (!StringUtils.isEmpty(baseref))// Bugzilla 30713
+- {
+- baseUrl.url = ConversionUtils.makeRelativeURL(baseUrl.url, baseref);
+- }
+- } catch (MalformedURLException e1) {
+- throw new RuntimeException(e1);
+- }
+- } else if (tagName.equals(TAG_IMAGE)) {
+- extractAttribute(tag, ATT_SRC);
+- } else if (tagName.equals(TAG_APPLET)) {
+- extractAttribute(tag, ATT_CODE);
+- } else if (tagName.equals(TAG_OBJECT)) {
+- extractAttribute(tag, ATT_CODEBASE);
+- extractAttribute(tag, ATT_DATA);
+- } else if (tagName.equals(TAG_INPUT)) {
+- // we check the input tag type for image
+- if (ATT_IS_IMAGE.equalsIgnoreCase(tag.getAttributeValue(ATT_TYPE, false))) {
+- // then we need to download the binary
+- extractAttribute(tag, ATT_SRC);
+- }
+- } else if (tagName.equals(TAG_SCRIPT)) {
+- extractAttribute(tag, ATT_SRC);
+- // Bug 51750
+- } else if (tagName.equals(TAG_FRAME) || tagName.equals(TAG_IFRAME)) {
+- extractAttribute(tag, ATT_SRC);
+- } else if (tagName.equals(TAG_EMBED)) {
+- extractAttribute(tag, ATT_SRC);
+- } else if (tagName.equals(TAG_BGSOUND)){
+- extractAttribute(tag, ATT_SRC);
+- } else if (tagName.equals(TAG_LINK)) {
+- // Putting the string first means it works even if the attribute is null
+- if (STYLESHEET.equalsIgnoreCase(tag.getAttributeValue(ATT_REL, false))) {
+- extractAttribute(tag, ATT_HREF);
+- }
+- } else {
+- extractAttribute(tag, ATT_BACKGROUND);
+- }
+-
+-
+- // Now look for URLs in the STYLE attribute
+- String styleTagStr = tag.getAttributeValue(ATT_STYLE, false);
+- if(styleTagStr != null) {
+- HtmlParsingUtils.extractStyleURLs(baseUrl.url, urls, styleTagStr);
+- }
+- }
+- }
+-
+- @Override
+- public Iterator<URL> getEmbeddedResourceURLs(byte[] html, URL baseUrl,
+- URLCollection coll, String encoding) throws HTMLParseException {
+- try {
+- String contents = new String(html,encoding);
+- LagartoParser lagartoParser = new LagartoParser(contents);
+- JMeterTagVisitor tagVisitor = new JMeterTagVisitor(new URLPointer(baseUrl), coll);
+- lagartoParser.parse(tagVisitor);
+- return coll.iterator();
+- } catch (LagartoException e) {
+- // TODO is it the best way ? https://issues.apache.org/bugzilla/show_bug.cgi?id=55634
+- if(log.isDebugEnabled()) {
+- log.debug("Error extracting embedded resource URLs from:'"+baseUrl+"', probably not text content, message:"+e.getMessage());
+- }
+- return Collections.<URL>emptyList().iterator();
+- } catch (Exception e) {
+- throw new HTMLParseException(e);
+- }
+- }
+-
+- /* (non-Javadoc)
+- * @see org.apache.jmeter.protocol.http.parser.HTMLParser#isReusable()
+- */
+- @Override
+- protected boolean isReusable() {
+- return true;
+- }
+-}
diff --git a/debian/patches/series b/debian/patches/series
index 9efc72a..319d838 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
01_improve_cli_help.patch
02_disable_components.patch
-03_bouncycastle_update.patch
04_java8_compatibility.patch
05_ignore-jodd.patch
diff --git a/debian/rules b/debian/rules
index 1be30f5..5109782 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME_DIRS := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-jexl2 commons-lang commons-lang3 commons-net geronimo-jms-1.1-spec geronimo-javamail-1.4-spec geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity tika-core tika-parsers
+DEB_JARS := ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-jexl2 commons-lang commons-lang3 commons-net geronimo-jms-1.1-spec geronimo-javamail-1.4-spec geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity tika-core tika-parsers rsyntaxtextarea
DEB_ANT_BUILD_TARGET := install docs-printable docs-api
ANT_ARGS := -Dlib.api=/usr/share/java -Djmeter.version=$(DEB_UPSTREAM_VERSION)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git
More information about the pkg-java-commits
mailing list