From 252ab7bcd1134e895b2531c175571e873cecbe1c Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Mon, 15 Apr 2019 00:06:16 -0400
Subject: [PATCH] Update pom.xml files to support both standard and full jars

---
 http-doh-listener/pom.xml |  3 ++
 jDnsProxy-all/pom.xml     | 16 +++++++++
 pom.xml                   | 75 ++++++++++++++++++++++-----------------
 xmpp-dox/pom.xml          |  5 +++
 4 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/http-doh-listener/pom.xml b/http-doh-listener/pom.xml
index 4d0387b..481d30f 100644
--- a/http-doh-listener/pom.xml
+++ b/http-doh-listener/pom.xml
@@ -53,6 +53,9 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring.boot.version}</version>
             </plugin>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/jDnsProxy-all/pom.xml b/jDnsProxy-all/pom.xml
index 95b978d..57cca6f 100644
--- a/jDnsProxy-all/pom.xml
+++ b/jDnsProxy-all/pom.xml
@@ -29,5 +29,21 @@
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <outputFile combine.self="override"></outputFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index b040778..9e312bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,9 +62,21 @@
                 <configuration>
                     <compilerArgs>
                         <compilerArg>-Xlint:all</compilerArg>
+                        <compilerArg>-Werror</compilerArg>
                     </compilerArgs>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.moparisthebest.dns.DnsProxy</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -76,39 +88,6 @@
                     <autoReleaseAfterClose>true</autoReleaseAfterClose>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <minimizeJar>false</minimizeJar>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <outputFile>${project.build.directory}/${project.artifactId}-full.jar</outputFile>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </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>
-            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -120,6 +99,36 @@
                         <additionalparam>-Xdoclint:none</additionalparam>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>3.2.1</version>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>shade</goal>
+                            </goals>
+                            <configuration>
+                                <minimizeJar>false</minimizeJar>
+                                <createDependencyReducedPom>false</createDependencyReducedPom>
+                                <outputFile>${project.build.directory}/${project.artifactId}-full.jar</outputFile>
+                                <filters>
+                                    <filter>
+                                        <artifact>*:*</artifact>
+                                        <excludes>
+                                            <exclude>META-INF/*.SF</exclude>
+                                            <exclude>META-INF/*.DSA</exclude>
+                                            <exclude>META-INF/*.RSA</exclude>
+                                        </excludes>
+                                    </filter>
+                                </filters>
+                                <transformers>
+                                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                </transformers>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/xmpp-dox/pom.xml b/xmpp-dox/pom.xml
index 24b71e2..253badc 100644
--- a/xmpp-dox/pom.xml
+++ b/xmpp-dox/pom.xml
@@ -30,5 +30,10 @@
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 </project>