From 49e9d1093cf38d6893c018bd647835cd14def838 Mon Sep 17 00:00:00 2001
From: Andras Katona <akatona@cloudera.com>
Date: Fri, 14 Feb 2020 16:31:20 +0100
Subject: [PATCH 1/2] MINOR: possibility to include mysql-connector jar in
 final tar.gz

This functionality is tied to `with-mysql-jar` profile
---
 registry-dist/pom.xml                      | 30 ++++++++++++++++++++++
 registry-dist/src/main/assembly/binary.xml |  7 +++++
 2 files changed, 37 insertions(+)

diff --git a/registry-dist/pom.xml b/registry-dist/pom.xml
index 04e51f018..f7e695c91 100644
--- a/registry-dist/pom.xml
+++ b/registry-dist/pom.xml
@@ -70,6 +70,36 @@
         <final.Name>hortonworks-registry</final.Name>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>with-mysql-jar</id>
+            <dependencies>
+                <dependency>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                    <version>5.1.40</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>copy-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <includeArtifactIds>mysql-connector-java</includeArtifactIds>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <build>
         <finalName>${final.Name}-${project.version}</finalName>
         <plugins>
diff --git a/registry-dist/src/main/assembly/binary.xml b/registry-dist/src/main/assembly/binary.xml
index 0fe63a9bf..cd43001e2 100644
--- a/registry-dist/src/main/assembly/binary.xml
+++ b/registry-dist/src/main/assembly/binary.xml
@@ -57,6 +57,13 @@
                 <include>storage-tool*jar</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${project.basedir}./registry-dist/target/dependency</directory>
+            <outputDirectory>/bootstrap/lib</outputDirectory>
+            <includes>
+                <include>mysql-connector-java*jar</include>
+            </includes>
+        </fileSet>
 
         <fileSet>
             <directory>${project.basedir}./storage/core/target/dependency</directory>

From a1a20f628b89742cc76f267b971c0af243950378 Mon Sep 17 00:00:00 2001
From: Andras Katona <akatona@cloudera.com>
Date: Mon, 17 Feb 2020 14:18:49 +0100
Subject: [PATCH 2/2] simpler solution

Change-Id: Id94973ec431846481a7cdee75e958ff0ac83d707
---
 registry-dist/pom.xml                      | 17 -----------------
 registry-dist/src/main/assembly/binary.xml | 15 ++++++++-------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/registry-dist/pom.xml b/registry-dist/pom.xml
index f7e695c91..f83439145 100644
--- a/registry-dist/pom.xml
+++ b/registry-dist/pom.xml
@@ -80,23 +80,6 @@
                     <version>5.1.40</version>
                 </dependency>
             </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>copy-dependencies</goal>
-                                </goals>
-                                <configuration>
-                                    <includeArtifactIds>mysql-connector-java</includeArtifactIds>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
     </profiles>
 
diff --git a/registry-dist/src/main/assembly/binary.xml b/registry-dist/src/main/assembly/binary.xml
index cd43001e2..386a589fd 100644
--- a/registry-dist/src/main/assembly/binary.xml
+++ b/registry-dist/src/main/assembly/binary.xml
@@ -29,6 +29,14 @@
             <outputDirectory>libs</outputDirectory>
             <unpack>false</unpack>
         </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>bootstrap/lib</outputDirectory>
+            <unpack>false</unpack>
+            <includes>
+                <include>mysql:mysql-connector-java</include>
+            </includes>
+        </dependencySet>
     </dependencySets>
 
     <fileSets>
@@ -57,13 +65,6 @@
                 <include>storage-tool*jar</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>${project.basedir}./registry-dist/target/dependency</directory>
-            <outputDirectory>/bootstrap/lib</outputDirectory>
-            <includes>
-                <include>mysql-connector-java*jar</include>
-            </includes>
-        </fileSet>
 
         <fileSet>
             <directory>${project.basedir}./storage/core/target/dependency</directory>