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 c984f38044c35b3b9837951c15f5c06820e7b2d5 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 5 10:40:34 2013 +0000 New upstream release (2.8) --- debian/changelog | 4 ++-- debian/control | 1 + debian/copyright | 4 ++-- debian/jmeter-ftp.classpath | 2 +- debian/jmeter-http.classpath | 2 +- debian/jmeter-ldap.classpath | 2 +- debian/jmeter.classpath | 8 ++++---- debian/patches/02_disable_components.patch | 8 ++++---- debian/patches/03_bouncycastle_update.patch | 4 ++-- debian/rules | 2 +- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 119d864..b551c8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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/ diff --git a/debian/control b/debian/control index e50fd13..5705a7a 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends-Indep: default-jdk, libcommons-jexl-java (>= 1.1), libcommons-jexl2-java, libcommons-lang-java, + libcommons-lang3-java, libcommons-net-java, libexcalibur-logger-java, libexcalibur-logkit-java, diff --git a/debian/copyright b/debian/copyright index 182833f..13d9c29 100644 --- a/debian/copyright +++ b/debian/copyright @@ -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/* diff --git a/debian/jmeter-ftp.classpath b/debian/jmeter-ftp.classpath index bae04bf..c66f092 100644 --- a/debian/jmeter-ftp.classpath +++ b/debian/jmeter-ftp.classpath @@ -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 diff --git a/debian/jmeter-http.classpath b/debian/jmeter-http.classpath index 931fd20..0fd7014 100644 --- a/debian/jmeter-http.classpath +++ b/debian/jmeter-http.classpath @@ -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 diff --git a/debian/jmeter-ldap.classpath b/debian/jmeter-ldap.classpath index d19d12d..b120239 100644 --- a/debian/jmeter-ldap.classpath +++ b/debian/jmeter-ldap.classpath @@ -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 diff --git a/debian/jmeter.classpath b/debian/jmeter.classpath index beb9ba1..12a951a 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-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 diff --git a/debian/patches/02_disable_components.patch b/debian/patches/02_disable_components.patch index 89c38be..f465361 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 <[email protected]> --- 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 @@ Author: Onkar Shinde <[email protected]> <classpath> <pathelement location="${build.jorphan}"/> <pathelement location="${build.core}"/> -@@ -720,7 +721,7 @@ +@@ -728,7 +729,7 @@ </javac> </target> @@ -25,7 +25,7 @@ Author: Onkar Shinde <[email protected]> <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 @@ Author: Onkar Shinde <[email protected]> <!-- 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"/> diff --git a/debian/patches/03_bouncycastle_update.patch b/debian/patches/03_bouncycastle_update.patch index 70e5f3f..3e764d1 100644 --- a/debian/patches/03_bouncycastle_update.patch +++ b/debian/patches/03_bouncycastle_update.patch @@ -5,7 +5,7 @@ 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 -@@ -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 @@ Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54776 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(); diff --git a/debian/rules b/debian/rules index c866d2e..ad3f978 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-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) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
