From 5949e193cefe1c2dddef29c207afa99d2e46f72b Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Fri, 25 Oct 2019 17:47:27 +0200
Subject: [PATCH] Fix compilation error introduced by
 2854c2c4731424801b7054c4281f5da47667238f

---
 common/src/main/java/io/netty/util/internal/Hidden.java | 6 ------
 transport-blockhound-tests/pom.xml                      | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/common/src/main/java/io/netty/util/internal/Hidden.java b/common/src/main/java/io/netty/util/internal/Hidden.java
index c414f5a93d..0603f6d8f9 100644
--- a/common/src/main/java/io/netty/util/internal/Hidden.java
+++ b/common/src/main/java/io/netty/util/internal/Hidden.java
@@ -35,7 +35,6 @@ class Hidden {
      * and SHOULD NOT be considered a public API.
      */
     @UnstableApi
-    @SuppressJava6Requirement(reason = "BlockHound is Java 8+, but this class is only loaded by it's SPI")
     public static final class NettyBlockHoundIntegration implements BlockHoundIntegration {
 
         @Override
@@ -78,10 +77,5 @@ class Hidden {
                 }
             });
         }
-
-        @Override
-        public int compareTo(BlockHoundIntegration o) {
-            return 0;
-        }
     }
 }
diff --git a/transport-blockhound-tests/pom.xml b/transport-blockhound-tests/pom.xml
index df4066d01d..3dd88d2eb6 100644
--- a/transport-blockhound-tests/pom.xml
+++ b/transport-blockhound-tests/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.netty</groupId>
     <artifactId>netty-parent</artifactId>
-    <version>4.1.43.Final-SNAPSHOT</version>
+    <version>5.0.0.Final-SNAPSHOT</version>
   </parent>
 
   <artifactId>netty-transport-blockhound-tests</artifactId>