From 9f828421dbf1e51de7068c21d750ddc8e68a8de7 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Fri, 6 Dec 2024 12:37:18 +0100 Subject: [PATCH] Forcefully removes duplicate org.apache.commons.logging plug-in --- build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build.sh b/build.sh index cd8850a..386590b 100755 --- a/build.sh +++ b/build.sh @@ -199,6 +199,14 @@ remove_update_sites () { rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA } +# Removes broken org.apache.commons.logging JAR from plug-ins +remove_broken_commons_logging () { + log "Removes broken org.apache.commons.logging JAR from plug-ins." + rm $ECLIPSE_BASE_PATH/plugins/org.apache.commons.logging_1.2.0.v20180409-1502.jar + # force org.eclipse.equinox to + # org.apache.commons.logging,1.2.0,plugins/org.apache.commons.logging_1.2.0.jar,4,false + sed -i '/org.apache.commons.lang3/a org.apache.commons.logging,1.2.0,plugins/org.apache.commons.logging_1.2.0.jar,4,false' $ECLIPSE_BASE_PATH/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info +} # # Script @@ -291,6 +299,9 @@ else chmod +x splash.sh && ./splash.sh deploy $VERSION $ECLIPSE_BASE_PATH fi +# Remove broken org.apache.commons.logging JAR +remove_broken_commons_logging + log "Clean-up old archives and create new archive." rm -f ./$OUTPUT_FILE zip -q -r $OUTPUT_FILE eclipse