diff --git a/CHANGES.txt b/CHANGES.txt
index 1cc415312d..48bf14f5d4 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 ca06b41e17..d522b595a4 100644
--- a/build.xml
+++ b/build.xml
@@ -71,9 +71,9 @@
-
+
-
+
diff --git a/src/java/org/apache/cassandra/utils/MBeanWrapper.java b/src/java/org/apache/cassandra/utils/MBeanWrapper.java
index 3b5c7cb70c..1ee787d8d8 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
+ {
+ void accept(T e);
+ }
}