[#360] fix jar for embedded mode

Makefile

@@ -1,5 +1,5 @@
 VERSION = $(shell cat pom.xml | grep '<version>[0-9.]\+' | sed 's/<version>\([0-9.]\+\)<\/version>/\1/g' | tr -d '[:space:]')
-DIST_TARGET=datashare-dist/target/datashare-dist-$(VERSION)-all
+DIST_TARGET=datashare-dist/target/datashare-dist-$(VERSION)-docker
 PATH_TO_APP_DIST=../datashare-client/dist/
 
 $(DIST_TARGET): dist

datashare-dist/pom.xml

@@ -83,34 +83,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
-                <configuration>
-                    <shadedClassifierName>all</shadedClassifierName>
-                    <shadedArtifactAttached>true</shadedArtifactAttached>
-                    <transformers>
-                        <!--remove models from jar see mitie -->
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
-                            <resource>.dat</resource>
-                        </transformer>
-                    </transformers>
-                    <artifactSet>
-                    <excludes>
-                        <exclude>log4j:log4j:jar:</exclude>
-                    </excludes>
-                    </artifactSet>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
@@ -123,6 +95,7 @@
                         <configuration>
                             <descriptors>
                                 <descriptor>src/assembly/all.xml</descriptor>
+                                <descriptor>src/assembly/docker.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>

datashare-dist/src/assembly/all.xml

@@ -1,23 +1,19 @@
 <assembly>
     <id>all</id>
     <formats>
-        <format>dir</format>
+        <format>jar</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/docker</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}</directory>
-            <outputDirectory>lib</outputDirectory>
+
+    <dependencySets>
+        <dependencySet>
             <includes>
-                <include>*.jar</include>
+                <include>*:jar:*</include>
             </includes>
-        </fileSet>
-    </fileSets>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <unpack>true</unpack>
+        </dependencySet>
+    </dependencySets>
 </assembly>

datashare-dist/src/assembly/docker.xml

@@ -0,0 +1,23 @@
+<assembly>
+    <id>docker</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/docker</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>