From 4f6269fdd2f7f11f55a5ae3a8970c5ec3643dc11 Mon Sep 17 00:00:00 2001 From: Endolf Date: Fri, 1 Jun 2018 15:04:43 +0100 Subject: [PATCH 1/3] Create a pom that allows all dependencies to be imported easily --- examples/pom.xml | 47 ++---------------------------- pom.xml | 1 + uberjar/pom.xml | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 45 deletions(-) create mode 100644 uberjar/pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index be655a8..bd84c87 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,54 +21,11 @@ - - net.java.jinput - coreapi - ${project.version} - ${project.groupId} - windows-plugin - ${project.version} - natives-windows - - - ${project.groupId} - osx-plugin - ${project.version} - natives-osx - - - ${project.groupId} - wintab-plugin - ${project.version} - natives-wintab - - - ${project.groupId} - linux-plugin - ${project.version} - natives-linux - - - ${project.groupId} - windows-plugin - ${project.version} - - - ${project.groupId} - osx-plugin - ${project.version} - - - ${project.groupId} - wintab-plugin - ${project.version} - - - ${project.groupId} - linux-plugin + jinput ${project.version} + pom diff --git a/pom.xml b/pom.xml index b665c6d..02d2436 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,7 @@ coreAPI plugins applet + uberjar examples tests diff --git a/uberjar/pom.xml b/uberjar/pom.xml new file mode 100644 index 0000000..a32bb8b --- /dev/null +++ b/uberjar/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + jinput + pom + JInput - Uber jar + + + net.java.jinput + jinput-parent + 2.0.9-SNAPSHOT + ../ + + + + + ${project.groupId} + coreapi + ${project.version} + + + ${project.groupId} + windows-plugin + ${project.version} + natives-windows + + + ${project.groupId} + osx-plugin + ${project.version} + natives-osx + + + ${project.groupId} + wintab-plugin + ${project.version} + natives-wintab + + + ${project.groupId} + linux-plugin + ${project.version} + natives-linux + + + ${project.groupId} + windows-plugin + ${project.version} + + + ${project.groupId} + osx-plugin + ${project.version} + + + ${project.groupId} + wintab-plugin + ${project.version} + + + ${project.groupId} + linux-plugin + ${project.version} + + + + + + + com.googlecode.mavennatives + maven-nativedependencies-plugin + + + + + \ No newline at end of file From 06d9d5ca669d343e5e72f5b4808db742e2a6812d Mon Sep 17 00:00:00 2001 From: Endolf Date: Fri, 1 Jun 2018 15:49:09 +0100 Subject: [PATCH 2/3] Build uber jars --- .gitignore | 1 + uberjar/pom.xml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 76dc67d..6a3d746 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ dist/ eclipse_bin/ *.iml .idea/ +dependency-reduced-pom.xml diff --git a/uberjar/pom.xml b/uberjar/pom.xml index a32bb8b..8012e3b 100644 --- a/uberjar/pom.xml +++ b/uberjar/pom.xml @@ -1,7 +1,7 @@ 4.0.0 jinput - pom + jar JInput - Uber jar @@ -69,6 +69,82 @@ com.googlecode.mavennatives maven-nativedependencies-plugin + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + + default + package + + shade + + + + + net.java.jinput:osx-plugin:jar:natives-osx + net.java.jinput:linux-plugin:jar:natives-linux + net.java.jinput:windows-plugin:jar:natives-windows + net.java.jinput:wintab-plugin:jar:natives-wintab + + + true + false + false + + + + natives + package + + shade + + + + + net.java.jinput:osx-plugin + + **/*.jnilib + META-INF/**/* + + + + net.java.jinput:linux-plugin + + **/*.so + META-INF/**/* + + + + net.java.jinput:windows-plugin + + **/*.dll + META-INF/**/* + + + + net.java.jinput:wintab-plugin + + **/*.dll + META-INF/**/* + + + + + + net.java.jutils:jutils + net.java.jinput:jinput + net.java.jinput:coreapi + + + true + natives-all + false + + + + From 43ba12c160972d3942f1d05792e8ece7454ed672 Mon Sep 17 00:00:00 2001 From: Endolf Date: Fri, 1 Jun 2018 15:55:08 +0100 Subject: [PATCH 3/3] Move pom version declaration --- pom.xml | 5 +++++ uberjar/pom.xml | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 02d2436..1d259e5 100644 --- a/pom.xml +++ b/pom.xml @@ -146,6 +146,11 @@ true + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + diff --git a/uberjar/pom.xml b/uberjar/pom.xml index 8012e3b..3ae7267 100644 --- a/uberjar/pom.xml +++ b/uberjar/pom.xml @@ -72,7 +72,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 default