From 4073b10bbecef1feda641f291d312071d6675f17 Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <denzhdanov@gmail.com>
Date: Mon, 16 Apr 2018 01:39:16 +0300
Subject: [PATCH] BAEL-1423 Java Concurrency Utility with JCTools library

Addressed editor's comments
---
 jctools/README.md                             |  11 --
 jctools/pom.xml                               | 108 ------------------
 libraries/pom.xml                             |  45 ++++++++
 .../com/baeldung/jctools/MpmcBenchmark.java   |   0
 .../main/java/com/baeldung/jctools/README.md  |   7 ++
 .../com/baeldung/jctools/JCToolsUnitTest.java |   0
 6 files changed, 52 insertions(+), 119 deletions(-)
 delete mode 100644 jctools/README.md
 delete mode 100644 jctools/pom.xml
 rename {jctools => libraries}/src/main/java/com/baeldung/jctools/MpmcBenchmark.java (100%)
 create mode 100644 libraries/src/main/java/com/baeldung/jctools/README.md
 rename {jctools => libraries}/src/test/java/com/baeldung/jctools/JCToolsUnitTest.java (100%)

diff --git a/jctools/README.md b/jctools/README.md
deleted file mode 100644
index 181e45c1ca..0000000000
--- a/jctools/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Overview
-
-This project holds a [couple of tests](./src/test/java/com/baeldung/jctools/JCToolsUnitTest.java) which illustrate JCTools specifics and a [benchmark](./src/main/java/com/baeldung/jctools/MpmcBenchmark.java) in the [JMH](http://openjdk.java.net/projects/code-tools/jmh/) format.  
-
-## How to build and run the JMH benchmark
-
-Execute the following from the project's root:  
-```bash
-mvn clean install
-java -jar ./target/benchmarks.jar MpmcBenchmark -si true
-```
\ No newline at end of file
diff --git a/jctools/pom.xml b/jctools/pom.xml
deleted file mode 100644
index 8a21c610de..0000000000
--- a/jctools/pom.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>jctools</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-
-    <name>jctools</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jctools</groupId>
-            <artifactId>jctools-core</artifactId>
-            <version>${jctools.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <jctools.version>2.1.2</jctools.version>
-        <assertj.version>3.9.1</assertj.version>
-        <jmh.version>1.20</jmh.version>
-
-        <javac.target>1.8</javac.target>
-
-        <uberjar.name>benchmarks</uberjar.name>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <compilerVersion>${javac.target}</compilerVersion>
-                    <source>${javac.target}</source>
-                    <target>${javac.target}</target>
-                </configuration>
-            </plugin>
-
-            <!-- Borrowed from the 'jmh-java-benchmark-archetype' pom.xml -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${uberjar.name}</finalName>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.openjdk.jmh.Main</mainClass>
-                                </transformer>
-                            </transformers>
-                            <filters>
-                                <filter>
-                                    <!--
-                                        Shading signed JARs will fail without this.
-                                        http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
-                                    -->
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 6ff06d7285..8a3a27cec4 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -661,6 +661,12 @@
             <artifactId>fugue</artifactId>
             <version>4.5.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.jctools</groupId>
+            <artifactId>jctools-core</artifactId>
+            <version>${jctools.version}</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
@@ -780,6 +786,44 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+
+            <!-- Borrowed from the 'jmh-java-benchmark-archetype' pom.xml -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>benchmarks</finalName>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.openjdk.jmh.Main</mainClass>
+                                </transformer>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <!--
+                                        Shading signed JARs will fail without this.
+                                        http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
+                                    -->
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 
@@ -850,6 +894,7 @@
         <async.http.client.version>2.2.0</async.http.client.version>
         <infinispan.version>9.1.5.Final</infinispan.version>
         <unirest.version>1.4.9</unirest.version>
+        <jctools.version>2.1.2</jctools.version>
     </properties>
 
 </project>
diff --git a/jctools/src/main/java/com/baeldung/jctools/MpmcBenchmark.java b/libraries/src/main/java/com/baeldung/jctools/MpmcBenchmark.java
similarity index 100%
rename from jctools/src/main/java/com/baeldung/jctools/MpmcBenchmark.java
rename to libraries/src/main/java/com/baeldung/jctools/MpmcBenchmark.java
diff --git a/libraries/src/main/java/com/baeldung/jctools/README.md b/libraries/src/main/java/com/baeldung/jctools/README.md
new file mode 100644
index 0000000000..3c1b3c1c1e
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/jctools/README.md
@@ -0,0 +1,7 @@
+## How to build and run the JMH benchmark
+
+Execute the following from the project's root:  
+```bash
+mvn clean install
+java -jar ./target/benchmarks.jar MpmcBenchmark -si true
+```
\ No newline at end of file
diff --git a/jctools/src/test/java/com/baeldung/jctools/JCToolsUnitTest.java b/libraries/src/test/java/com/baeldung/jctools/JCToolsUnitTest.java
similarity index 100%
rename from jctools/src/test/java/com/baeldung/jctools/JCToolsUnitTest.java
rename to libraries/src/test/java/com/baeldung/jctools/JCToolsUnitTest.java