[conversant-disruptor] 05/05: Fix FTBFS with Java9.
Markus Koschany
apo at moszumanska.debian.org
Thu Mar 22 13:34:09 GMT 2018
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository conversant-disruptor.
commit 531739a89e17e297a2a1dd3b7c1fb72fd5b8ff18
Author: Markus Koschany <apo at debian.org>
Date: Thu Mar 22 14:24:09 2018 +0100
Fix FTBFS with Java9.
Closes: #893191
---
debian/changelog | 1 +
debian/patches/java9.patch | 106 ++++++++++++++++++++++++++++++
debian/patches/remove-jdkClassifier.patch | 2 +-
debian/patches/series | 1 +
4 files changed, 109 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 7ad54fc..34f4f8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ conversant-disruptor (1.2.11-1) unstable; urgency=medium
* New upstream version 1.2.11.
* Switch to compat level 11.
* Declare compliance with Debian Policy 4.1.3.
+ * Fix FTBFS with Java 9. (Closes: #893191)
-- Markus Koschany <apo at debian.org> Thu, 22 Mar 2018 14:17:37 +0100
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..c6b0d40
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,106 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 22 Mar 2018 14:23:56 +0100
+Subject: java9
+
+---
+ pom.xml | 3 ++-
+ .../com/conversantmedia/util/concurrent/AbstractWaitingCondition.java | 4 ++--
+ .../java/com/conversantmedia/util/concurrent/MPMCConcurrentQueue.java | 2 +-
+ .../conversantmedia/util/concurrent/MultithreadConcurrentQueue.java | 4 ++--
+ .../com/conversantmedia/util/concurrent/PushPullConcurrentQueue.java | 4 ++--
+ 5 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 8f6345b..e270a84 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -61,7 +61,7 @@
+ </prerequisites>
+
+ <properties>
+- <jdk.version>1.8</jdk.version>
++ <jdk.version>1.9</jdk.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <snapshots.repo.id>ossrh</snapshots.repo.id>
+@@ -81,6 +81,7 @@
+ <target>${jdk.version}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <!-- <executable>/usr/lib/jvm/jdk-9/bin/javac</executable> -->
++ <compilerArgs><arg>--add-exports</arg><arg>java.base/jdk.internal.vm.annotation=ALL-UNNAMED</arg></compilerArgs>
+ </configuration>
+ </plugin>
+ <plugin>
+diff --git a/src/main/java/com/conversantmedia/util/concurrent/AbstractWaitingCondition.java b/src/main/java/com/conversantmedia/util/concurrent/AbstractWaitingCondition.java
+index ff243de..29ea8ca 100644
+--- a/src/main/java/com/conversantmedia/util/concurrent/AbstractWaitingCondition.java
++++ b/src/main/java/com/conversantmedia/util/concurrent/AbstractWaitingCondition.java
+@@ -45,10 +45,10 @@ abstract class AbstractWaitingCondition implements Condition {
+
+ private final LongAdder waitCount = new LongAdder();
+
+- @sun.misc.Contended
++ @jdk.internal.vm.annotation.Contended
+ private final AtomicReferenceArray<Thread> waiter = new AtomicReferenceArray<>(MAX_WAITERS+2*CACHE_LINE_REFS);
+
+- @sun.misc.Contended
++ @jdk.internal.vm.annotation.Contended
+ private long waitCache = 0L;
+
+ /**
+diff --git a/src/main/java/com/conversantmedia/util/concurrent/MPMCConcurrentQueue.java b/src/main/java/com/conversantmedia/util/concurrent/MPMCConcurrentQueue.java
+index d4f62ac..525e4eb 100644
+--- a/src/main/java/com/conversantmedia/util/concurrent/MPMCConcurrentQueue.java
++++ b/src/main/java/com/conversantmedia/util/concurrent/MPMCConcurrentQueue.java
+@@ -167,7 +167,7 @@ class MPMCConcurrentQueue<E> implements ConcurrentQueue<E> {
+
+ public long p1, p2, p3, p4, p5, p6, p7;
+
+- @sun.misc.Contended
++ @jdk.internal.vm.annotation.Contended
+ R entry;
+
+ public long a1, a2, a3, a4, a5, a6, a7, a8;
+diff --git a/src/main/java/com/conversantmedia/util/concurrent/MultithreadConcurrentQueue.java b/src/main/java/com/conversantmedia/util/concurrent/MultithreadConcurrentQueue.java
+index 76573e1..3fe30c2 100644
+--- a/src/main/java/com/conversantmedia/util/concurrent/MultithreadConcurrentQueue.java
++++ b/src/main/java/com/conversantmedia/util/concurrent/MultithreadConcurrentQueue.java
+@@ -59,7 +59,7 @@ public class MultithreadConcurrentQueue<E> implements ConcurrentQueue<E> {
+
+ // use the value in the L1 cache rather than reading from memory when possible
+ long p1, p2, p3, p4, p5, p6, p7;
+- @sun.misc.Contended
++ @jdk.internal.vm.annotation.Contended
+ long tailCache = 0L;
+ long a1, a2, a3, a4, a5, a6, a7, a8;
+
+@@ -67,7 +67,7 @@ public class MultithreadConcurrentQueue<E> implements ConcurrentQueue<E> {
+ final E[] buffer;
+
+ long r1, r2, r3, r4, r5, r6, r7;
+- @sun.misc.Contended
++ @jdk.internal.vm.annotation.Contended
+ long headCache = 0L;
+ long c1, c2, c3, c4, c5, c6, c7, c8;
+
+diff --git a/src/main/java/com/conversantmedia/util/concurrent/PushPullConcurrentQueue.java b/src/main/java/com/conversantmedia/util/concurrent/PushPullConcurrentQueue.java
+index 7baa563..694f4b7 100644
+--- a/src/main/java/com/conversantmedia/util/concurrent/PushPullConcurrentQueue.java
++++ b/src/main/java/com/conversantmedia/util/concurrent/PushPullConcurrentQueue.java
+@@ -41,14 +41,14 @@ public class PushPullConcurrentQueue<E> implements ConcurrentQueue<E> {
+ final LongAdder tail = new LongAdder();
+
+ long p1, p2, p3, p4, p5, p6, p7;
+- @sun.misc.Contended
++ @jdk.internal.vm.annotation.Contended
+ long tailCache = 0L;
+ long a1, a2, a3, a4, a5, a6, a7, a8;
+
+ final E[] buffer;
+
+ long r1, r2, r3, r4, r5, r6, r7;
+- @sun.misc.Contended
++ @jdk.internal.vm.annotation.Contended
+ long headCache = 0L;
+ long c1, c2, c3, c4, c5, c6, c7, c8;
+
diff --git a/debian/patches/remove-jdkClassifier.patch b/debian/patches/remove-jdkClassifier.patch
index eabb5b2..2b71221 100644
--- a/debian/patches/remove-jdkClassifier.patch
+++ b/debian/patches/remove-jdkClassifier.patch
@@ -7,7 +7,7 @@ Subject: remove jdkClassifier
1 file changed, 3 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 251655c..8284b80 100644
+index 5b5aa0a..8f6345b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,9 +146,6 @@
diff --git a/debian/patches/series b/debian/patches/series
index bd236d7..e525ca2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
remove-jdkClassifier.patch
+java9.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/conversant-disruptor.git
More information about the pkg-java-commits
mailing list