Skip to content

Make dependency to com.ibm.icu optional #1545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptziegler merged 1 commit into from
Jul 6, 2026
Merged

Make dependency to com.ibm.icu optional #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.wb.core.java/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.18.400,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.20.200,4.0.0)",
org.eclipse.ui.editors;bundle-version="[3.17.300,4.0.0)",
org.eclipse.wb.core;bundle-version="[1.24.0,2.0.0)",
org.eclipse.wb.core;bundle-version="[1.25.0,2.0.0)",
org.eclipse.wb.core.databinding.xsd;bundle-version="[1.0.300,2.0.0)",
org.eclipse.compare;bundle-version="[3.11.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.38.0,4.0.0)";visibility:=reexport,
Expand Down
6 changes: 4 additions & 2 deletions org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/utils/jdt/core/ProjectUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2024 Google, Inc. and others.
* Copyright (c) 2011, 2026 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -424,7 +424,9 @@ public static SortedSet<String> getAllPluginLibraries() {
symbolicNames.add("org.eclipse.jface");
symbolicNames.add("org.eclipse.jface.text");
symbolicNames.add("org.eclipse.ui.workbench");
symbolicNames.add("com.ibm.icu");
if (EnvironmentUtils.isICU4JEnabled()) {
symbolicNames.add("com.ibm.icu");
}
symbolicNames.add("org.eclipse.ui.forms");
// SWT
String pluginId = "org.eclipse.swt." + SWT.getPlatform() + "." + Platform.getOS();
Expand Down
10 changes: 10 additions & 0 deletions org.eclipse.wb.core/src/org/eclipse/wb/internal/core/EnvironmentUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*******************************************************************************/
package org.eclipse.wb.internal.core;

import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.plugin.AbstractUIPlugin;

import org.apache.commons.lang3.SystemUtils;
Expand Down Expand Up @@ -196,4 +197,13 @@ public static boolean isGefPalette() {
public static boolean isBurningWaveEnabled() {
return Boolean.valueOf(System.getProperty(WBP_BURNINGWAVE, Boolean.FALSE.toString()));
}

private static final boolean IS_ICU4J_ENABLED = Platform.getBundle("com.ibm.icu") != null;

/**
* ICU4J was removed as a platform dependency with the 2026-09 release.
*/
public static boolean isICU4JEnabled() {
return IS_ICU4J_ENABLED;
}
}
2 changes: 1 addition & 1 deletion org.eclipse.wb.rcp/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)",
org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",
org.eclipse.ui.forms;bundle-version="[3.13.300,4.0.0)",
org.eclipse.search;bundle-version="[3.16.200,4.0.0)",
org.eclipse.wb.core;bundle-version="[1.21.0,2.0.0)",
org.eclipse.wb.core;bundle-version="[1.25.0,2.0.0)",
org.eclipse.wb.core.ui;bundle-version="[1.10.800,2.0.0)",
org.eclipse.wb.core.java;bundle-version="[1.15.0,2.0.0)",
org.eclipse.wb.swt;bundle-version="[1.10.100,2.0.0)",
Expand Down
5 changes: 4 additions & 1 deletion org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/parser/ParseFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.eclipse.wb.core.model.JavaInfo;
import org.eclipse.wb.core.model.ObjectInfoUtils;
import org.eclipse.wb.core.model.association.ConstructorParentAssociation;
import org.eclipse.wb.internal.core.EnvironmentUtils;
import org.eclipse.wb.internal.core.model.JavaInfoUtils;
import org.eclipse.wb.internal.core.model.creation.ConstructorCreationSupport;
import org.eclipse.wb.internal.core.model.creation.CreationSupport;
Expand Down Expand Up @@ -512,7 +513,9 @@ protected IParseRealm getRealm() {
@Override
protected void initializeClassLoader_parent(AstEditor editor,
CompositeClassLoader parentClassLoader) throws Exception {
parentClassLoader.add(new BundleClassLoader("com.ibm.icu"), List.of("com.ibm.icu."));
if (EnvironmentUtils.isICU4JEnabled()) {
parentClassLoader.add(new BundleClassLoader("com.ibm.icu"), List.of("com.ibm.icu."));
}
parentClassLoader.add(new BundleClassLoader("org.eclipse.ui"), null);
parentClassLoader.add(new BundleClassLoader("org.eclipse.ui.forms"), null);
parentClassLoader.add(new BundleClassLoader("org.eclipse.jdt.ui"), null);
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)",
org.eclipse.nebula.widgets.grid;bundle-version="[1.1.1,2.0.0)",
org.eclipse.nebula.widgets.pshelf;bundle-version="[1.1.0,2.0.0)",
org.eclipse.swtbot.eclipse.finder;bundle-version="[4.2.0,5.0.0)",
org.eclipse.wb.core;bundle-version="[1.22.0,2.0.0)",
org.eclipse.wb.core;bundle-version="[1.25.0,2.0.0)",
org.eclipse.wb.core.java;bundle-version="[1.13.100,2.0.0)",
org.eclipse.wb.swing;bundle-version="[1.10.200,2.0.0)",
org.eclipse.wb.swing.FormLayout;bundle-version="[1.12.100,2.0.0)",
Expand Down
7 changes: 5 additions & 2 deletions ...ipse.wb.tests/src/org/eclipse/wb/tests/designer/databinding/rcp/DatabindingTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2023 Google, Inc.
* Copyright (c) 2011, 2026 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -12,6 +12,7 @@
*******************************************************************************/
package org.eclipse.wb.tests.designer.databinding.rcp;

import org.eclipse.wb.internal.core.EnvironmentUtils;
import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo;
import org.eclipse.wb.tests.designer.core.TestProject;
import org.eclipse.wb.tests.designer.core.model.parser.AbstractJavaInfoTest;
Expand All @@ -28,7 +29,9 @@ public class DatabindingTestUtils {
*/
public static void configure(TestProject testProject) throws Exception {
BTestUtils.configure(testProject);
testProject.addPlugin("com.ibm.icu");
if (EnvironmentUtils.isICU4JEnabled()) {
testProject.addPlugin("com.ibm.icu");
}
testProject.addPlugin("org.eclipse.core.databinding");
testProject.addPlugin("org.eclipse.core.databinding.beans");
testProject.addPlugin("org.eclipse.core.databinding.observable");
Expand Down
Loading