From 4467d13da1a8a88c676dbb3609b40d684481e9b4 Mon Sep 17 00:00:00 2001
From: Klemek <Klemek@outlook.fr>
Date: Wed, 7 Nov 2018 16:38:57 +0100
Subject: [PATCH] jar creation fix

---
 download/mapping-1.2.jar | Bin 22607 -> 24234 bytes
 make_jar.bat             |   3 ++-
 pom.xml                  |  37 +++++++++++++++++--------------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/download/mapping-1.2.jar b/download/mapping-1.2.jar
index 12a8602b4f3a0664572ab8bc93de715884b4579c..dbc2a80bc2b2a187beb76a9c395aafad85585dae 100644
GIT binary patch
delta 3435
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
T3d}gLs^GmJjINV2^Vk0X`?jV&

delta 1897
zcmZ3rm+|}tM&1B#W)?065O`aWGVz3>2m=Shn~D@)x6R4ztw7PmKrAx3Axym9^~_$r
zLkbeD59hX2KVVaMyDTTyeCm;tS8E#AJ1v;<;qr^Sv$J|$f1W49dhu+8*8W7jyxvJ)
z7cEXXacdXv=lSay=daxmzaZrlhbXUn{3Kq^Ew0NF4tt!u5wk+xo;~IRcia4)`}g@5
z?f!mzo)D|vCrt;<NoON})V@B-q`C8lfOrO9V6>M;B{R&u6JIGXGEC-XR0ood;bN0L
z86|+M13=aaMlm33Kcg9t{Kn|Q$guf=@fJ=th&MO?3-V-!vM0+&i*24^U<Bve#fnXK
zj@F*s8_PAh%rAx;7Bax_n4He2#RdtQ&Gk&n*`RXZu-fd%nazYEaGaZ42t{DMZ33!_
zx3XfKC@QoZCbOdm+;BgLszpvciCF;RBuEr}uHN}{@=h<U`s{q6Kmps+dT*L_AKXfc
zUUe<1bRmDvQoEo_TNVoVa;P|T_R61Wy1nb|CKK*2<&jcrFJ}C@DW5uLcLH<a$GRES
z>Cev0H2!`se*gZzEE5iDOEQ(PdM<G};<`qoBWdbP(`k{@1tw1jd+}q+PiY|&&e?B%
z__(wk4q3Tpe*OIV=+!dyZ=P$*q;<RJ{kmcn{Va1=>YTZe=L&aS%e#G>Mfc59w}nl~
zTYUJUJ|3|!zqHNqMAr4COozHof8G1Yao?%LcXv~cUD%oU{S04w%e+7QJ}0)?2Q1FG
zSac?6{Z)gzvo3DXRI2*=RGDw}ul-t+CQEKj+MRi$^zc@RixYIGY?WEP`>^Bpdd2F;
zhvU^V@AiwmoWA<n#^jP}y^Cjlcq*=#l6&hg+n#ewD+Ocjz1+HK@|SlLl9t|jx6^lX
zg5gpl?)96qM2+8EeXO<Z!yM;3^BrB8^h53(_7>f4=*yzI>*7%{NwK}_mD-|3bS2L2
z5A0=Cddy_WGP~@yBID(%BA1$-g-K?+Rf@9fOTNs>EwQ>?ci!lnS83sXZvSiL<}YTu
zy`0UxyVyt3VfV4JC=+&p+3BB+SyJvC)OoRg;&vD7XfOFY;w<Y9)+_ZNwz)ZB`eV-d
z2M!6$cRbLoHEY7Jt_P+pZTvkC-%ko<U*VX4>hjfzsXXgB6%AanQXg_HymBkOL)=_O
z@D!6!;mHJ!VB5!C!F`5$e9u3|wH5I1S*7Y^f8<j@JgX!B=AW{M7OH)mRm1vJDDiwK
zYwoFH<%9B1KG(LaZg-NO_)2w0_w1eQQa5VZJk9-W+2+bU+_>HTCp?>hQ`+R&TE|e*
zW{vg-7P!D`VD9kuJ(j@8B*F|YNqj*i3Jh?<7z_doZyiA#U)K;vT~9wZ{Qz&6HY~*s
zTpI(!l16o4Aq2|uH^LMI?*V1fijXu<<_uSm_zw}y&PmNp%|@1V3|Ei`mJ=W?P|2M9
z^z>8|0}g~MFosQj7%mMiJH&V(c7xp8%sAOGTAB;t(#b9n3QW5|qMDQYBRGK?9vH(k
zfL!{Yaq`?~RdA^~`CpLO<g7R@rk&iA%i<I`V4ejQJqk=5{6HhjAnNR56_~<=fP7tG
z=_8;92}e*lj1&e8LU0bqUChFh12{z{--}@51SyBa)Y}MYCS!<%T%-)x97w<#CX4r4
zF)=U%vM?~n!Oa0V_o?LMgh(|cGx{T?nWAODh98I&MUprjEzMM@2bK_!<C=WOmSZws
z46^O_fI9COKotl~mXAV~l#P*Q`fCZ6^o!v~a@x5qukLgLoz~0Bz@UoawAqee<-gs9
z`4Pbn@u*&uG*h|@SUNsRk`EpNzTi@EUyK;j6?d@gs~7<!FEj$R#e0Dz_Gw9An0gZ^
zZQu=-p0CZVgKQ}<nfr2h)|)H@x{w{1m=KWx3PkOI$qKPzBCKp6_e%nyEjt6lp8yaK
E00oC|-~a#s

diff --git a/make_jar.bat b/make_jar.bat
index e6494f8..f1f3a92 100644
--- a/make_jar.bat
+++ b/make_jar.bat
@@ -1 +1,2 @@
-mvn clean package && del download\*.jar && xcopy /Y target\*.jar download && git add download/*.jar
\ No newline at end of file
+mvn clean package && del download\*.jar && xcopy /Y target\*.jar download && git add download/*.jar
+pause
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6c0e227..f5d2091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
             <groupId>fr.klemek</groupId>
             <artifactId>simple-logger</artifactId>
             <version>1.3</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -30,7 +31,7 @@
     </dependencies>
 
     <build>
-        <outputDirectory>target/${project.artifactId}/WEB-INF/classes</outputDirectory>
+        <outputDirectory>${project.build.directory}/classes</outputDirectory>
         <sourceDirectory>src/main/java</sourceDirectory>
         <testSourceDirectory>src/test/java</testSourceDirectory>
         <resources>
@@ -57,21 +58,6 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-            <!-- JAR -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>libs/</classpathPrefix>
-                            <mainClass>fr.klemek.mapping.Launch</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -80,16 +66,27 @@
                         <id>copy-dependencies</id>
                         <phase>prepare-package</phase>
                         <goals>
-                            <goal>copy-dependencies</goal>
+                            <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>
-                                ${project.build.directory}/libs
-                            </outputDirectory>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                            <includeScope>runtime</includeScope>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>fr.klemek.mapping.Launch</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file