[pkg-java] r16993 - in trunk/jakarta-jmeter/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Fri Jul 5 10:40:34 UTC 2013
Author: ebourg-guest
Date: 2013-07-05 10:40:34 +0000 (Fri, 05 Jul 2013)
New Revision: 16993
Modified:
trunk/jakarta-jmeter/debian/changelog
trunk/jakarta-jmeter/debian/control
trunk/jakarta-jmeter/debian/copyright
trunk/jakarta-jmeter/debian/jmeter-ftp.classpath
trunk/jakarta-jmeter/debian/jmeter-http.classpath
trunk/jakarta-jmeter/debian/jmeter-ldap.classpath
trunk/jakarta-jmeter/debian/jmeter.classpath
trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch
trunk/jakarta-jmeter/debian/rules
Log:
New upstream release (2.8)
Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/changelog 2013-07-05 10:40:34 UTC (rev 16993)
@@ -1,8 +1,8 @@
-jakarta-jmeter (2.6-1) UNRELEASED; urgency=low
+jakarta-jmeter (2.8-1) UNRELEASED; urgency=low
* New upstream release
* Refreshed the patches
- * Added a dependency on libcommons-jexl2-java
+ * Added new dependencies on libcommons-jexl2-java and libcommons-lang3-java
* Locate the JRE in the Java wrapper to avoid the
"No JAVA_CMD set for run_java" warning.
* Install test.jar in /usr/share/jmeter/lib/junit/
Modified: trunk/jakarta-jmeter/debian/control
===================================================================
--- trunk/jakarta-jmeter/debian/control 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/control 2013-07-05 10:40:34 UTC (rev 16993)
@@ -18,6 +18,7 @@
libcommons-jexl-java (>= 1.1),
libcommons-jexl2-java,
libcommons-lang-java,
+ libcommons-lang3-java,
libcommons-net-java,
libexcalibur-logger-java,
libexcalibur-logkit-java,
Modified: trunk/jakarta-jmeter/debian/copyright
===================================================================
--- trunk/jakarta-jmeter/debian/copyright 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/copyright 2013-07-05 10:40:34 UTC (rev 16993)
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache JMeter
-Source: http://jmeter.apache.org/
+Source: http://jmeter.apache.org
Files: *
-Copyright: 2009, The Apache Software Foundation
+Copyright: 2009-2012, The Apache Software Foundation
License: Apache-2.0
Files: debian/*
Modified: trunk/jakarta-jmeter/debian/jmeter-ftp.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter-ftp.classpath 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/jmeter-ftp.classpath 2013-07-05 10:40:34 UTC (rev 16993)
@@ -1 +1 @@
-usr/share/jmeter/lib/ext/ApacheJMeter_ftp.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang.jar /usr/share/java/commons-net.jar /usr/share/java/excalibur-logkit.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_ftp.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/commons-net.jar /usr/share/java/excalibur-logkit.jar
Modified: trunk/jakarta-jmeter/debian/jmeter-http.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter-http.classpath 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/jmeter-http.classpath 2013-07-05 10:40:34 UTC (rev 16993)
@@ -1 +1 @@
-usr/share/jmeter/lib/ext/ApacheJMeter_http.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang.jar /usr/share/java/commons-logging.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/libhtmlparser.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/httpmime.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xstream.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_http.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/commons-logging.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/libhtmlparser.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/httpmime.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xstream.jar
Modified: trunk/jakarta-jmeter/debian/jmeter-ldap.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter-ldap.classpath 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/jmeter-ldap.classpath 2013-07-05 10:40:34 UTC (rev 16993)
@@ -1 +1 @@
-usr/share/jmeter/lib/ext/ApacheJMeter_ldap.jar /usr/share/java/commons-lang.jar /usr/share/java/excalibur-logkit.jar
+usr/share/jmeter/lib/ext/ApacheJMeter_ldap.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar
Modified: trunk/jakarta-jmeter/debian/jmeter.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter.classpath 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/jmeter.classpath 2013-07-05 10:40:34 UTC (rev 16993)
@@ -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-collections.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang.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-lang.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-lang.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/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-lang.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/jorphan.jar /usr/share/java/avalon-framework.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections.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/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
Modified: trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/02_disable_components.patch 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/patches/02_disable_components.patch 2013-07-05 10:40:34 UTC (rev 16993)
@@ -4,7 +4,7 @@
Author: Onkar Shinde <onshinde at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -571,9 +571,10 @@
+@@ -579,9 +579,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 @@
<classpath>
<pathelement location="${build.jorphan}"/>
<pathelement location="${build.core}"/>
-@@ -720,7 +721,7 @@
+@@ -728,7 +729,7 @@
</javac>
</target>
@@ -25,7 +25,7 @@
<target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components.">
<mkdir dir="${build.examples}"/>
-@@ -959,14 +960,14 @@
+@@ -981,14 +982,14 @@
</jar>
<!-- jdbc -->
@@ -42,7 +42,7 @@
<!-- java -->
<jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
-@@ -1892,7 +1893,7 @@
+@@ -1938,7 +1939,7 @@
packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
excludepackagenames="org.apache.jorphan.timer">
<classpath refid="classpath"/>
Modified: trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch 2013-07-05 10:40:34 UTC (rev 16993)
@@ -5,7 +5,7 @@
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
-@@ -49,6 +49,7 @@
+@@ -52,6 +52,7 @@
import org.bouncycastle.cms.CMSException;
import org.bouncycastle.cms.SignerInformation;
import org.bouncycastle.cms.SignerInformationStore;
@@ -13,7 +13,7 @@
import org.bouncycastle.jce.PrincipalUtil;
import org.bouncycastle.jce.X509Principal;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-@@ -149,7 +150,7 @@
+@@ -152,7 +153,7 @@
if (signerIt.hasNext()) {
SignerInformation signer = (SignerInformation) signerIt.next();
Modified: trunk/jakarta-jmeter/debian/rules
===================================================================
--- trunk/jakarta-jmeter/debian/rules 2013-07-05 09:29:45 UTC (rev 16992)
+++ trunk/jakarta-jmeter/debian/rules 2013-07-05 10:40:34 UTC (rev 16993)
@@ -5,7 +5,7 @@
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-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
+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
DEB_ANT_BUILD_TARGET := install docs-printable docs-api
ANT_ARGS := -Dlib.api=/usr/share/java -Djmeter.version=$(DEB_UPSTREAM_VERSION)
More information about the pkg-java-commits
mailing list