From ec0aec43bbcfa98920bf850e023a7351d78976a8 Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Tue, 29 Oct 2019 14:10:59 +0000
Subject: [PATCH] Revert "#821 include archives in jar for distribution - fix"

This reverts commit ad593e50fca6553a89c75ea6173922e15faa2b4c.

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 .../open-metadata-assemblies/pom.xml          | 45 +++++--------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/open-metadata-distribution/open-metadata-assemblies/pom.xml b/open-metadata-distribution/open-metadata-assemblies/pom.xml
index 83fc2d554bd..13981f4374a 100644
--- a/open-metadata-distribution/open-metadata-assemblies/pom.xml
+++ b/open-metadata-distribution/open-metadata-assemblies/pom.xml
@@ -26,9 +26,6 @@
 
     <build>
         <plugins>
-            <!-- This runs the assembly code to build our distribution archives 
-                 Run in an earlier phase than normal (prepare package) so it
-                 gets done before the build of the jar - which will contain the .gz -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
@@ -57,28 +54,6 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
-            <!-- override the default files included in source archive
-                 we do not want the .gz files we build to appear -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                        <configuration>
-                            <excludes>
-                                <exclude>*.gz</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- run the jar archiving to build our distribution module 
-                 for maven repo -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -89,17 +64,21 @@
                         <goals>
                             <goal>jar</goal>
                         </goals>
-                        <configuration>
-                            <!-- this isn't a real jar - we want an archive from other output files -->
-                            <classesDirectory>target</classesDirectory>
-                            <forceCreation>true</forceCreation>
-                            <includes>
-                                <include>*.gz</include>
-                            </includes>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                 <filtering>false</filtering>
+                 <directory>target</directory>
+                 <includes>
+                     <include>*.gz</include>
+                 </includes>
+            </resource>
+        </resources>
     </build>
 </project>