Author: ebourg-guest Date: 2014-04-11 16:48:06 +0000 (Fri, 11 Apr 2014) New Revision: 18028
Added: tags/jakarta-jmeter/2.8-2/ tags/jakarta-jmeter/2.8-2/debian/changelog tags/jakarta-jmeter/2.8-2/debian/patches/04_java8_compatibility.patch tags/jakarta-jmeter/2.8-2/debian/patches/series Removed: tags/jakarta-jmeter/2.8-2/debian/changelog tags/jakarta-jmeter/2.8-2/debian/patches/series Log: [svn-buildpackage] Tagging jakarta-jmeter 2.8-2 Deleted: tags/jakarta-jmeter/2.8-2/debian/changelog =================================================================== --- trunk/jakarta-jmeter/debian/changelog 2014-04-11 13:28:17 UTC (rev 18025) +++ tags/jakarta-jmeter/2.8-2/debian/changelog 2014-04-11 16:48:06 UTC (rev 18028) @@ -1,127 +0,0 @@ -jakarta-jmeter (2.8-2) unstable; urgency=low - - * Updated the classpath of jorphan.jar to use Commons Collections 3 - * Standards-Version updated to 3.9.5 (no changes) - * Switch to debhelper level 9 - - -- Emmanuel Bourg <[email protected]> Fri, 11 Apr 2014 15:06:06 +0200 - -jakarta-jmeter (2.8-1) unstable; urgency=low - - * New upstream release - * Refreshed the patches - * Added a patch improving the help on the command line - * Added a manpage - * 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/ - - -- Emmanuel Bourg <[email protected]> Fri, 05 Jul 2013 16:48:12 +0200 - -jakarta-jmeter (2.5.1-2) unstable; urgency=low - - * Patched to compile against Bouncy Castle 1.48 (Closes: #713151) - * debian/watch: Updated the location of the archives following - the graduation of JMeter to a top level project. - * Removed the DMUA flag - * Bump standards version to 3.9.4. No changes needed. - * Use canonical URLs for the Vcs-* fields - * debian/rules: Added a clean target to allow rebuilds - - -- Emmanuel Bourg <[email protected]> Wed, 03 Jul 2013 13:02:38 +0200 - -jakarta-jmeter (2.5.1-1) unstable; urgency=low - - * New upstream release. (Closes: #641546, LP: #879463) - * Change home page URL everywhere. - * Add new build dependencies libhttpclient-java, libhttpmime-java for http - module. Update build and runtime classpath accordingly. - * Refreshed 02_disable_components.patch as per latest source. - * Update 'Format' value in debian/copyright. - * Point watch file to archive area until we used renamed upstream source. - - -- Onkar Shinde <[email protected]> Thu, 03 May 2012 20:19:04 +0530 - -jakarta-jmeter (2.4-3) unstable; urgency=low - - * Merge Ubuntu changes (gnumail -> geronimo-javamail). - * Use javahelper, *.classpath files to set classpath and runtime - dependencies. - * Add libbcmail-java, libbcprov-java build dependencies for SMIMEAssetion. - * Update 02_disable_components.patch to build SMIMEAssertion* again. - * Remove few unneeded/unused dependencies - batik, bsh, gnumail, jboss-j2ee. - * Minimize jar lookup in launcher script because classpath has been set in - all jar files. - * Bump standards version to 3.9.3. No changes needed. - - -- Onkar Shinde <[email protected]> Sat, 21 Apr 2012 16:17:45 +0530 - -jakarta-jmeter (2.4-2) unstable; urgency=low - - * Team upload. - * debian/control - - Remove build unnecessary build dependency on quilt. - - Update Section of jmeter-apidoc and jmeter-help to be 'doc' - - Bump standards version to 3.9.2. No changes needed. - * debian/rules - - Remove patchsys-quilt.mk. - * debian/copyright - - Freshen DEP5 fields to address lintian warnings. - - -- tony mancill <[email protected]> Sat, 17 Sep 2011 20:27:46 -0700 - -jakarta-jmeter (2.4-1) unstable; urgency=low - - * New upstream version. - * debian/control - - Add default-jdk-doc to build depends to link against java api docs. - - Change build-dep junit -> junit4 as application supports junit4 features - now. Change runtime dependency accordingly. - - Update short description of all modules. - - Standards version 3.9.1. No change needed. - * debian/rules, debian/wrappers/jmeter - - Updates and fixes for build dependencies/properties and runtime - dependencies. - * debian/jmeter.install, debian/jmeter.properties - - Use upstream provided file. So our own blank file removed. - * debian/patches/ - - 01_fix_batik_imports.patch - Remove. Not used since last version. - - 02_disable_components.patch - Refreshed as per current source. - - 03_fix_jtidy_call.patch - Remove. No needed anymore. - - 04_files_from_upstream.patch - Remove. Not needed anymore. - * debian/source/format - - Source format 3.0 (quilt). - * debian/README.source - - Not needed anymore with source format 3.0. - - -- Onkar Shinde <[email protected]> Sat, 16 Apr 2011 20:27:21 +0530 - -jakarta-jmeter (2.3.4-2) unstable; urgency=low - - * debian/control - - Remove libgeronimo-jms-1.1-spec-java from build dependencies. - The package does not exist in Debian archive. - - Add build dependencies libxmlgraphics-commons-java, rhino. Helps backport - of the package to Lenny. - - Add libxmlgraphics-commons-java dependency. - - Add appropriate dependency to jmeter-jms package. - * debian/rules - - Add xmlgraphics-commons, js to DEB_JARS. - * debian/patches/series - - Drop 01_fix_batik_imports.patch from list. This patch is unnecessary with - use of libxmlgraphics-commons-java build-dep. - * debian/wrappers/jmeter - - Add xmlgraphics-commons to classpath. - - Add libraries needed by jmeter-jms to classpath. - * Thanks to Jan Wagner for spotting most of the problems when doing backport - to Lenny. - - -- Onkar Shinde <[email protected]> Wed, 07 Oct 2009 14:17:01 +0530 - -jakarta-jmeter (2.3.4-1) unstable; urgency=low - - * Initial version: Merge from Ubuntu. (Closes: #505877) - - -- Onkar Shinde <[email protected]> Wed, 30 Sep 2009 10:49:06 +0530 - Copied: tags/jakarta-jmeter/2.8-2/debian/changelog (from rev 18026, trunk/jakarta-jmeter/debian/changelog) =================================================================== --- tags/jakarta-jmeter/2.8-2/debian/changelog (rev 0) +++ tags/jakarta-jmeter/2.8-2/debian/changelog 2014-04-11 16:48:06 UTC (rev 18028) @@ -0,0 +1,130 @@ +jakarta-jmeter (2.8-2) unstable; urgency=low + + * Renamed the HashTree.replace(Object, Object) method to replaceKey(). + This avoids a conflict with the new Map.replace(Object, Object) method + introduced in Java 8. + * Updated the classpath of jorphan.jar to use Commons Collections 3 + * Standards-Version updated to 3.9.5 (no changes) + * Switch to debhelper level 9 + + -- Emmanuel Bourg <[email protected]> Fri, 11 Apr 2014 15:06:06 +0200 + +jakarta-jmeter (2.8-1) unstable; urgency=low + + * New upstream release + * Refreshed the patches + * Added a patch improving the help on the command line + * Added a manpage + * 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/ + + -- Emmanuel Bourg <[email protected]> Fri, 05 Jul 2013 16:48:12 +0200 + +jakarta-jmeter (2.5.1-2) unstable; urgency=low + + * Patched to compile against Bouncy Castle 1.48 (Closes: #713151) + * debian/watch: Updated the location of the archives following + the graduation of JMeter to a top level project. + * Removed the DMUA flag + * Bump standards version to 3.9.4. No changes needed. + * Use canonical URLs for the Vcs-* fields + * debian/rules: Added a clean target to allow rebuilds + + -- Emmanuel Bourg <[email protected]> Wed, 03 Jul 2013 13:02:38 +0200 + +jakarta-jmeter (2.5.1-1) unstable; urgency=low + + * New upstream release. (Closes: #641546, LP: #879463) + * Change home page URL everywhere. + * Add new build dependencies libhttpclient-java, libhttpmime-java for http + module. Update build and runtime classpath accordingly. + * Refreshed 02_disable_components.patch as per latest source. + * Update 'Format' value in debian/copyright. + * Point watch file to archive area until we used renamed upstream source. + + -- Onkar Shinde <[email protected]> Thu, 03 May 2012 20:19:04 +0530 + +jakarta-jmeter (2.4-3) unstable; urgency=low + + * Merge Ubuntu changes (gnumail -> geronimo-javamail). + * Use javahelper, *.classpath files to set classpath and runtime + dependencies. + * Add libbcmail-java, libbcprov-java build dependencies for SMIMEAssetion. + * Update 02_disable_components.patch to build SMIMEAssertion* again. + * Remove few unneeded/unused dependencies - batik, bsh, gnumail, jboss-j2ee. + * Minimize jar lookup in launcher script because classpath has been set in + all jar files. + * Bump standards version to 3.9.3. No changes needed. + + -- Onkar Shinde <[email protected]> Sat, 21 Apr 2012 16:17:45 +0530 + +jakarta-jmeter (2.4-2) unstable; urgency=low + + * Team upload. + * debian/control + - Remove build unnecessary build dependency on quilt. + - Update Section of jmeter-apidoc and jmeter-help to be 'doc' + - Bump standards version to 3.9.2. No changes needed. + * debian/rules + - Remove patchsys-quilt.mk. + * debian/copyright + - Freshen DEP5 fields to address lintian warnings. + + -- tony mancill <[email protected]> Sat, 17 Sep 2011 20:27:46 -0700 + +jakarta-jmeter (2.4-1) unstable; urgency=low + + * New upstream version. + * debian/control + - Add default-jdk-doc to build depends to link against java api docs. + - Change build-dep junit -> junit4 as application supports junit4 features + now. Change runtime dependency accordingly. + - Update short description of all modules. + - Standards version 3.9.1. No change needed. + * debian/rules, debian/wrappers/jmeter + - Updates and fixes for build dependencies/properties and runtime + dependencies. + * debian/jmeter.install, debian/jmeter.properties + - Use upstream provided file. So our own blank file removed. + * debian/patches/ + - 01_fix_batik_imports.patch - Remove. Not used since last version. + - 02_disable_components.patch - Refreshed as per current source. + - 03_fix_jtidy_call.patch - Remove. No needed anymore. + - 04_files_from_upstream.patch - Remove. Not needed anymore. + * debian/source/format + - Source format 3.0 (quilt). + * debian/README.source + - Not needed anymore with source format 3.0. + + -- Onkar Shinde <[email protected]> Sat, 16 Apr 2011 20:27:21 +0530 + +jakarta-jmeter (2.3.4-2) unstable; urgency=low + + * debian/control + - Remove libgeronimo-jms-1.1-spec-java from build dependencies. + The package does not exist in Debian archive. + - Add build dependencies libxmlgraphics-commons-java, rhino. Helps backport + of the package to Lenny. + - Add libxmlgraphics-commons-java dependency. + - Add appropriate dependency to jmeter-jms package. + * debian/rules + - Add xmlgraphics-commons, js to DEB_JARS. + * debian/patches/series + - Drop 01_fix_batik_imports.patch from list. This patch is unnecessary with + use of libxmlgraphics-commons-java build-dep. + * debian/wrappers/jmeter + - Add xmlgraphics-commons to classpath. + - Add libraries needed by jmeter-jms to classpath. + * Thanks to Jan Wagner for spotting most of the problems when doing backport + to Lenny. + + -- Onkar Shinde <[email protected]> Wed, 07 Oct 2009 14:17:01 +0530 + +jakarta-jmeter (2.3.4-1) unstable; urgency=low + + * Initial version: Merge from Ubuntu. (Closes: #505877) + + -- Onkar Shinde <[email protected]> Wed, 30 Sep 2009 10:49:06 +0530 + Copied: tags/jakarta-jmeter/2.8-2/debian/patches/04_java8_compatibility.patch (from rev 18026, trunk/jakarta-jmeter/debian/patches/04_java8_compatibility.patch) =================================================================== --- tags/jakarta-jmeter/2.8-2/debian/patches/04_java8_compatibility.patch (rev 0) +++ tags/jakarta-jmeter/2.8-2/debian/patches/04_java8_compatibility.patch 2014-04-11 16:48:06 UTC (rev 18028) @@ -0,0 +1,96 @@ +Description: Renames the HashTree.replace(Object, Object) method to replaceKey(). + This avoids a conflict with the new Map.replace(Object, Object) method + introduced in Java 8. +Author: Emmanuel Bourg <[email protected]> +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 @@ + + /** {@inheritDoc} */ + @Override +- public void replace(Object currentKey, Object newKey) { ++ public void replaceKey(Object currentKey, Object newKey) { + HashTree tree = getTree(currentKey); + data.remove(currentKey); + data.put(newKey, tree); +--- a/src/jorphan/org/apache/jorphan/collections/HashTree.java ++++ b/src/jorphan/org/apache/jorphan/collections/HashTree.java +@@ -745,7 +745,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. + */ +- public void replace(Object currentKey, Object newKey) { ++ public void replaceKey(Object currentKey, Object newKey) { + HashTree tree = getTree(currentKey); + data.remove(currentKey); + data.put(newKey, tree); +--- a/src/core/org/apache/jmeter/JMeter.java ++++ b/src/core/org/apache/jmeter/JMeter.java +@@ -851,7 +851,7 @@ + HashTree replacementTree = rc.getReplacementSubTree(); + if (replacementTree != null) { + convertSubTree(replacementTree); +- tree.replace(item, rc); ++ tree.replaceKey(item, rc); + tree.set(rc, replacementTree); + } + } else { // null subTree +@@ -877,14 +877,14 @@ + HashTree replacementTree = rc.getReplacementSubTree(); + if (replacementTree != null) { + convertSubTree(replacementTree); +- tree.replace(item, rc); ++ tree.replaceKey(item, rc); + tree.set(rc, replacementTree); + } + } + } else { // Not a ReplaceableController + convertSubTree(tree.getTree(item)); + TestElement testElement = item.getTestElement(); +- tree.replace(item, testElement); ++ tree.replaceKey(item, testElement); + } + } else { // Not enabled + tree.remove(item); +--- a/src/core/org/apache/jmeter/engine/ConvertListeners.java ++++ b/src/core/org/apache/jmeter/engine/ConvertListeners.java +@@ -62,13 +62,13 @@ + RemoteSampleListener rtl = new RemoteSampleListenerImpl(item); + if (item instanceof TestStateListener && item instanceof SampleListener) { // TL - all + RemoteListenerWrapper wrap = new RemoteListenerWrapper(rtl); +- subTree.replace(item, wrap); ++ subTree.replaceKey(item, wrap); + } else if (item instanceof TestStateListener) { + RemoteTestListenerWrapper wrap = new RemoteTestListenerWrapper(rtl); +- subTree.replace(item, wrap); ++ subTree.replaceKey(item, wrap); + } else if (item instanceof SampleListener) { + RemoteSampleListenerWrapper wrap = new RemoteSampleListenerWrapper(rtl); +- subTree.replace(item, wrap); ++ subTree.replaceKey(item, wrap); + } else { + log.warn("Could not replace Remotable item "+item.getClass().getName()); + } +--- a/src/core/org/apache/jmeter/gui/action/Save.java ++++ b/src/core/org/apache/jmeter/gui/action/Save.java +@@ -163,7 +163,7 @@ + JMeterTreeNode item = (JMeterTreeNode) iter.next(); + convertSubTree(tree.getTree(item)); + TestElement testElement = item.getTestElement(); // requires JMeterTreeNode +- tree.replace(item, testElement); ++ tree.replaceKey(item, testElement); + } + } + } +--- a/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java ++++ b/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java +@@ -125,7 +125,7 @@ + ReportTreeNode item = (ReportTreeNode) iter.next(); + convertSubTree(tree.getTree(item)); + TestElement testElement = item.getTestElement(); +- tree.replace(item, testElement); ++ tree.replaceKey(item, testElement); + } + } + } Deleted: tags/jakarta-jmeter/2.8-2/debian/patches/series =================================================================== --- trunk/jakarta-jmeter/debian/patches/series 2014-04-11 13:28:17 UTC (rev 18025) +++ tags/jakarta-jmeter/2.8-2/debian/patches/series 2014-04-11 16:48:06 UTC (rev 18028) @@ -1,3 +0,0 @@ -01_improve_cli_help.patch -02_disable_components.patch -03_bouncycastle_update.patch Copied: tags/jakarta-jmeter/2.8-2/debian/patches/series (from rev 18026, trunk/jakarta-jmeter/debian/patches/series) =================================================================== --- tags/jakarta-jmeter/2.8-2/debian/patches/series (rev 0) +++ tags/jakarta-jmeter/2.8-2/debian/patches/series 2014-04-11 16:48:06 UTC (rev 18028) @@ -0,0 +1,4 @@ +01_improve_cli_help.patch +02_disable_components.patch +03_bouncycastle_update.patch +04_java8_compatibility.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
