[Git][java-team/jakarta-jmeter][master] 7 commits: Fixed the build failure with Java 9 (Closes: #905145)
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Jul 31 23:35:42 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jakarta-jmeter
Commits:
fc51322a by Emmanuel Bourg at 2018-07-31T22:25:50Z
Fixed the build failure with Java 9 (Closes: #905145)
- - - - -
ec014749 by Emmanuel Bourg at 2018-07-31T22:27:17Z
Fixed the build failure caused by the MongoDB Java Driver upgrade (Closes: #877706)
- - - - -
30e2bf8e by Emmanuel Bourg at 2018-07-31T22:27:37Z
Standards-Version updated to 4.1.5
- - - - -
347eff86 by Emmanuel Bourg at 2018-07-31T22:27:43Z
Switch to debhelper level 11
- - - - -
70715dc4 by Emmanuel Bourg at 2018-07-31T22:27:48Z
Use salsa.debian.org Vcs-* URLs
- - - - -
27b1303f by Emmanuel Bourg at 2018-07-31T22:29:25Z
Wrap and sort
- - - - -
ef265f8d by Emmanuel Bourg at 2018-07-31T22:29:48Z
Upload to unstable
- - - - -
7 changed files:
- debian/changelog
- debian/compat
- debian/control
- + debian/patches/11_java9-compatibility.patch
- + debian/patches/12_mongodb-compatibility.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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 at apache.org> Wed, 01 Aug 2018 00:29:43 +0200
+
jakarta-jmeter (2.13-3) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -2,51 +2,57 @@ Source: jakarta-jmeter
Section: net
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant, ant-optional, debhelper (>= 10), javahelper
-Build-Depends-Indep: default-jdk,
- default-jdk-doc,
- junit4,
- libavalon-framework-java,
- libbcmail-java,
- libbcprov-java (>= 1.48),
- libbcpkix-java (>= 1.48),
- libbsf-java,
- libbsh-java,
- libcommons-codec-java,
- libcommons-collections3-java,
- libcommons-httpclient-java,
- libcommons-io-java,
- libcommons-jexl-java (>= 1.1),
- libcommons-jexl2-java,
- libcommons-lang-java,
- libcommons-lang3-java,
- libcommons-math3-java,
- libcommons-net-java,
- libcommons-pool2-java,
- libdnsjava-java,
- libexcalibur-logger-java,
- libexcalibur-logkit-java,
- libgeronimo-jms-1.1-spec-java,
- libhtmlparser-java,
- libhttpclient-java (>= 4.3),
- libhttpmime-java,
- libjcharts-java,
- libjdom1-java,
- libjsoup-java,
- libjtidy-java,
- libmail-java,
- libmongodb-java,
- liboro-java,
- librhino-java,
- librsyntaxtextarea-java,
- libxalan2-java,
- 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
+Uploaders:
+ Onkar Shinde <onkarshinde at ubuntu.com>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 11~),
+ default-jdk,
+ default-jdk-doc,
+ javahelper,
+ junit4,
+ libavalon-framework-java,
+ libbcmail-java,
+ libbcpkix-java (>= 1.48),
+ libbcprov-java (>= 1.48),
+ libbsf-java,
+ libbsh-java,
+ libcommons-codec-java,
+ libcommons-collections3-java,
+ libcommons-httpclient-java,
+ libcommons-io-java,
+ libcommons-jexl-java (>= 1.1),
+ libcommons-jexl2-java,
+ libcommons-lang-java,
+ libcommons-lang3-java,
+ libcommons-math3-java,
+ libcommons-net-java,
+ libcommons-pool2-java,
+ libdnsjava-java,
+ libexcalibur-logger-java,
+ libexcalibur-logkit-java,
+ libgeronimo-jms-1.1-spec-java,
+ libhtmlparser-java,
+ libhttpclient-java (>= 4.3),
+ libhttpmime-java,
+ libjcharts-java,
+ libjdom1-java,
+ libjsoup-java,
+ libjtidy-java,
+ libmail-java,
+ libmongodb-java,
+ liboro-java,
+ librhino-java,
+ librsyntaxtextarea-java,
+ libxalan2-java,
+ libxmlgraphics-commons-java,
+ libxstream-java,
+ velocity
+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
=====================================
--- /dev/null
+++ b/debian/patches/11_java9-compatibility.patch
@@ -0,0 +1,25 @@
+Description: Fixes the compilations errors with Java 9
+Author: Emmanuel Bourg <ebourg at 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
=====================================
--- /dev/null
+++ b/debian/patches/12_mongodb-compatibility.patch
@@ -0,0 +1,109 @@
+Description: Fixes the compatibility with the version of the MongoDB Java Driver in Debian (untested! feedback welcome)
+Author: Emmanuel Bourg <ebourg at 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
=====================================
--- a/debian/patches/series
+++ b/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
=====================================
--- a/debian/rules
+++ b/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
View it on GitLab: https://salsa.debian.org/java-team/jakarta-jmeter/compare/a42ecc74bd40152a2e2cd75043bebabe501dd28c...ef265f8dcc48cb62b603c3e3e41be4d805e8ff30
--
View it on GitLab: https://salsa.debian.org/java-team/jakarta-jmeter/compare/a42ecc74bd40152a2e2cd75043bebabe501dd28c...ef265f8dcc48cb62b603c3e3e41be4d805e8ff30
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180731/cc00f6cc/attachment.html>
More information about the pkg-java-commits
mailing list