From 66cb4187c6750dd975e3359bf44b5bc2701dae90 Mon Sep 17 00:00:00 2001 From: Tom Shercliff Date: Mon, 2 Jul 2018 17:05:52 +0100 Subject: [PATCH 1/3] added java10 and java11 profiles --- pom.xml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pom.xml b/pom.xml index d4358a0cb..92d461a10 100755 --- a/pom.xml +++ b/pom.xml @@ -408,6 +408,45 @@ + + + java10 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.21.0 + + ${JAVA_10_HOME}/bin/java + --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-exports + java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED + + + + + + + + java11 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.21.0 + + ${JAVA_11_HOME}/bin/java + --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-exports + java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED + + + + + + + + scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git From 25ec7d74901476a18fb9d1e3c182fadb3c48c97b Mon Sep 17 00:00:00 2001 From: Tom Shercliff Date: Thu, 19 Jul 2018 14:44:41 +0100 Subject: [PATCH 2/3] move to use CleanerUtils to choose correct location of Cleaner based on java version --- src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java b/src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java index 801530a28..05131404b 100644 --- a/src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java +++ b/src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java @@ -21,6 +21,8 @@ import com.google.common.collect.Lists; import net.openhft.chronicle.bytes.NoBytesStore; import net.openhft.chronicle.core.OS; import net.openhft.chronicle.core.values.IntValue; +import net.openhft.chronicle.hash.impl.util.Cleaner; +import net.openhft.chronicle.hash.impl.util.CleanerUtils; import net.openhft.chronicle.hash.serialization.impl.StringSizedReader; import net.openhft.chronicle.hash.serialization.impl.StringUtf8DataAccess; import net.openhft.chronicle.values.Values; @@ -28,7 +30,6 @@ import org.junit.*; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import sun.misc.Cleaner; import java.io.IOException; import java.io.PrintWriter; @@ -225,7 +226,7 @@ public class MemoryLeaksTest { CountedStringReader() { serializerCount.incrementAndGet(); serializers.add(new WeakReference<>(this)); - cleaner = Cleaner.create(this, serializerCount::decrementAndGet); + cleaner = CleanerUtils.createCleaner(this, serializerCount::decrementAndGet); try (StringWriter stringWriter = new StringWriter(); PrintWriter printWriter = new PrintWriter(stringWriter)) { new Exception().printStackTrace(printWriter); From ad57a072feaee31448d4c12eb00b4656ed86a356 Mon Sep 17 00:00:00 2001 From: Tom Shercliff Date: Fri, 20 Jul 2018 15:33:58 +0100 Subject: [PATCH 3/3] moved java10 and java11 profiles to root-parent-pom --- pom.xml | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 8dbbe0044..b07dfdd46 100755 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ net.openhft java-parent-pom - 1.1.16 + 1.1.17 @@ -408,45 +408,6 @@ - - - java10 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.21.0 - - ${JAVA_10_HOME}/bin/java - --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-exports - java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED - - - - - - - - java11 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.21.0 - - ${JAVA_11_HOME}/bin/java - --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-exports - java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED - - - - - - - - scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git