From 546739c7bd3db685f85a20212e8fbac6c3527941 Mon Sep 17 00:00:00 2001 From: Christopher Schultz Date: Sat, 8 Nov 2025 08:38:32 -0500 Subject: [PATCH] Bump version numbers Given specific instructions for extracting dependent libraries in libs/README.md Skip signing if no keystore is available Tell the user where the resulting artifact is --- bundle.sh | 11 ++++++++++- libs/README.md | 13 +++++++++++++ pom.xml | 35 +++++++---------------------------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/bundle.sh b/bundle.sh index d47224d..3a1843f 100755 --- a/bundle.sh +++ b/bundle.sh @@ -22,7 +22,13 @@ if [ "0" != "$status" ] ; then exit fi -jarsigner -keystore keystore.p12 -storetype PKCS12 -storepass changeit "target/${PACKAGE_JAR}" mirth-client-plugins +if [ -f keystore.p12 ] ; then + jarsigner -keystore keystore.p12 -storetype PKCS12 -storepass changeit "target/${PACKAGE_JAR}" mirth-client-plugins +else + echo "*********" + echo "No keystore.p12 file exists for signing. The plug-in will not be signed." + echo "*********" +fi # Use a separate directory for ZIP assembly rm -rf "${PACKAGE_NAME}" @@ -40,3 +46,6 @@ zip -r9 "target/${PACKAGE_ZIP}" "${PACKAGE_NAME}" rm -rf "${PACKAGE_NAME}" +echo "Build complete." +echo "You can find your plug-in artifact in target/${PACKAGE_ZIP}" + diff --git a/libs/README.md b/libs/README.md index 369e1cf..eec4b77 100644 --- a/libs/README.md +++ b/libs/README.md @@ -1,3 +1,16 @@ # libs Libraries which have been manually installed instead of located via Maven. + +You can fetch the libraries necessary to build this plug-in like this: + +``` +# Extract the required dependencies +$ tar xvzf oie_unix_4_5_2.tar.gz -C libs/ oie/client-lib/mirth-client.jar oie/server-lib/mirth-server.jar oie/cli-lib/mirth-client-core.jar + +# Move out of subdirectories +$ mv libs/oie/*/*.jar libs/ + +# Clean up +$ rm -rf libs/oie +``` diff --git a/pom.xml b/pom.xml index 80c9c97..d1597ac 100644 --- a/pom.xml +++ b/pom.xml @@ -12,53 +12,32 @@ UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 com.mirth server - 3.8.0 + 4.5.2 system ${project.basedir}/libs/mirth-server.jar com.mirth client-core - 3.8.0 + 4.5.2 system ${project.basedir}/libs/mirth-client-core.jar com.mirth client - 3.8.0 + 4.5.2 system ${project.basedir}/libs/mirth-client.jar - - org.jdesktop - swingx-core - 1.6.2 - system - ${project.basedir}/libs/swingx-core-1.6.2.jar - - - net.miginfocom - miglayout-swing - 4.2 - system - ${project.basedir}/libs/miglayout-swing-4.2.jar - - - net.miginfocom - miglayout-core - 4.2 - system - ${project.basedir}/libs/miglayout-core-4.2.jar - org.slf4j @@ -69,13 +48,13 @@ junit junit - 4.13.1 + 4.13.2 test org.owasp dependency-check-maven - 5.2.1 + 12.1.8 maven-plugin