From 27fad8d64e7bb4fd7e79ba3dd2a365a9b171854c Mon Sep 17 00:00:00 2001
From: Guido Medina <gmedina@squaredfinancial.com>
Date: Fri, 10 Jun 2016 22:24:16 +0100
Subject: [PATCH] Make JCtools available (provided scope) for tests and
 optional OSGI, issue #5383

---
 common/pom.xml | 5 +++--
 pom.xml        | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 67d644531f..41e84b5e0c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <groupId>io.netty</groupId>
     <artifactId>netty-parent</artifactId>
@@ -40,6 +40,8 @@
     <dependency>
       <groupId>org.jctools</groupId>
       <artifactId>jctools-core</artifactId>
+      <!-- Need compile scope to be taken into account by shade plugin -->
+      <scope>compile</scope>
       <!-- Mark as optional as otherwise the bundle plugin will add strict import statements and so fail in OSGI containers-->
       <optional>true</optional>
     </dependency>
@@ -112,7 +114,6 @@
             </goals>
             <configuration>
               <instructions>
-                <!-- Exclude org.jctools.* as we shade it -->
                 <!-- NativeLibraryLoader can be used to manually load native libraries from other bundles that this bundle does not depend on,
                 hence use DynamicImport-Package instruction to ensure the loading is successful -->
                 <DynamicImport-Package>*</DynamicImport-Package>
diff --git a/pom.xml b/pom.xml
index cca334f5f3..9de7ed280e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -537,6 +537,13 @@
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- Provided dependency for tests inside IDEs -->
+    <dependency>
+      <groupId>org.jctools</groupId>
+      <artifactId>jctools-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>