From f7093eaccce669efea451f886f93139ccd6c8e2e Mon Sep 17 00:00:00 2001 From: Cliff Casey Date: Tue, 21 Jul 2026 11:49:54 -0400 Subject: [PATCH 1/2] shady --- .gitignore | 1 + Makefile | 2 +- pom.xml | 38 +++++++++++++-------- src/main/assembly/jar-with-dependencies.xml | 23 ------------- 4 files changed, 26 insertions(+), 38 deletions(-) delete mode 100644 src/main/assembly/jar-with-dependencies.xml diff --git a/.gitignore b/.gitignore index 0789c14..123ffdc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ target/ logs/ *.sqlite lib/ +dependency-reduced-pom.xml diff --git a/Makefile b/Makefile index e9098ff..20e1096 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: clean build format lint run-dev run-dev-pitch run-rti test verify clean-vendor refresh run-debug-portico -APP_JAR := target/hla-xapi-1.0-SNAPSHOT-jar-with-dependencies.jar +APP_JAR := target/hla-xapi-1.0-SNAPSHOT.jar PORTICO_REPO_URL ?= https://github.com/yetanalytics/portico.git PORTICO_REF ?= yet_patch_object_subs PORTICO_JAR ?= lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar diff --git a/pom.xml b/pom.xml index 28177f1..56cf3bf 100644 --- a/pom.xml +++ b/pom.xml @@ -254,25 +254,35 @@ org.apache.maven.plugins - maven-assembly-plugin - 3.7.1 - - - - com.yetanalytics.hlaxapi.App - - - - src/main/assembly/jar-with-dependencies.xml - - + maven-shade-plugin + 3.6.2 - make-assembly package - single + shade + + + + + + com.yetanalytics.hlaxapi.App + + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + diff --git a/src/main/assembly/jar-with-dependencies.xml b/src/main/assembly/jar-with-dependencies.xml deleted file mode 100644 index 90302c7..0000000 --- a/src/main/assembly/jar-with-dependencies.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - jar-with-dependencies - - jar - - false - - - metaInf-services - - - - - / - true - true - runtime - - - From c104e6b39e49af28b4798cebf9fdde0efb3ff726 Mon Sep 17 00:00:00 2001 From: Cliff Casey Date: Tue, 21 Jul 2026 11:55:17 -0400 Subject: [PATCH 2/2] pom cleanup --- pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 56cf3bf..fc1830e 100644 --- a/pom.xml +++ b/pom.xml @@ -180,6 +180,11 @@ spotless-maven-plugin 2.43.0 + + org.apache.maven.plugins + maven-shade-plugin + 3.6.2 + org.apache.maven.plugins maven-checkstyle-plugin @@ -255,7 +260,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.6.2 package @@ -266,10 +270,10 @@ + com.yetanalytics.hlaxapi.App -