diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java
index 71588617b77..00d7a0d5814 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java
@@ -387,11 +387,11 @@ class ResourceProxyVisitor implements IResourceProxyVisitor {
// The character "." must be escaped in regex
String input = getInput();
// replace "." with "\\."
- input = input.replaceAll("\\.", "\\\\."); //$NON-NLS-1$ //$NON-NLS-2$
+ input = input.replace(".", "\\."); //$NON-NLS-1$ //$NON-NLS-2$
// replace "*" with ".*"
- input = input.replaceAll("\\*", "\\.\\*"); //$NON-NLS-1$ //$NON-NLS-2$
+ input = input.replace("*", ".*"); //$NON-NLS-1$ //$NON-NLS-2$
// replace "?" with ".?"
- input = input.replaceAll("\\?", "\\.\\?"); //$NON-NLS-1$ //$NON-NLS-2$
+ input = input.replace("?", ".?"); //$NON-NLS-1$ //$NON-NLS-2$
pattern = Pattern.compile(input);
}
diff --git a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
index c14ad5fe8e8..8a4359cd841 100644
--- a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
+++ b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ant.ui; singleton:=true
-Bundle-Version: 3.10.300.qualifier
+Bundle-Version: 3.10.400.qualifier
Bundle-Activator: org.eclipse.ant.internal.ui.AntUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildFilesResolver.java b/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildFilesResolver.java
index 68789c57efe..c01094b9c16 100644
--- a/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildFilesResolver.java
+++ b/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildFilesResolver.java
@@ -123,7 +123,7 @@ public String resolveValue(IDynamicVariable variable, String argument) throws Co
// the filename so they don't conflict with these
// special quotes.
//
- osPath = osPath.replaceAll("\"", "\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$
+ osPath = osPath.replace("\"", "\\\""); //$NON-NLS-1$ //$NON-NLS-2$
fileList.append("\"" + osPath + "\""); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/team/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
index e3d5ba8e736..0a67c9ef3dc 100644
--- a/team/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.core; singleton:=true
-Bundle-Version: 3.10.900.qualifier
+Bundle-Version: 3.10.1000.qualifier
Bundle-Activator: org.eclipse.team.internal.core.TeamPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ScmUrlImportDescription.java b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ScmUrlImportDescription.java
index 469232c552f..09332855303 100644
--- a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ScmUrlImportDescription.java
+++ b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ScmUrlImportDescription.java
@@ -59,7 +59,7 @@ public String getUrl() {
}
public URI getUri() {
- return URI.create(url.replaceAll("\"", "")); //$NON-NLS-1$//$NON-NLS-2$
+ return URI.create(url.replace("\"", "")); //$NON-NLS-1$//$NON-NLS-2$
}
public void setUrl(String url) {
diff --git a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF
index 7593a417641..31c1079a58a 100644
--- a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %help_system_plugin_name
Bundle-SymbolicName: org.eclipse.help.ui; singleton:=true
-Bundle-Version: 4.8.200.qualifier
+Bundle-Version: 4.8.300.qualifier
Bundle-Activator: org.eclipse.help.ui.internal.HelpUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/ContextHelpDialog.java b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/ContextHelpDialog.java
index 7851842efe5..dd7fe4d49d2 100644
--- a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/ContextHelpDialog.java
+++ b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/ContextHelpDialog.java
@@ -227,8 +227,8 @@ private Control createInfoArea(Composite parent) {
}
if (styledText == null && context.getText() != null) {
styledText = context.getText();
- styledText= styledText.replaceAll("","<@#\\$b>"); //$NON-NLS-1$ //$NON-NLS-2$
- styledText= styledText.replaceAll("", ""); //$NON-NLS-1$ //$NON-NLS-2$
+ styledText= styledText.replace("","<@#$b>"); //$NON-NLS-1$ //$NON-NLS-2$
+ styledText= styledText.replace("", ""); //$NON-NLS-1$ //$NON-NLS-2$
}
if (styledText == null) { // no description found in context objects.
styledText = Messages.ContextHelpPart_noDescription;
diff --git a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java
index 538d6ac2f68..d9ba9e64a53 100644
--- a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java
+++ b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java
@@ -326,7 +326,7 @@ private void initializeStatusBar(Browser browser) {
// Text
browser.addStatusTextListener(event -> {
- event.text = event.text.replaceAll("&", "&&"); //$NON-NLS-1$ //$NON-NLS-2$
+ event.text = event.text.replace("&", "&&"); //$NON-NLS-1$ //$NON-NLS-2$
if (!event.text.equals(statusText)) {
statusText = event.text;
statusBarText.setText(statusText);
diff --git a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/EscapeUtils.java b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/EscapeUtils.java
index cf1ef022933..ae679d153af 100644
--- a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/EscapeUtils.java
+++ b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/util/EscapeUtils.java
@@ -43,7 +43,7 @@ public static String escapeSpecialCharsLeavinggBold(String value) {
}
public static String escapeAmpersand(String value) {
- return value.replaceAll("&", "&"); //$NON-NLS-1$ //$NON-NLS-2$
+ return value.replace("&", "&"); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
index 8633bb9c604..09541595444 100644
--- a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
+++ b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
@@ -702,8 +702,8 @@ private String decodeContextBoldTags(IContext context) {
if (styledText == null) {
return Messages.ContextHelpPart_noDescription;
}
- String decodedString = styledText.replaceAll("<@#\\$b>", ""); //$NON-NLS-1$ //$NON-NLS-2$
- decodedString = decodedString.replaceAll("", ""); //$NON-NLS-1$ //$NON-NLS-2$
+ String decodedString = styledText.replace("<@#$b>", ""); //$NON-NLS-1$ //$NON-NLS-2$
+ decodedString = decodedString.replace("", ""); //$NON-NLS-1$ //$NON-NLS-2$
decodedString = EscapeUtils.escapeSpecialCharsLeavinggBold(decodedString);
decodedString = decodedString.replaceAll("\r\n|\n|\r", "
"); //$NON-NLS-1$ //$NON-NLS-2$
return decodedString;
diff --git a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
index dcfbbccee90..aa3018a6190 100644
--- a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
+++ b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
@@ -342,8 +342,8 @@ private URLConnection openConnection(String url,
String jar = url.substring(0, excl);
String path = url.length() > excl + 2 ? url.substring(excl + 2)
: ""; //$NON-NLS-1$
- url = jar.replaceAll("!", "%21") + "!/" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- + path.replaceAll("!", "%21"); //$NON-NLS-1$ //$NON-NLS-2$
+ url = jar.replace("!", "%21") + "!/" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + path.replace("!", "%21"); //$NON-NLS-1$ //$NON-NLS-2$
}
helpURL = new URL(url);
}
diff --git a/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
index 6764b8072ca..3ac5e35883d 100644
--- a/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: User Assistance Test
Bundle-SymbolicName: org.eclipse.ua.tests;singleton:=true
-Bundle-Version: 3.7.300.qualifier
+Bundle-Version: 3.7.400.qualifier
Require-Bundle: org.eclipse.help.ui,
org.eclipse.help.webapp,
org.eclipse.test.performance,
diff --git a/ua/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/FileUtil.java b/ua/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/FileUtil.java
index 55677811b46..95f020b85d4 100644
--- a/ua/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/FileUtil.java
+++ b/ua/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/FileUtil.java
@@ -62,7 +62,7 @@ public static String readString(InputStream in) throws IOException {
String result = new String(out.toByteArray(), StandardCharsets.UTF_8);
if (result.length() > 0) {
// filter windows-specific newline
- result = result.replaceAll("\r", "");
+ result = result.replace("\r", "");
}
// ignore whitespace at start or end
return result.trim();
diff --git a/ua/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/XHTMLUtil.java b/ua/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/XHTMLUtil.java
index f0ebb7f3c7d..a98b7fafa5a 100644
--- a/ua/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/XHTMLUtil.java
+++ b/ua/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/XHTMLUtil.java
@@ -36,7 +36,7 @@ public static String removeEnvironmentSpecificContent(String xhtml) {
* becomes:
*
*/
- xhtml = xhtml.replaceAll(" />", "/>");
+ xhtml = xhtml.replace(" />", "/>");
/*
* The base tag is added before showing in browser. It contains an
diff --git a/ua/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java b/ua/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java
index 18dab90d102..7f83f4635a8 100644
--- a/ua/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java
+++ b/ua/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java
@@ -135,7 +135,7 @@ public static Map getXHTMLFiles(IntroModelRoot model) {
});
xhtml = XHTMLUtil.removeEnvironmentSpecificContent(xhtml);
// filter windows-specific newline
- xhtml = xhtml.replaceAll("\r", "");
+ xhtml = xhtml.replace("\r", "");
// ignore all beginning and ending whitespace
xhtml = xhtml.trim();
map.put(page.getInitialBase() + page.getRawContent(), xhtml);
diff --git a/ua/org.eclipse.ua.tests/pom.xml b/ua/org.eclipse.ua.tests/pom.xml
index ac078947241..1d8d087abe4 100644
--- a/ua/org.eclipse.ua.tests/pom.xml
+++ b/ua/org.eclipse.ua.tests/pom.xml
@@ -19,7 +19,7 @@
org.eclipse.platform
org.eclipse.ua.tests
- 3.7.300-SNAPSHOT
+ 3.7.400-SNAPSHOT
eclipse-test-plugin