You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2019/06/07 13:38:41 UTC
[cassandra] branch cassandra-2.2 updated: Fix JDK7 compatibility
broken in cassandra-2.2
This is an automated email from the ASF dual-hosted git repository.
mshuler pushed a commit to branch cassandra-2.2
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-2.2 by this push:
new a9a4f17 Fix JDK7 compatibility broken in cassandra-2.2
a9a4f17 is described below
commit a9a4f171be6c7d33ce43d04a9bc2dd20f3fd82a5
Author: Ted Petersson <te...@ericsson.com>
AuthorDate: Thu Jun 6 11:12:52 2019 -0500
Fix JDK7 compatibility broken in cassandra-2.2
Patch by Ted Petersson; Reviewed by Michael Shuler for CASSANDRA-15050
---
CHANGES.txt | 1 +
build.xml | 4 ++--
src/java/org/apache/cassandra/utils/MBeanWrapper.java | 7 ++++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 1cc4153..48bf14f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.15
+ * Fix JDK7 compatibility broken in cassandra-2.2 (CASSANDRA-15050)
* Support cross version messaging in in-jvm upgrade dtests (CASSANDRA-15078)
* Fix index summary redistribution cancellation (CASSANDRA-15045)
* Refactor Circle CI configuration (CASSANDRA-14806)
diff --git a/build.xml b/build.xml
index ca06b41..d522b59 100644
--- a/build.xml
+++ b/build.xml
@@ -71,9 +71,9 @@
<property name="dist.dir" value="${build.dir}/dist"/>
<property name="tmp.dir" value="${java.io.tmpdir}"/>
- <property name="source.version" value="1.7"/>
+ <property name="source.version" value="1.8"/>
<property name="source.test.version" value="1.8"/>
- <property name="target.version" value="1.7"/>
+ <property name="target.version" value="1.8"/>
<property name="target.test.version" value="1.8"/>
<condition property="version" value="${base.version}">
diff --git a/src/java/org/apache/cassandra/utils/MBeanWrapper.java b/src/java/org/apache/cassandra/utils/MBeanWrapper.java
index 3b5c7cb..1ee787d 100644
--- a/src/java/org/apache/cassandra/utils/MBeanWrapper.java
+++ b/src/java/org/apache/cassandra/utils/MBeanWrapper.java
@@ -19,7 +19,6 @@
package org.apache.cassandra.utils;
import java.lang.management.ManagementFactory;
-import java.util.function.Consumer;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -206,4 +205,10 @@ public interface MBeanWrapper
this.handler = handler;
}
}
+
+ // Locally defined Consumer interface, to be compatible with Java 7. Only needed for cassandra-2.2
+ interface Consumer<T>
+ {
+ void accept(T e);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org