[nobug] Increment features for 3.21, cleanup an unused import
diff --git a/core/bundles/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/XMLLineTokenizer.jflex b/core/bundles/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/XMLLineTokenizer.jflex
index 06c041e..f984d62 100644
--- a/core/bundles/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/XMLLineTokenizer.jflex
+++ b/core/bundles/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/XMLLineTokenizer.jflex
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2004, 2013 IBM Corporation and others.

+ * Copyright (c) 2004, 2020 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

@@ -25,7 +25,6 @@
 import org.eclipse.wst.sse.core.internal.util.Debug;

 import org.eclipse.wst.sse.core.utils.StringUtils;

 import org.eclipse.wst.xml.core.internal.Logger;

-import org.eclipse.wst.xml.core.internal.parser.IntStack;

 import org.eclipse.wst.xml.core.internal.parser.regions.XMLParserRegionFactory;

 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;

 

diff --git a/web/features/org.eclipse.wst.web_core.feature/feature.xml b/web/features/org.eclipse.wst.web_core.feature/feature.xml
index daf7767..66869a8 100644
--- a/web/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_core.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_core.feature/pom.xml b/web/features/org.eclipse.wst.web_core.feature/pom.xml
index eef8100..a1d265f 100644
--- a/web/features/org.eclipse.wst.web_core.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_core.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
index 6abd6f4..4b6139f 100644
--- a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_sdk.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_sdk.feature/pom.xml b/web/features/org.eclipse.wst.web_sdk.feature/pom.xml
index ee24a1e..02b802f 100644
--- a/web/features/org.eclipse.wst.web_sdk.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_sdk.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/web/features/org.eclipse.wst.web_ui.feature/feature.xml b/web/features/org.eclipse.wst.web_ui.feature/feature.xml
index c36c1c7..9ee2762 100644
--- a/web/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.web_ui.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wst.web.ui"
       license-feature="org.eclipse.license"
diff --git a/web/features/org.eclipse.wst.web_ui.feature/pom.xml b/web/features/org.eclipse.wst.web_ui.feature/pom.xml
index 373f26a..e0ea6c2 100644
--- a/web/features/org.eclipse.wst.web_ui.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.web_ui.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/xml/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLLineTokenizer.java b/xml/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLLineTokenizer.java
index d04499a..e6db347 100644
--- a/xml/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLLineTokenizer.java
+++ b/xml/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLLineTokenizer.java
@@ -1,7 +1,7 @@
 /* The following code was generated by JFlex 1.2.2 on 12/20/13 11:48 AM */
 
 /*******************************************************************************
- * Copyright (c) 2004, 2013 IBM Corporation and others.
+ * Copyright (c) 2004, 2020 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
@@ -27,7 +27,6 @@
 import org.eclipse.wst.sse.core.internal.util.Debug;
 import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.parser.IntStack;
 import org.eclipse.wst.xml.core.internal.parser.regions.XMLParserRegionFactory;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 
diff --git a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
index 92349b2..4b54940 100644
--- a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.xml_core.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/xml/features/org.eclipse.wst.xml_core.feature/pom.xml b/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
index 0031574..18bf105 100644
--- a/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml_core.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
index dd68aa0..83093b4 100644
--- a/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.xml_sdk.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml b/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml
index 2ef7ac2..d02d827 100644
--- a/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml_sdk.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml b/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml
index aa9d3a3..74b8191 100644
--- a/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.wst.xml_ui.feature"
       label="%featureName"
-      version="3.20.0.qualifier"
+      version="3.21.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wst.xml.ui"
       license-feature="org.eclipse.license"
diff --git a/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml b/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
index 3edff75..4cbca75 100644
--- a/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.xml_ui.feature</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>3.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>