Skip to content

Commit

Permalink
Forcefully removes duplicate org.apache.commons.logging plug-in
Browse files Browse the repository at this point in the history
  • Loading branch information
maxkratz committed Dec 6, 2024
1 parent f3ae400 commit 9f82842
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9f82842

Please sign in to comment.