Skip to content

Commit 9f82842

Browse files
committed
Forcefully removes duplicate org.apache.commons.logging plug-in
1 parent f3ae400 commit 9f82842

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

build.sh

+11
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,14 @@ remove_update_sites () {
199199
rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA
200200
}
201201

202+
# Removes broken org.apache.commons.logging JAR from plug-ins
203+
remove_broken_commons_logging () {
204+
log "Removes broken org.apache.commons.logging JAR from plug-ins."
205+
rm $ECLIPSE_BASE_PATH/plugins/org.apache.commons.logging_1.2.0.v20180409-1502.jar
206+
# force org.eclipse.equinox to
207+
# org.apache.commons.logging,1.2.0,plugins/org.apache.commons.logging_1.2.0.jar,4,false
208+
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
209+
}
202210

203211
#
204212
# Script
@@ -291,6 +299,9 @@ else
291299
chmod +x splash.sh && ./splash.sh deploy $VERSION $ECLIPSE_BASE_PATH
292300
fi
293301

302+
# Remove broken org.apache.commons.logging JAR
303+
remove_broken_commons_logging
304+
294305
log "Clean-up old archives and create new archive."
295306
rm -f ./$OUTPUT_FILE
296307
zip -q -r $OUTPUT_FILE eclipse

0 commit comments

Comments
 (0)