From 91ae4ec8ee5c65c3f3a7c8f3b4e92389b1c5e109 Mon Sep 17 00:00:00 2001
From: Lubos Kosco <tarzanek@gmail.com>
Date: Mon, 1 Jul 2019 17:33:08 +0200
Subject: [PATCH 1/4] make scylla-apiclient a separate module so the jar can be
 reused

---
 dependency-reduced-pom.xml                    | 52 +++++++++++++
 pom.xml                                       | 73 ++++++++-----------
 scylla-apiclient/dependency-reduced-pom.xml   | 24 ++++++
 scylla-apiclient/pom.xml                      | 69 ++++++++++++++++++
 .../java/com/scylladb/jmx/api/APIClient.java  |  0
 .../java/com/scylladb/jmx/api/APIConfig.java  |  0
 .../java/com/scylladb/jmx/api/CacheEntry.java |  0
 .../com/scylladb/jmx/utils/FileUtils.java     |  0
 .../java/com/scylladb/jmx/utils/Pair.java     |  0
 .../jmx/utils/SnapshotDetailsTabularData.java |  0
 scylla-jmx-parent/pom.xml                     | 18 +++++
 11 files changed, 192 insertions(+), 44 deletions(-)
 create mode 100644 dependency-reduced-pom.xml
 create mode 100644 scylla-apiclient/dependency-reduced-pom.xml
 create mode 100644 scylla-apiclient/pom.xml
 rename {src => scylla-apiclient/src}/main/java/com/scylladb/jmx/api/APIClient.java (100%)
 rename {src => scylla-apiclient/src}/main/java/com/scylladb/jmx/api/APIConfig.java (100%)
 rename {src => scylla-apiclient/src}/main/java/com/scylladb/jmx/api/CacheEntry.java (100%)
 rename {src => scylla-apiclient/src}/main/java/com/scylladb/jmx/utils/FileUtils.java (100%)
 rename {src => scylla-apiclient/src}/main/java/com/scylladb/jmx/utils/Pair.java (100%)
 rename {src => scylla-apiclient/src}/main/java/com/scylladb/jmx/utils/SnapshotDetailsTabularData.java (100%)
 create mode 100644 scylla-jmx-parent/pom.xml

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644
index 0000000..b4a1e2f
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+  <parent>
+    <artifactId>scylla-jmx-parent</artifactId>
+    <groupId>com.scylladb.jmx</groupId>
+    <version>1.0</version>
+    <relativePath>scylla-jmx-parent/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.scylladb.jmx</groupId>
+  <artifactId>scylla-jmx</artifactId>
+  <name>Scylla JMX</name>
+  <version>1.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.4.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer>
+                  <manifestEntries>
+                    <Main-Class>com.scylladb.jmx.main.Main</Main-Class>
+                  </manifestEntries>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+</project>
+
diff --git a/pom.xml b/pom.xml
index a970a93..a8bca5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,38 +7,25 @@
     <version>1.0</version>
     <packaging>jar</packaging>
 
+    <parent>
+        <groupId>com.scylladb.jmx</groupId>
+        <artifactId>scylla-jmx-parent</artifactId>
+        <version>1.0</version>
+        <relativePath>./scylla-jmx-parent/pom.xml</relativePath>
+    </parent>
+
     <name>Scylla JMX</name>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
+    </properties>	    
 
     <dependencies>
         <dependency>
-            <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>1.16</version>
-            </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-common</artifactId>
-            <version>2.22.1</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>2.22.1</version>
+            <groupId>com.scylladb.jmx</groupId>
+            <artifactId>scylla-apiclient</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -61,29 +48,25 @@
             <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>18.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.collections</groupId>
-            <artifactId>google-collections</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-jar-plugin</artifactId>-->
+<!--                <version>3.0.2</version>-->
+<!--                <configuration>-->
+<!--                    <archive>-->
+<!--                        <manifest>-->
+<!--                            <mainClass>com.scylladb.jmx.main.Main</mainClass>-->
+<!--                            <addClasspath>true</addClasspath>-->
+<!--                            <classpathPrefix>lib/</classpathPrefix>-->
+<!--                        </manifest>-->
+<!--                        <manifestEntries>-->
+<!--                        </manifestEntries>-->
+<!--                    </archive>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -95,6 +78,8 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+<!--                            <shadedClassifierName>shaded</shadedClassifierName>-->
+<!--                            <shadedArtifactAttached>false</shadedArtifactAttached>-->
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
diff --git a/scylla-apiclient/dependency-reduced-pom.xml b/scylla-apiclient/dependency-reduced-pom.xml
new file mode 100644
index 0000000..e3eab86
--- /dev/null
+++ b/scylla-apiclient/dependency-reduced-pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+  <parent>
+    <artifactId>scylla-jmx</artifactId>
+    <groupId>com.scylladb.jmx</groupId>
+    <version>1.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>scylla-apiclient</artifactId>
+  <name>Scylla REST API client</name>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+</project>
+
diff --git a/scylla-apiclient/pom.xml b/scylla-apiclient/pom.xml
new file mode 100644
index 0000000..184d215
--- /dev/null
+++ b/scylla-apiclient/pom.xml
@@ -0,0 +1,69 @@
+<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.scylladb.jmx</groupId>
+    <artifactId>scylla-apiclient</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+
+    <name>Scylla REST API client</name>
+
+    <properties>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.16</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-common</artifactId>
+            <version>2.22.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>2.22.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>18.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.collections</groupId>
+            <artifactId>google-collections</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+
+    </build>
+
+</project>
diff --git a/src/main/java/com/scylladb/jmx/api/APIClient.java b/scylla-apiclient/src/main/java/com/scylladb/jmx/api/APIClient.java
similarity index 100%
rename from src/main/java/com/scylladb/jmx/api/APIClient.java
rename to scylla-apiclient/src/main/java/com/scylladb/jmx/api/APIClient.java
diff --git a/src/main/java/com/scylladb/jmx/api/APIConfig.java b/scylla-apiclient/src/main/java/com/scylladb/jmx/api/APIConfig.java
similarity index 100%
rename from src/main/java/com/scylladb/jmx/api/APIConfig.java
rename to scylla-apiclient/src/main/java/com/scylladb/jmx/api/APIConfig.java
diff --git a/src/main/java/com/scylladb/jmx/api/CacheEntry.java b/scylla-apiclient/src/main/java/com/scylladb/jmx/api/CacheEntry.java
similarity index 100%
rename from src/main/java/com/scylladb/jmx/api/CacheEntry.java
rename to scylla-apiclient/src/main/java/com/scylladb/jmx/api/CacheEntry.java
diff --git a/src/main/java/com/scylladb/jmx/utils/FileUtils.java b/scylla-apiclient/src/main/java/com/scylladb/jmx/utils/FileUtils.java
similarity index 100%
rename from src/main/java/com/scylladb/jmx/utils/FileUtils.java
rename to scylla-apiclient/src/main/java/com/scylladb/jmx/utils/FileUtils.java
diff --git a/src/main/java/com/scylladb/jmx/utils/Pair.java b/scylla-apiclient/src/main/java/com/scylladb/jmx/utils/Pair.java
similarity index 100%
rename from src/main/java/com/scylladb/jmx/utils/Pair.java
rename to scylla-apiclient/src/main/java/com/scylladb/jmx/utils/Pair.java
diff --git a/src/main/java/com/scylladb/jmx/utils/SnapshotDetailsTabularData.java b/scylla-apiclient/src/main/java/com/scylladb/jmx/utils/SnapshotDetailsTabularData.java
similarity index 100%
rename from src/main/java/com/scylladb/jmx/utils/SnapshotDetailsTabularData.java
rename to scylla-apiclient/src/main/java/com/scylladb/jmx/utils/SnapshotDetailsTabularData.java
diff --git a/scylla-jmx-parent/pom.xml b/scylla-jmx-parent/pom.xml
new file mode 100644
index 0000000..1d834ef
--- /dev/null
+++ b/scylla-jmx-parent/pom.xml
@@ -0,0 +1,18 @@
+<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.scylladb.jmx</groupId>
+    <artifactId>scylla-jmx-parent</artifactId>
+    <version>1.0</version>
+    <packaging>pom</packaging>
+
+    <modules>
+	    <module>../</module>
+	    <module>../scylla-apiclient</module>
+    </modules>
+
+
+
+    <name>Scylla JMX Parent</name>
+</project>

From 222990d821897d5c6ddd62b2c1524ce5c4c9e43a Mon Sep 17 00:00:00 2001
From: Lubos Kosco <tarzanek@gmail.com>
Date: Mon, 8 Jul 2019 10:04:24 +0200
Subject: [PATCH 2/4] cleanup commented implicit steps in mvn

---
 pom.xml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index a8bca5c..2c14542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,22 +51,6 @@
     </dependencies>
     <build>
         <plugins>
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-jar-plugin</artifactId>-->
-<!--                <version>3.0.2</version>-->
-<!--                <configuration>-->
-<!--                    <archive>-->
-<!--                        <manifest>-->
-<!--                            <mainClass>com.scylladb.jmx.main.Main</mainClass>-->
-<!--                            <addClasspath>true</addClasspath>-->
-<!--                            <classpathPrefix>lib/</classpathPrefix>-->
-<!--                        </manifest>-->
-<!--                        <manifestEntries>-->
-<!--                        </manifestEntries>-->
-<!--                    </archive>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -78,8 +62,6 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-<!--                            <shadedClassifierName>shaded</shadedClassifierName>-->
-<!--                            <shadedArtifactAttached>false</shadedArtifactAttached>-->
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>

From 4296c7d3aee598941da009cc15bd701f414a3020 Mon Sep 17 00:00:00 2001
From: Lubos Kosco <tarzanek@gmail.com>
Date: Mon, 8 Jul 2019 10:54:04 +0200
Subject: [PATCH 3/4] trigger build from parent maven to have the local repo
 properly set up

---
 reloc/build_reloc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reloc/build_reloc.sh b/reloc/build_reloc.sh
index f021dd2..8417e01 100755
--- a/reloc/build_reloc.sh
+++ b/reloc/build_reloc.sh
@@ -52,6 +52,6 @@ if [ -z "$NODEPS" ]; then
     sudo ./install-dependencies.sh
 fi
 
-mvn -B install
+mvn -B --file scylla-jmx-parent/pom.xml install
 ./SCYLLA-VERSION-GEN
 scripts/create-relocatable-package.py build/scylla-jmx-package.tar.gz

From 183eb6158aad3e3c918799a8af217e25107038ec Mon Sep 17 00:00:00 2001
From: Lubos Kosco <tarzanek@gmail.com>
Date: Mon, 8 Jul 2019 11:02:45 +0200
Subject: [PATCH 4/4] fix README for building instructions

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e2c45f3..9f504b8 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Scylla JMX server implements the Apache Cassandra JMX interface for compatibilit
 To compile JMX server, run:
 
 ```console
-$ mvn package
+$ mvn --file scylla-jmx-parent/pom.xml package
 ```
 
 ## Running