Google Git
Sign in
eclipse/sourceediting/webtools.sourceediting/5c85d9dde2b1dff1ade7dc40d65e0686c82b818f^!/.
commit
5c85d9dde2b1dff1ade7dc40d65e0686c82b818f
[log]
author
Nitin Dahyabhai <thatnitind@gmail.com>
Mon May 22 12:15:54 2023 -0400
committer
Nitin Dahyabhai <thatnitind@gmail.com>
Mon May 22 12:15:54 2023 -0400
tree
6457e20a3bbf79577627fd0795a070a0cb0373df
parent
88afd2987963a3f279ddc99ec0605d021b734e42 [diff]
[nobug] add forceQualifier.txt files

Change-Id: I64eca8bdb94f24583e61bb0b2bdfc14ca7518a15

diff --git a/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
index 9e23c9e..48b6970 100755
--- a/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF

@@ -68,7 +68,7 @@
  org.eclipse.wst.validation;bundle-version="[1.2.800,1.3.0)",
  org.eclipse.emf.common;bundle-version="[2.14.0,3.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.8.0,4.0.0)",
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.ui.genericeditor;bundle-version="[1.3.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.wst.sse.ui.internal.propertytester"
 Eclipse-LazyStart: true

diff --git a/json/bundles/org.eclipse.wst.json.bower.core/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.bower.core/META-INF/MANIFEST.MF
index 487509b..01e9dcd 100644
--- a/json/bundles/org.eclipse.wst.json.bower.core/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.bower.core/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

diff --git a/json/bundles/org.eclipse.wst.json.bower.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.bower.ui/META-INF/MANIFEST.MF
index ca88df4..7873f02 100755
--- a/json/bundles/org.eclipse.wst.json.bower.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.bower.ui/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources,
  org.eclipse.wst.sse.ui;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.jface,

diff --git a/json/bundles/org.eclipse.wst.json.core/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.core/META-INF/MANIFEST.MF
index 9ad3244..7616eae 100644
--- a/json/bundles/org.eclipse.wst.json.core/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.core/META-INF/MANIFEST.MF

@@ -13,7 +13,7 @@
  org.eclipse.wst.validation,
  org.eclipse.wst.common.uriresolver,
  org.eclipse.json,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.net
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

diff --git a/json/bundles/org.eclipse.wst.json.eslint.core/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.eslint.core/META-INF/MANIFEST.MF
index 7e40007..bc83d54 100644
--- a/json/bundles/org.eclipse.wst.json.eslint.core/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.eslint.core/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

diff --git a/json/bundles/org.eclipse.wst.json.eslint.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.eslint.ui/META-INF/MANIFEST.MF
index 946e685..7761e8a 100755
--- a/json/bundles/org.eclipse.wst.json.eslint.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.eslint.ui/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources,
  org.eclipse.wst.sse.ui;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.jface,

diff --git a/json/bundles/org.eclipse.wst.json.jshint.core/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.jshint.core/META-INF/MANIFEST.MF
index 504a37e..b7914d7 100644
--- a/json/bundles/org.eclipse.wst.json.jshint.core/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.jshint.core/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

diff --git a/json/bundles/org.eclipse.wst.json.jshint.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.jshint.ui/META-INF/MANIFEST.MF
index f042e00..e37c30d 100755
--- a/json/bundles/org.eclipse.wst.json.jshint.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.jshint.ui/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources,
  org.eclipse.wst.sse.ui;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.jface,

diff --git a/json/bundles/org.eclipse.wst.json.npm.core/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.npm.core/META-INF/MANIFEST.MF
index cd2ec7a..d67b3dd 100644
--- a/json/bundles/org.eclipse.wst.json.npm.core/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.npm.core/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.0,4.0.0)",
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

diff --git a/json/bundles/org.eclipse.wst.json.npm.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.npm.ui/META-INF/MANIFEST.MF
index 639f539..e63f403 100755
--- a/json/bundles/org.eclipse.wst.json.npm.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.npm.ui/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources,
  org.eclipse.wst.sse.ui;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.jface,

diff --git a/json/bundles/org.eclipse.wst.json.schemaprocessor/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.schemaprocessor/META-INF/MANIFEST.MF
index c2eebe1..f00e9ad 100644
--- a/json/bundles/org.eclipse.wst.json.schemaprocessor/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.schemaprocessor/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources,
  org.eclipse.wst.json.core,
  org.eclipse.wst.common.uriresolver,

diff --git a/json/bundles/org.eclipse.wst.json.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.ui/META-INF/MANIFEST.MF
index fb5949e..cc9a2ed 100755
--- a/json/bundles/org.eclipse.wst.json.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.ui/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.resources,
  org.eclipse.wst.sse.ui;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.jface,

diff --git a/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
index 0d016f1..96d7ded 100755
--- a/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF

@@ -61,7 +61,7 @@
  org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.ui.views;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)",
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/web/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/ClassPatternRegistry.java b/web/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/ClassPatternRegistry.java
index 6db9312..b418c66 100644
--- a/web/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/ClassPatternRegistry.java
+++ b/web/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/ClassPatternRegistry.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -33,22 +33,22 @@
 
 	private static ClassPatternRegistry fInstance = null;
 
-	private Map fPatterns = null;
+	private Map<String,Set<String>> fPatterns = null;
 
 	private ClassPatternRegistry() {
 		IExtensionRegistry registry = RegistryFactory.getRegistry();
 		if (registry != null) {
 			IConfigurationElement[] elements = RegistryFactory.getRegistry().getConfigurationElementsFor(JSPUIPlugin.ID, "classPatternProvider"); //$NON-NLS-1$
-			fPatterns = new HashMap(elements.length);
+			fPatterns = new HashMap<>(elements.length);
 			for (int i = 0; i < elements.length; i++) {
 				final IConfigurationElement element = elements[i];
 				final String contentType = element.getAttribute("contentType"); //$NON-NLS-1$
 				final String pattern = element.getAttribute("pattern"); //$NON-NLS-1$
 				if (pattern != null && contentType != null) {
 					final StringTokenizer tokenizer = new StringTokenizer(pattern, ","); //$NON-NLS-1$
-					Set patterns = (Set) fPatterns.get(contentType);
+					Set<String> patterns = fPatterns.get(contentType);
 					if (patterns == null) {
-						patterns = new HashSet(0);
+						patterns = new HashSet<>(0);
 						fPatterns.put(contentType, patterns);
 					}
 
@@ -73,13 +73,14 @@
 	public String getClassPattern(String contentType) {
 		if (fPatterns == null)
 			return null;
-		final Set patterns = (Set) fPatterns.get(contentType);
+		final Set<String> patterns = fPatterns.get(contentType);
 		if (patterns != null) {
-			final Iterator it = patterns.iterator();
-			final StringBuffer buffer = new StringBuffer();
+			final Iterator<String> it = patterns.iterator();
+			final StringBuilder buffer = new StringBuilder();
 			while (it.hasNext()) {
-				if (buffer.length() > 0)
+				if (buffer.length() > 0) {
 					buffer.append(',');
+				}
 				buffer.append(it.next());
 			}
 			return buffer.toString();
@@ -87,17 +88,17 @@
 		return null;
 	}
 
-	public Iterator getClassPatternSegments(String contentType) {
-		Iterator result = EMPTY;
+	public Iterator<String> getClassPatternSegments(String contentType) {
+		Iterator<String> result = EMPTY;
 		if (fPatterns != null) {
-			Set patterns = (Set) fPatterns.get(contentType);
+			Set<String> patterns = fPatterns.get(contentType);
 			if (patterns != null)
 				result = patterns.iterator();
 		}
 		return result;
 	}
 
-	private static final Iterator EMPTY = new Iterator() {
+	private static final Iterator<String> EMPTY = new Iterator<String>() {
 
 		/* (non-Javadoc)
 		 * @see java.util.Iterator#hasNext()
@@ -109,7 +110,7 @@
 		/* (non-Javadoc)
 		 * @see java.util.Iterator#next()
 		 */
-		public Object next() {
+		public String next() {
 			return null;
 		}
 

diff --git a/web/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLJavaHyperlinkDetector.java b/web/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLJavaHyperlinkDetector.java
index 25ec3e8..4fd281a 100644
--- a/web/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLJavaHyperlinkDetector.java
+++ b/web/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLJavaHyperlinkDetector.java

@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2008, 2015 IBM Corporation and others.

+ * Copyright (c) 2008, 2023 IBM Corporation and others.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License 2.0

  * which accompanies this distribution, and is available at

@@ -33,11 +33,11 @@
 import org.eclipse.jface.text.Region;

 import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;

 import org.eclipse.jface.text.hyperlink.IHyperlink;

-import org.eclipse.jst.jsp.core.internal.Logger;

 import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;

 import org.eclipse.jst.jsp.core.internal.java.JSPTranslation;

 import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;

 import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;

+import org.eclipse.jst.jsp.ui.internal.Logger;

 import org.eclipse.osgi.util.NLS;

 import org.eclipse.ui.PartInitException;

 import org.eclipse.wst.sse.core.StructuredModelManager;

@@ -230,22 +230,37 @@
 	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {

 		if (region != null && textViewer != null) {

 			IDocument document = textViewer.getDocument();

-			// find hyperlink range for Java element

-			IRegion hyperlinkRegion = region.getLength() > 0 ? region : selectQualifiedName(document, region.getOffset());

-			if (hyperlinkRegion == null || // Bug #462949 - Because selectQualifiedName may return null

-					isJspJavaContent(document, hyperlinkRegion)) { // Handled by JSPJavaHyperlinkDetector

-				return null;

-			}

-			String name = null;

-			try {

-				name = document.get(hyperlinkRegion.getOffset(), hyperlinkRegion.getLength()).trim();

-			}

-			catch (BadLocationException e) {

-			}

-			if (name != null) {

-				IHyperlink link = createHyperlink(name, hyperlinkRegion, document);

-				if (link != null)

-					return new IHyperlink[]{link};

+			ITextFileBuffer textFileBuffer = FileBuffers.getTextFileBufferManager().getTextFileBuffer(document);

+			if (textFileBuffer != null) {

+				IPath basePath = textFileBuffer.getLocation();

+				if (basePath != null && !basePath.isEmpty()) {

+					IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(basePath.segment(0));

+					try {

+						if (basePath.segmentCount() > 1 && project.isAccessible() && project.hasNature(JavaCore.NATURE_ID)) {

+							// find hyperlink range for Java element

+							IRegion hyperlinkRegion = region.getLength() > 0 ? region : selectQualifiedName(document, region.getOffset());

+							if (hyperlinkRegion == null || // Bug #462949 - Because selectQualifiedName may return null

+									isJspJavaContent(document, hyperlinkRegion)) { // Handled by JSPJavaHyperlinkDetector

+								return null;

+							}

+							String name = null;

+							try {

+								name = document.get(hyperlinkRegion.getOffset(), hyperlinkRegion.getLength()).trim();

+							}

+							catch (BadLocationException e) {

+							}

+							if (name != null && !name.isEmpty()) {

+								IHyperlink link = createHyperlink(name, hyperlinkRegion, document);

+								if (link != null) {

+									return new IHyperlink[]{link};

+								}

+							}

+						}

+					}

+					catch (CoreException e) {

+						Logger.logException(e);

+					}

+				}

 			}

 		}

 


diff --git a/web/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
index a21379a..e8cd319 100644
--- a/web/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF

@@ -42,7 +42,7 @@
  org.eclipse.wst.sse.core;bundle-version="[1.2,1.3.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
- com.ibm.icu;bundle-version="72.1.0"
+ com.ibm.icu;bundle-version="73.1.0"
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.wst.css.core.internal.contenttype"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.wst.css.core

diff --git a/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
index b3e5331..77e4f0a 100755
--- a/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF

@@ -46,7 +46,7 @@
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)";resolution:=optional,
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
  org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,2.0.0)";resolution:=optional

diff --git a/web/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
index fa374c2..0a0b976 100644
--- a/web/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF

@@ -40,7 +40,7 @@
  org.eclipse.core.filebuffers;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
  org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)",
- com.ibm.icu;bundle-version="72.1.0"
+ com.ibm.icu;bundle-version="73.1.0"
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.wst.html.core.internal.contenttype,org.eclipse.wst.html.core.internal.provisional.contenttype"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.wst.html.core

diff --git a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
index faa18b9..343d04b 100755
--- a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF

@@ -45,7 +45,7 @@
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)",
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.300,2.0.0)";resolution:=optional,
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy

diff --git a/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs b/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs
index 8aef8a2..7baf0c7 100755
--- a/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs
+++ b/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs

@@ -101,39 +101,68 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

 org.eclipse.jdt.core.compiler.source=1.8

+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false

 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647

+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false

+org.eclipse.jdt.core.formatter.align_with_spaces=false

+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49

+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49

+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49

+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49

+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49

+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0

+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assertion_message=0

 org.eclipse.jdt.core.formatter.alignment_for_assignment=0

 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16

 org.eclipse.jdt.core.formatter.alignment_for_compact_if=32

+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16

 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16

 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0

+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16

 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16

 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16

 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0

 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_record_components=16

+org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0

 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0

+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16

 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=64

 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=64

 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64

+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0

 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0

 org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0

 org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0

 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0

 org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1

 org.eclipse.jdt.core.formatter.blank_lines_before_field=0

 org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

 org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

@@ -142,6 +171,7 @@
 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

 org.eclipse.jdt.core.formatter.blank_lines_before_package=0

 org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0

 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

@@ -153,6 +183,8 @@
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

 org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false

@@ -168,7 +200,9 @@
 org.eclipse.jdt.core.formatter.comment.format_source_code=true

 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.indent_tag_description=false

 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert

 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

 org.eclipse.jdt.core.formatter.comment.line_length=78

 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

@@ -180,10 +214,11 @@
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false

 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true

 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

 org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

 org.eclipse.jdt.core.formatter.indent_empty_lines=false

@@ -215,11 +250,15 @@
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert

 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert

 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert

 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

@@ -245,11 +284,17 @@
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert

 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert

 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

 org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

@@ -266,6 +311,7 @@
 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

@@ -274,13 +320,20 @@
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert

 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert

 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert

 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert

+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert

 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

 org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert

 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

@@ -297,6 +350,7 @@
 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

@@ -323,11 +377,16 @@
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

@@ -339,6 +398,8 @@
 org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

@@ -354,6 +415,7 @@
 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

@@ -364,9 +426,12 @@
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert

 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert

 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

@@ -378,14 +443,37 @@
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

 org.eclipse.jdt.core.formatter.join_lines_in_comments=true

 org.eclipse.jdt.core.formatter.join_wrapped_lines=true

+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never

 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never

 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never

+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never

 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never

 org.eclipse.jdt.core.formatter.lineSplit=999

 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0

 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0

 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3

 org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines

 org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines

@@ -395,17 +483,28 @@
 org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines

 org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines

 org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines

 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines

 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines

 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false

 org.eclipse.jdt.core.formatter.tabulation.char=tab

 org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

+org.eclipse.jdt.core.formatter.text_block_indentation=0

+org.eclipse.jdt.core.formatter.use_on_off_tags=true

 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true

 org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false

 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true

 org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true

 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true

+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false

 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

 org.eclipse.jdt.core.incompatibleJDKLevel=ignore

 org.eclipse.jdt.core.incompleteClasspath=error


diff --git a/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs b/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs
index 7b849ef..f52bbb3 100755
--- a/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs

@@ -43,7 +43,7 @@
 cleanup_settings_version=2

 eclipse.preferences.version=1

 formatter_profile=_SSE Formatting

-formatter_settings_version=14

+formatter_settings_version=22

 internal.default.compliance=default

 org.eclipse.jdt.ui.exception.name=e

 org.eclipse.jdt.ui.gettersetter.use.is=true


diff --git a/web/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
index f974109..4ba0198 100644
--- a/web/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF

@@ -27,7 +27,7 @@
  org.eclipse.wst.html.core;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.2.701,2.0.0)",
  org.eclipse.wst.jsdt.core;bundle-version="[2.0.300,3.0.0)",
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.300,2.0.0)";resolution:=optional,
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/web/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
index 91d10e6..75c6df7 100644
--- a/web/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF

@@ -50,7 +50,7 @@
  org.eclipse.wst.jsdt.ui;bundle-version="[2.0.300,3.0.0)",
  org.eclipse.wst.html.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.wst.html.core;bundle-version="[1.3.0,2.0.0)",
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.wst.jsdt.manipulation;bundle-version="[1.0.600,2.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.2.701,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/web/bundles/org.eclipse.wst.web/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.web/META-INF/MANIFEST.MF
index 8772d5e..8f8f33f 100644
--- a/web/bundles/org.eclipse.wst.web/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.web/META-INF/MANIFEST.MF

@@ -23,7 +23,7 @@
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)",
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.wst.common.environment;bundle-version="[1.0.400,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/web/features/org.eclipse.wst.web_ui.feature/forceQualifier.txt b/web/features/org.eclipse.wst.web_ui.feature/forceQualifier.txt
new file mode 100644
index 0000000..9d4f218
--- /dev/null
+++ b/web/features/org.eclipse.wst.web_ui.feature/forceQualifier.txt

@@ -0,0 +1 @@
+# To force a version qualifier update add the bug here

diff --git a/web/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF b/web/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
index 648686e..0e78e97 100644
--- a/web/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ b/web/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsp.core.tests;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.101.qualifier
 Bundle-Activator: org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
@@ -23,10 +23,10 @@
  org.eclipse.jst.jsp.css.core.tests.testfiles,
  org.eclipse.jst.jsp.css.core.tests.testfiles.results
 Import-Package: org.w3c.dom.css,
- org.w3c.dom.stylesheets
-Require-Bundle: javax.servlet,
- javax.servlet.jsp,
- org.junit;bundle-version="[3.8.2,5.0.0)",
+ org.w3c.dom.stylesheets,
+ javax.servlet,
+ javax.servlet.jsp
+Require-Bundle: org.junit;bundle-version="[3.8.2,5.0.0)",
  org.eclipse.pde.core,
  org.eclipse.update.configurator,
  org.eclipse.wst.html.core,

diff --git a/web/tests/org.eclipse.jst.jsp.core.tests/pom.xml b/web/tests/org.eclipse.jst.jsp.core.tests/pom.xml
index ad1dfb8..6dc0047 100644
--- a/web/tests/org.eclipse.jst.jsp.core.tests/pom.xml
+++ b/web/tests/org.eclipse.jst.jsp.core.tests/pom.xml

@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.jst.jsp.core.tests</artifactId>
-  <version>1.1.100-SNAPSHOT</version>
+  <version>1.1.101-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>

diff --git a/web/tests/org.eclipse.wst.jsdt.web.ui.tests/pom.xml b/web/tests/org.eclipse.wst.jsdt.web.ui.tests/pom.xml
index 9c2fdbc..4effc78 100644
--- a/web/tests/org.eclipse.wst.jsdt.web.ui.tests/pom.xml
+++ b/web/tests/org.eclipse.wst.jsdt.web.ui.tests/pom.xml

@@ -60,7 +60,7 @@
                 </requirement>
                 <requirement>
                   <type>eclipse-plugin</type>
-                  <id>org.eclipse.jst.jsp.core</id>
+                  <id>org.eclipse.jst.jsp.ui</id>
                   <versionRange>0.0.0</versionRange>
                 </requirement>
                 <requirement>

diff --git a/web/tests/org.eclipse.wst.sse.unittests/.classpath b/web/tests/org.eclipse.wst.sse.unittests/.classpath
index eca7bdb..3e5654f 100644
--- a/web/tests/org.eclipse.wst.sse.unittests/.classpath
+++ b/web/tests/org.eclipse.wst.sse.unittests/.classpath

@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/xml/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
index 5d2c799..f854122 100644
--- a/xml/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.dtd.core; singleton:=true
-Bundle-Version: 1.2.400.qualifier
+Bundle-Version: 1.2.500.qualifier
 Bundle-Activator: org.eclipse.wst.dtd.core.internal.DTDCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -36,6 +36,6 @@
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)",
- com.ibm.icu;bundle-version="72.1.0"
+ com.ibm.icu;bundle-version="73.1.0"
 Bundle-ActivationPolicy: lazy; exclude:="org.eclipse.wst.dtd.core.internal.content"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/xml/bundles/org.eclipse.wst.dtd.core/plugin.xml b/xml/bundles/org.eclipse.wst.dtd.core/plugin.xml
index 812c146..6f5b23d 100644
--- a/xml/bundles/org.eclipse.wst.dtd.core/plugin.xml
+++ b/xml/bundles/org.eclipse.wst.dtd.core/plugin.xml

@@ -9,12 +9,19 @@
 			id="org.eclipse.wst.dtd.core.internal.modelhandler">
 		</modelHandler>
 	</extension>
+	<extension point="org.eclipse.wst.sse.core.modelHandler">
+		<modelHandler
+			class="org.eclipse.wst.dtd.core.internal.modelhandler.ModelHandlerForDTD"
+			associatedContentTypeId="org.eclipse.wildwebdeveloper.dtd"
+			id="org.eclipse.wst.dtd.core.internal.modelhandler">
+		</modelHandler>
+	</extension>
 
 	<extension point="org.eclipse.wst.sse.core.taskscanner">
 		<scanner
 			id="org.eclipse.wst.dtd.core.internal.tasks.DTDFileTaskScanner"
 			class="org.eclipse.wst.dtd.core.internal.tasks.DTDFileTaskScanner:org.eclipse.wst.dtd.core.taskMarker"
-			contentTypeIds="org.eclipse.wst.dtd.core.dtdsource" />
+			contentTypeIds="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
 	</extension>
 	<extension
 		id="taskMarker"
@@ -38,6 +45,9 @@
 		<factory
 			contentTypeId="org.eclipse.wst.dtd.core.dtdsource"
 			class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
+		<factory
+			contentTypeId="org.eclipse.wildwebdeveloper.dtd"
+			class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
 	</extension>
 
 	<extension point="org.eclipse.team.core.fileTypes">
@@ -114,6 +124,7 @@
          <include>
             <rules>
                <contentType id="org.eclipse.wst.dtd.core.dtdsource"/>
+               <contentType id="org.eclipse.wildwebdeveloper.dtd"/>
                <fileext caseSensitive="false" ext="dtd"/>
                <fileext caseSensitive="false" ext="ent"/>
                <fileext caseSensitive="false" ext="mod"/>

diff --git a/xml/bundles/org.eclipse.wst.dtd.core/pom.xml b/xml/bundles/org.eclipse.wst.dtd.core/pom.xml
index 89d30f0..c5d12e3 100644
--- a/xml/bundles/org.eclipse.wst.dtd.core/pom.xml
+++ b/xml/bundles/org.eclipse.wst.dtd.core/pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.dtd.core</artifactId>
-  <version>1.2.400-SNAPSHOT</version>
+  <version>1.2.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

diff --git a/xml/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
index 46ac107..91e0119 100755
--- a/xml/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.dtd.ui; singleton:=true
-Bundle-Version: 1.1.500.qualifier
+Bundle-Version: 1.1.600.qualifier
 Bundle-Activator: org.eclipse.wst.dtd.ui.internal.DTDUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -34,7 +34,7 @@
  org.eclipse.wst.xml.ui;bundle-version="[1.2.300,2.0.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)",
- com.ibm.icu;bundle-version="72.1.0"
+ com.ibm.icu;bundle-version="73.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.wst.dtd.ui

diff --git a/xml/bundles/org.eclipse.wst.dtd.ui/plugin.xml b/xml/bundles/org.eclipse.wst.dtd.ui/plugin.xml
index 29e51e7..1720958 100755
--- a/xml/bundles/org.eclipse.wst.dtd.ui/plugin.xml
+++ b/xml/bundles/org.eclipse.wst.dtd.ui/plugin.xml

@@ -13,30 +13,30 @@
 			<class class="org.eclipse.wst.dtd.ui.internal.DTDEditor">
 				<parameter name="org.eclipse.wst.sse.ui.appearancePreferenceScopeName" value="org.eclipse.wst.dtd.ui"/>
 			</class>
-			<contentTypeBinding
-				contentTypeId="org.eclipse.wst.dtd.core.dtdsource" />
+			<contentTypeBinding contentTypeId="org.eclipse.wst.dtd.core.dtdsource" />
+			<contentTypeBinding contentTypeId="org.eclipse.wildwebdeveloper.dtd" />
 		</editor>
 	</extension>
 
 	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
 		<contentOutlineConfiguration
 			class="org.eclipse.wst.dtd.ui.views.contentoutline.DTDContentOutlineConfiguration"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
+			target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
 		<sourceViewerConfiguration
 			class="org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
+			target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
 		<provisionalConfiguration
 			type="characterpairmatcher"
 			class="org.eclipse.wst.dtd.ui.internal.text.DTDDocumentRegionEdgeMatcher"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
+			target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
 		<provisionalConfiguration
 			type="foldingstrategy"
 			class="org.eclipse.wst.dtd.ui.internal.projection.DTDFoldingStrategy"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
+			target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
 		<provisionalDefinition
 			type="preferencepages"
 			value="org.eclipse.wst.dtd.ui.preferences.dtd, org.eclipse.wst.sse.ui.preferences.dtd.templates, org.eclipse.wst.sse.ui.preferences.dtd.styles, org.eclipse.wst.dtd.ui.preferences.editor"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
+			target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
 		<!-- provide syntax highlighting for DTD subset within XML -->
 		<provisionalConfiguration
 			type="linestyleprovider"
@@ -45,11 +45,11 @@
 		<provisionalDefinition
 			type="spellingregions"
 			value="org.eclipse.wst.dtd.core.internal.util.parser.DTDRegionTypes.COMMENT_CONTENT"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
+			target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
 		<provisionalDefinition
 			type="activecontexts"
 			value="org.eclipse.wst.sse.hideFormat"
-        	target="org.eclipse.wst.dtd.core.dtdsource" />
+        	target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
 	</extension>
 
 	<extension point="org.eclipse.ui.editorActions">
@@ -112,6 +112,9 @@
 		<factory
 			contentTypeId="org.eclipse.wst.dtd.core.dtdsource"
 			class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
+		<factory
+			contentTypeId="org.eclipse.wildwebdeveloper.dtd"
+			class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
 	</extension>
 
 	<!-- Register the UI adapter factory provider -->
@@ -120,6 +123,7 @@
 		<adapterFactoryDescription
 			class="org.eclipse.wst.dtd.ui.internal.registry.AdapterFactoryProviderForDTD">
 			<contentType id="org.eclipse.wst.dtd.core.dtdsource" />
+			<contentType id="org.eclipse.wildwebdeveloper.dtd" />
 		</adapterFactoryDescription>
 	</extension>
 

diff --git a/xml/bundles/org.eclipse.wst.dtd.ui/pom.xml b/xml/bundles/org.eclipse.wst.dtd.ui/pom.xml
index c333162..344843a 100644
--- a/xml/bundles/org.eclipse.wst.dtd.ui/pom.xml
+++ b/xml/bundles/org.eclipse.wst.dtd.ui/pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.dtd.ui</artifactId>
-  <version>1.1.500-SNAPSHOT</version>
+  <version>1.1.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <!--  added this "constraint" for bug 458962 -->

diff --git a/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
index 33dd904..1871369 100644
--- a/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF

@@ -320,7 +320,7 @@
  org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";resolution:=optional,
  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.100,1.3.0)";resolution:=optional,
  org.eclipse.wst.common.core;bundle-version="[1.2.0,2.0.0)",
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.osgi.services;bundle-version="[3.7.0,4.0.0)"
 Bundle-ActivationPolicy: lazy; exclude:="org.eclipse.wst.xml.core.internal.contenttype"
 Bundle-RequiredExecutionEnvironment: JavaSE-11

diff --git a/xml/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
index 9883165..bf1360e 100755
--- a/xml/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF

@@ -64,7 +64,7 @@
  org.eclipse.wst.validation.ui;bundle-version="[1.2.600,1.3.0)",
  org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)",
- com.ibm.icu;bundle-version="72.1.0"
+ com.ibm.icu;bundle-version="73.1.0"
 Bundle-ActivationPolicy: lazy; exclude:="org.eclipse.wst.xml.ui.internal.validation.core.errorinfo,org.eclipse.wst.xml.ui.internal.editor.propertytester"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.wst.xml.ui

diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
index 04e8c3f..3e2dbed 100755
--- a/xml/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF

@@ -80,7 +80,7 @@
  org.eclipse.ltk.ui.refactoring;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.wst.xsd.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.search;bundle-version="[3.11.0,4.0.0)",
- com.ibm.icu;bundle-version="72.1.0",
+ com.ibm.icu;bundle-version="73.1.0",
  org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)"
 Bundle-ActivationPolicy: lazy

diff --git a/xml/features/org.eclipse.wst.xml_ui.feature/forceQualifier.txt b/xml/features/org.eclipse.wst.xml_ui.feature/forceQualifier.txt
new file mode 100644
index 0000000..9d4f218
--- /dev/null
+++ b/xml/features/org.eclipse.wst.xml_ui.feature/forceQualifier.txt

@@ -0,0 +1 @@
+# To force a version qualifier update add the bug here

diff --git a/xsl/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF b/xsl/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
index 2869a21..3a106dd 100644
--- a/xsl/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
+++ b/xsl/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF

@@ -23,7 +23,7 @@
  org.eclipse.ui.forms;bundle-version="[3.7.100,4.0.0)",
  org.eclipse.wst.xml.xpath.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.wst.xml.xpath.core;bundle-version="[1.3.0,2.0.0)",
- com.ibm.icu;bundle-version="72.1.0"
+ com.ibm.icu;bundle-version="73.1.0"
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.wst.xsl.ui.internal;x-internal:=true,