From 0fc13dcea43312ef47fe63c4d4213269d8aeafcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francis=20Gagn=C3=A9?= Date: Tue, 17 Feb 2015 22:47:01 -0500 Subject: Use the Maven Shade plugin Use the Maven Shade plugin to build an uber-jar instead of the Maven Assembly plugin's jar-with-dependencies. The main reason for switching is that we must merge the services resource files (specifically, META-INF/resources/org.reasm.ArchitectureProvider, which is now provided by both reasm-m68k and reasm-z80). --- .gitignore | 1 + pom.xml | 45 ++++++++++++++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index b83d222..c8ee1df 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target/ +/dependency-reduced-pom.xml diff --git a/pom.xml b/pom.xml index 6306696..e3ae278 100644 --- a/pom.xml +++ b/pom.xml @@ -38,27 +38,42 @@ - maven-assembly-plugin - 2.4.1 + maven-shade-plugin + 2.3 - - - org.reasm.batch.Assembler - - - - jar-with-dependencies - - + + + junit:* + org.hamcrest:* + + + + + + + + + + + + + + - - + + + false + + + + + + - assembly package - single + shade -- cgit v1.2.3