From 557a33fda8db92994635ca3728566f4822935b68 Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Sun, 14 Apr 2019 21:18:13 -0400
Subject: [PATCH] maven-shade-plugin configuration

---
 jDnsProxy-all/pom.xml | 33 +++++++++++++++++++++++++++++++++
 jDnsProxy/pom.xml     | 21 ---------------------
 pom.xml               | 11 +++++++++--
 3 files changed, 42 insertions(+), 23 deletions(-)
 create mode 100644 jDnsProxy-all/pom.xml

diff --git a/jDnsProxy-all/pom.xml b/jDnsProxy-all/pom.xml
new file mode 100644
index 0000000..95b978d
--- /dev/null
+++ b/jDnsProxy-all/pom.xml
@@ -0,0 +1,33 @@
+<?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>
+        <groupId>com.moparisthebest.dns</groupId>
+        <artifactId>jDnsProxy-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jDnsProxy-all</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jDnsProxy</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>xmpp-dox</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>http-doh-listener</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+</project>
diff --git a/jDnsProxy/pom.xml b/jDnsProxy/pom.xml
index a7543d0..c7a6850 100644
--- a/jDnsProxy/pom.xml
+++ b/jDnsProxy/pom.xml
@@ -19,26 +19,5 @@
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.moparisthebest.dns.DnsProxy</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 297e8b7..b040778 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
         <module>jDnsProxy</module>
         <module>xmpp-dox</module>
         <module>http-doh-listener</module>
+        <module>jDnsProxy-all</module>
     </modules>
     <build>
         <finalName>${project.artifactId}</finalName>
@@ -61,7 +62,6 @@
                 <configuration>
                     <compilerArgs>
                         <compilerArg>-Xlint:all</compilerArg>
-                        <compilerArg>-Werror</compilerArg>
                     </compilerArgs>
                 </configuration>
             </plugin>
@@ -78,7 +78,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -88,6 +88,7 @@
                         <configuration>
                             <minimizeJar>false</minimizeJar>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <outputFile>${project.build.directory}/${project.artifactId}-full.jar</outputFile>
                             <filters>
                                 <filter>
                                     <artifact>*:*</artifact>
@@ -98,6 +99,12 @@
                                     </excludes>
                                 </filter>
                             </filters>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>com.moparisthebest.dns.DnsProxy</mainClass>
+                                </transformer>
+                            </transformers>
                         </configuration>
                     </execution>
                 </executions>