From 352276c1684c95e6af251d8a5637f017a4c58d8c Mon Sep 17 00:00:00 2001 From: Tuncay NAMLI Date: Fri, 12 Nov 2021 11:07:35 +0300 Subject: [PATCH] Replace one-jar plugin with maven-shade plugin for standaalone uber jar packaging --- onfhir-server-r4/pom.xml | 50 ++++++++++++++++++++++++++++++-------- onfhir-server-r5/pom.xml | 49 +++++++++++++++++++++++++++++-------- onfhir-server-stu3/pom.xml | 47 ++++++++++++++++++++++++++++------- pom.xml | 18 +++----------- 4 files changed, 121 insertions(+), 43 deletions(-) diff --git a/onfhir-server-r4/pom.xml b/onfhir-server-r4/pom.xml index bdd0f819..64c33329 100644 --- a/onfhir-server-r4/pom.xml +++ b/onfhir-server-r4/pom.xml @@ -32,23 +32,53 @@ - + - com.jolira - onejar-maven-plugin + org.apache.maven.plugins + maven-shade-plugin - - onfhir-server-standalone.jar - io.onfhir.r4.Boot - false - + make-assembly + package - one-jar + shade + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/log4j-provider.properties + + + + onfhir-server-standalone + + + + io.onfhir.r4.Boot + + + + + application.conf + + + + + reference.conf + + + + + + com.spotify docker-maven-plugin @@ -60,7 +90,7 @@ / ${project.build.directory} - onfhir-standalone.jar + onfhir-server-standalone.jar diff --git a/onfhir-server-r5/pom.xml b/onfhir-server-r5/pom.xml index 7e2e97a1..14bb9cbb 100644 --- a/onfhir-server-r5/pom.xml +++ b/onfhir-server-r5/pom.xml @@ -32,20 +32,49 @@ - + - com.jolira - onejar-maven-plugin + org.apache.maven.plugins + maven-shade-plugin - - onfhir-server-standalone.jar - io.onfhir.r5.Boot - true - + make-assembly + package - one-jar + shade + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/log4j-provider.properties + + + + onfhir-server-standalone + + + + io.onfhir.r5.Boot + + + + + application.conf + + + + + reference.conf + + + + + @@ -60,7 +89,7 @@ / ${project.build.directory} - onfhir-standalone.jar + onfhir-server-standalone.jar diff --git a/onfhir-server-stu3/pom.xml b/onfhir-server-stu3/pom.xml index ceaa3df3..5b5085e7 100644 --- a/onfhir-server-stu3/pom.xml +++ b/onfhir-server-stu3/pom.xml @@ -33,18 +33,47 @@ - com.jolira - onejar-maven-plugin + org.apache.maven.plugins + maven-shade-plugin - - onfhir-server-standalone.jar - io.onfhir.stu3.Boot - false - + make-assembly + package - one-jar + shade + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/log4j-provider.properties + + + + onfhir-server-standalone + + + + io.onfhir.stu3.Boot + + + + + application.conf + + + + + reference.conf + + + + + @@ -59,7 +88,7 @@ / ${project.build.directory} - onfhir-standalone.jar + onfhir-server-standalone.jar diff --git a/pom.xml b/pom.xml index 76f2c991..a5def379 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ 4.1.1 3.1.0 - 1.4.4 + 3.2.4 2.19.1 0.4.3 @@ -173,19 +173,9 @@ ${jar.plugin.version} - com.jolira - onejar-maven-plugin - ${onejar.plugin.version} - - - - onfhir-standalone.jar - - - one-jar - - - + org.apache.maven.plugins + maven-shade-plugin + ${maven-shade-plugin.version} org.apache.maven.plugins