From 4cf1a82df459847b0b8c81e498489daeec3b6483 Mon Sep 17 00:00:00 2001 From: Max Bodaniuk Date: Thu, 9 Mar 2023 21:28:25 +0200 Subject: [PATCH 1/4] Shade antlr --- pom.xml | 69 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index ccfcee73e..f3bd08f91 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.zendesk maxwell - 1.39.5 + 1.39.5-ANTLR-SHADE-SNAPSHOT jar maxwell @@ -291,7 +291,7 @@ jedis 3.5.1 - + io.dropwizard.metrics @@ -414,20 +414,20 @@ --add-opens java.base/java.util=ALL-UNNAMED - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - + + + + + + + + + + + + + + org.apache.maven.plugins maven-source-plugin @@ -543,6 +543,43 @@ + + org.apache.maven.plugins + maven-shade-plugin + 3.3.0 + + + package + + shade + + + true + true + false + + + org.antlr:* + + + + + org.antlr:* + + META-INF/*.MF + + + + + + org.antlr + com.zendesk.maxwell.shaded.org.antlr + + + + + + From f6be81e65d073a4a483b09d0da5a82fb7fcb0e3f Mon Sep 17 00:00:00 2001 From: Max Bodaniuk Date: Thu, 9 Mar 2023 21:33:20 +0200 Subject: [PATCH 2/4] Remove snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f3bd08f91..1bbd602bc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.zendesk maxwell - 1.39.5-ANTLR-SHADE-SNAPSHOT + 1.39.5-ANTLR-SHADE jar maxwell From 6f844847ed4ee4fee72e2d9112abc7ca7367ab02 Mon Sep 17 00:00:00 2001 From: Max Bodaniuk Date: Thu, 9 Mar 2023 21:35:44 +0200 Subject: [PATCH 3/4] Remove commented gpg --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 1bbd602bc..40cb3378c 100644 --- a/pom.xml +++ b/pom.xml @@ -414,20 +414,20 @@ --add-opens java.base/java.util=ALL-UNNAMED - - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + org.apache.maven.plugins maven-source-plugin From a2a49a62bdf2d85e096ab5f1faadc6fdc2b7c1b3 Mon Sep 17 00:00:00 2001 From: Max Bodaniuk Date: Thu, 9 Mar 2023 21:36:15 +0200 Subject: [PATCH 4/4] Polishing --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40cb3378c..6d2df1e5d 100644 --- a/pom.xml +++ b/pom.xml @@ -291,7 +291,6 @@ jedis 3.5.1 - io.dropwizard.metrics