debian/changelog

+jakarta-jmeter (2.13-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #905145)
+  * Fixed the build failure caused by the MongoDB Java Driver upgrade
+    (Closes: #877706)
+  * Standards-Version updated to 4.1.5
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 01 Aug 2018 00:29:43 +0200
+
 jakarta-jmeter (2.13-3) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -2,15 +2,21 @@ Source: jakarta-jmeter
 Section: net
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Onkar Shinde <onkarshinde@ubuntu.com>, Emmanuel Bourg <ebourg@apache.org>
-Build-Depends: ant, ant-optional, debhelper (>= 10), javahelper
-Build-Depends-Indep: default-jdk,
+Uploaders:
+ Onkar Shinde <onkarshinde@ubuntu.com>,
+ Emmanuel Bourg <ebourg@apache.org>
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 11~),
+ default-jdk,
  default-jdk-doc,
+ javahelper,
  junit4,
  libavalon-framework-java,
  libbcmail-java,
-                     libbcprov-java (>= 1.48),
  libbcpkix-java (>= 1.48),
+ libbcprov-java (>= 1.48),
  libbsf-java,
  libbsh-java,
  libcommons-codec-java,
@@ -44,9 +50,9 @@ Build-Depends-Indep: default-jdk,
  libxmlgraphics-commons-java,
  libxstream-java,
  velocity
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jakarta-jmeter.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jakarta-jmeter.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/jakarta-jmeter.git
+Vcs-Browser: https://salsa.debian.org/java-team/jakarta-jmeter
 Homepage: http://jmeter.apache.org
 
 Package: jmeter

debian/patches/11_java9-compatibility.patch

+Description: Fixes the compilations errors with Java 9
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
++++ b/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
+@@ -61,7 +61,7 @@
+      * @param columnNames the names for the columns
+      */
+     public JTreeTable(Vector<?> rowData, Vector<?> columnNames) {
+-        super(rowData, columnNames);
++        super((Vector) rowData, columnNames);
+     }
+ 
+ }
+--- a/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
++++ b/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
+@@ -197,7 +197,7 @@
+     // Override in order to provide type safety
+     @Override
+     @SuppressWarnings("unchecked")
+-    public Enumeration<JMeterTreeNode> children() {
++    public Enumeration children() {
+         return super.children();
+     }
+ }

debian/patches/12_mongodb-compatibility.patch

+Description: Fixes the compatibility with the version of the MongoDB Java Driver in Debian (untested! feedback welcome)
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
++++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
+@@ -137,10 +137,8 @@
+         }
+ 
+         MongoClientOptions.Builder builder = MongoClientOptions.builder()
+-                .autoConnectRetry(getAutoConnectRetry())
+                 .connectTimeout(getConnectTimeout())
+                 .connectionsPerHost(getConnectionsPerHost())
+-                .maxAutoConnectRetryTime(getMaxAutoConnectRetryTime())
+                 .maxWaitTime(getMaxWaitTime())
+                 .socketKeepAlive(getSocketKeepAlive())
+                 .socketTimeout(getSocketTimeout())
+@@ -154,8 +152,7 @@
+                     getWriteOperationNumberOfServers(),
+                     getWriteOperationTimeout(),
+                     getFsync(),
+-                    getWaitForJournaling(),
+-                    getContinueOnInsertError()
++                    getWaitForJournaling()
+                     ));
+         }
+         MongoClientOptions mongoOptions = builder.build();
+--- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
++++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/mongo/MongoDB.java
+@@ -27,6 +27,7 @@
+ import com.mongodb.Mongo;
+ import com.mongodb.MongoClient;
+ import com.mongodb.MongoClientOptions;
++import com.mongodb.MongoCredential;
+ import com.mongodb.ServerAddress;
+ 
+ /**
+@@ -36,12 +37,15 @@
+     private static final Logger log = LoggingManager.getLoggerForClass();
+ 
+     // Mongo is Thread Safe
+-    private Mongo mongo = null;
++    private MongoClient mongo = null;
++    private List<ServerAddress> serverAddresses;
++    private MongoClientOptions mongoOptions;
+ 
+     public MongoDB(
+             List<ServerAddress> serverAddresses,
+             MongoClientOptions mongoOptions) {
+-        mongo = new MongoClient(serverAddresses, mongoOptions);   
++        this.serverAddresses = serverAddresses;
++        this.mongoOptions = mongoOptions;
+     }
+ 
+     public DB getDB(String database, String username, String password) {
+@@ -49,18 +53,11 @@
+         if(log.isDebugEnabled()) {
+             log.debug("username: " + username+", password: " + password+", database: " + database);
+         }
+-        DB db = mongo.getDB(database);
+-        boolean authenticated = db.isAuthenticated();
+-
+-        if(!authenticated) {
+-            if(username != null && password != null && username.length() > 0 && password.length() > 0) {
+-                authenticated = db.authenticate(username, password.toCharArray());
+-            }
+-        }
+-        if(log.isDebugEnabled()) {
+-            log.debug("authenticated: " + authenticated);
++        if (mongo == null) {
++            char[] pwd = password != null && password.length() > 0 ? password.toCharArray() : null;
++            mongo = new MongoClient(serverAddresses, MongoCredential.createCredential(username, database, pwd), mongoOptions);
+         }
+-        return db;
++        return mongo.getDB(database);
+     }
+ 
+     public void clear() {
+@@ -68,7 +65,9 @@
+             log.debug("clearing");
+         }
+ 
+-        mongo.close();
++        if (mongo != null) {
++            mongo.close();
++        }
+         //there is no harm in trying to clear up
+         mongo = null;
+     }
+--- a/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
++++ b/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
+@@ -51,18 +51,11 @@
+             log.debug("database: " + db.getName()+", script: " + script);
+         }
+ 
+-        db.requestStart();
+-        try {
+-            db.requestEnsureConnection();
+-    
+             Object result = db.eval(script);
+     
+             if(log.isDebugEnabled()) {
+                 log.debug("Result : " + result);
+             }
+             return result;
+-        } finally {
+-            db.requestDone();
+-        }
+     }
+ }

debian/patches/series

@@ -7,3 +7,5 @@
 08_bouncycastle-1.51.patch
 09_httpcomponents-compatibility.patch
 10_xstream-compatibility.patch
+11_java9-compatibility.patch
+12_mongodb-compatibility.patch

debian/rules

@@ -54,6 +54,3 @@ override_dh_auto_build:
 override_dh_install:
 	dh_install
 	install -m 755 bin/jmeter-server debian/jmeter/usr/share/jmeter/bin
-
-get-orig-source:
-	uscan --force-download --download-current-version --rename