[582204] Update jobs from Tycho 2.7.5 to Tycho 4.0.0 Change-Id: Ic6c5f7cfd252fe69eb9243d70614d24565d18019
diff --git a/core/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/undo/IStructuredTextUndoManager.java b/core/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/undo/IStructuredTextUndoManager.java index b0bb745..95126ca 100644 --- a/core/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/undo/IStructuredTextUndoManager.java +++ b/core/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/undo/IStructuredTextUndoManager.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation and others. + * Copyright (c) 2001, 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 @@ -17,6 +17,10 @@ import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CommandStack; +/** + * @deprecated - expect its removal in bundle version 1.3 or 2024-06, whichever comes later + */ +@Deprecated public interface IStructuredTextUndoManager { /**
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 48b6970..5a8ff65 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.sse.ui; singleton:=true -Bundle-Version: 1.7.700.qualifier +Bundle-Version: 1.7.701.qualifier Bundle-Activator: org.eclipse.wst.sse.ui.internal.SSEUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -65,7 +65,7 @@ org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.core.commands;bundle-version="[3.9.0,4.0.0)", - org.eclipse.wst.validation;bundle-version="[1.2.800,1.3.0)", + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.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="73.1.0",
diff --git a/core/bundles/org.eclipse.wst.sse.ui/pom.xml b/core/bundles/org.eclipse.wst.sse.ui/pom.xml index fbc2c95..24dee93 100644 --- a/core/bundles/org.eclipse.wst.sse.ui/pom.xml +++ b/core/bundles/org.eclipse.wst.sse.ui/pom.xml
@@ -21,7 +21,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.sse.ui</artifactId> - <version>1.7.700-SNAPSHOT</version> + <version>1.7.701-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build>
diff --git a/json/bundles/org.eclipse.wst.json.bower.core/.classpath b/json/bundles/org.eclipse.wst.json.bower.core/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.bower.core/.classpath +++ b/json/bundles/org.eclipse.wst.json.bower.core/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
diff --git a/json/bundles/org.eclipse.wst.json.bower.core/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.bower.core/.settings/org.eclipse.jdt.core.prefs index f287d53..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.bower.core/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.bower.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
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 01e9dcd..26c70d6 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
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.wst.json.bower.core Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.bower.core;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.bower.core.internal.BowerCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,5 +11,5 @@ org.eclipse.wst.sse.core, com.ibm.icu;bundle-version="73.1.0", org.eclipse.core.resources -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
diff --git a/json/bundles/org.eclipse.wst.json.bower.core/pom.xml b/json/bundles/org.eclipse.wst.json.bower.core/pom.xml index cee8f8f..1aa84c0 100644 --- a/json/bundles/org.eclipse.wst.json.bower.core/pom.xml +++ b/json/bundles/org.eclipse.wst.json.bower.core/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.bower.core</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/json/bundles/org.eclipse.wst.json.bower.ui/.classpath b/json/bundles/org.eclipse.wst.json.bower.ui/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.bower.ui/.classpath +++ b/json/bundles/org.eclipse.wst.json.bower.ui/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
diff --git a/json/bundles/org.eclipse.wst.json.bower.ui/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.bower.ui/.settings/org.eclipse.jdt.core.prefs index f287d53..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.bower.ui/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.bower.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
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 7873f02..c0d8986 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
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.wst.json.bower.ui Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.bower.ui;singleton:=true -Bundle-Version: 1.0.300.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.bower.ui.internal.BowerUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -18,5 +18,5 @@ org.eclipse.wst.json.core, org.eclipse.json, org.eclipse.wst.json.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
diff --git a/json/bundles/org.eclipse.wst.json.bower.ui/pom.xml b/json/bundles/org.eclipse.wst.json.bower.ui/pom.xml index 916f23e..f4477a7 100644 --- a/json/bundles/org.eclipse.wst.json.bower.ui/pom.xml +++ b/json/bundles/org.eclipse.wst.json.bower.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.bower.ui</artifactId> - <version>1.0.300-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/json/bundles/org.eclipse.wst.json.core/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.core/.settings/org.eclipse.jdt.core.prefs index 295926d..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.core/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.core/.settings/org.eclipse.jdt.core.prefs
@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8
diff --git a/json/bundles/org.eclipse.wst.json.eslint.core/.classpath b/json/bundles/org.eclipse.wst.json.eslint.core/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.eslint.core/.classpath +++ b/json/bundles/org.eclipse.wst.json.eslint.core/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
diff --git a/json/bundles/org.eclipse.wst.json.eslint.core/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.eslint.core/.settings/org.eclipse.jdt.core.prefs index f287d53..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.eslint.core/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.eslint.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
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 bc83d54..feb8834 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
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.wst.json.eslint.core Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.eslint.core;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.eslint.core.internal.ESLintCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,5 +11,5 @@ org.eclipse.wst.sse.core, com.ibm.icu;bundle-version="73.1.0", org.eclipse.core.resources -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
diff --git a/json/bundles/org.eclipse.wst.json.eslint.core/pom.xml b/json/bundles/org.eclipse.wst.json.eslint.core/pom.xml index 4538bad..4c0a2e9 100644 --- a/json/bundles/org.eclipse.wst.json.eslint.core/pom.xml +++ b/json/bundles/org.eclipse.wst.json.eslint.core/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.eslint.core</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/json/bundles/org.eclipse.wst.json.eslint.ui/.classpath b/json/bundles/org.eclipse.wst.json.eslint.ui/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.eslint.ui/.classpath +++ b/json/bundles/org.eclipse.wst.json.eslint.ui/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
diff --git a/json/bundles/org.eclipse.wst.json.eslint.ui/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.eslint.ui/.settings/org.eclipse.jdt.core.prefs index f287d53..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.eslint.ui/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.eslint.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
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 7761e8a..4efcba3 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
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.wst.json.eslint.ui Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.eslint.ui;singleton:=true -Bundle-Version: 1.0.300.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.eslint.ui.internal.ESLintUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -16,5 +16,5 @@ org.eclipse.ui, org.eclipse.jface.text, org.eclipse.wst.json.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
diff --git a/json/bundles/org.eclipse.wst.json.eslint.ui/pom.xml b/json/bundles/org.eclipse.wst.json.eslint.ui/pom.xml index 9f11bb0..e9ffa30 100644 --- a/json/bundles/org.eclipse.wst.json.eslint.ui/pom.xml +++ b/json/bundles/org.eclipse.wst.json.eslint.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.eslint.ui</artifactId> - <version>1.0.300-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/json/bundles/org.eclipse.wst.json.jshint.core/.classpath b/json/bundles/org.eclipse.wst.json.jshint.core/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.jshint.core/.classpath +++ b/json/bundles/org.eclipse.wst.json.jshint.core/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
diff --git a/json/bundles/org.eclipse.wst.json.jshint.core/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.jshint.core/.settings/org.eclipse.jdt.core.prefs index f287d53..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.jshint.core/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.jshint.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
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 b7914d7..d9d7d65 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.jshint.core;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.jshint.core.internal.JSHintCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,5 +10,5 @@ org.eclipse.wst.sse.core, com.ibm.icu;bundle-version="73.1.0", org.eclipse.core.resources -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
diff --git a/json/bundles/org.eclipse.wst.json.jshint.core/pom.xml b/json/bundles/org.eclipse.wst.json.jshint.core/pom.xml index e2fcfbf..c6c1f14 100644 --- a/json/bundles/org.eclipse.wst.json.jshint.core/pom.xml +++ b/json/bundles/org.eclipse.wst.json.jshint.core/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.jshint.core</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/json/bundles/org.eclipse.wst.json.jshint.ui/.classpath b/json/bundles/org.eclipse.wst.json.jshint.ui/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.jshint.ui/.classpath +++ b/json/bundles/org.eclipse.wst.json.jshint.ui/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
diff --git a/json/bundles/org.eclipse.wst.json.jshint.ui/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.jshint.ui/.settings/org.eclipse.jdt.core.prefs index f287d53..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.jshint.ui/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.jshint.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
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 e37c30d..5f1767b 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.jshint.ui;singleton:=true -Bundle-Version: 1.0.300.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.jshint.ui.internal.JSHintUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -15,5 +15,5 @@ org.eclipse.ui, org.eclipse.jface.text, org.eclipse.wst.json.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
diff --git a/json/bundles/org.eclipse.wst.json.jshint.ui/pom.xml b/json/bundles/org.eclipse.wst.json.jshint.ui/pom.xml index 1b9dc98..ad21cd8 100644 --- a/json/bundles/org.eclipse.wst.json.jshint.ui/pom.xml +++ b/json/bundles/org.eclipse.wst.json.jshint.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.jshint.ui</artifactId> - <version>1.0.300-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/json/bundles/org.eclipse.wst.json.npm.core/.classpath b/json/bundles/org.eclipse.wst.json.npm.core/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.npm.core/.classpath +++ b/json/bundles/org.eclipse.wst.json.npm.core/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
diff --git a/json/bundles/org.eclipse.wst.json.npm.core/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.npm.core/.settings/org.eclipse.jdt.core.prefs index f287d53..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.npm.core/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.npm.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
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 d67b3dd..25bbb36 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.npm.core;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.npm.core.internal.NPMCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,5 +10,5 @@ org.eclipse.wst.sse.core, com.ibm.icu;bundle-version="73.1.0", org.eclipse.core.resources -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
diff --git a/json/bundles/org.eclipse.wst.json.npm.core/pom.xml b/json/bundles/org.eclipse.wst.json.npm.core/pom.xml index 378b951..3ec979b 100644 --- a/json/bundles/org.eclipse.wst.json.npm.core/pom.xml +++ b/json/bundles/org.eclipse.wst.json.npm.core/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.npm.core</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/json/bundles/org.eclipse.wst.json.npm.ui/.classpath b/json/bundles/org.eclipse.wst.json.npm.ui/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.npm.ui/.classpath +++ b/json/bundles/org.eclipse.wst.json.npm.ui/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
diff --git a/json/bundles/org.eclipse.wst.json.npm.ui/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.npm.ui/.settings/org.eclipse.jdt.core.prefs index f287d53..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.npm.ui/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.npm.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
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 e63f403..9d623e4 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.npm.ui;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.npm.ui.internal.NPMUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -17,5 +17,5 @@ org.eclipse.wst.json.core, org.eclipse.wst.json.ui, org.eclipse.json -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
diff --git a/json/bundles/org.eclipse.wst.json.npm.ui/pom.xml b/json/bundles/org.eclipse.wst.json.npm.ui/pom.xml index 8c3c6b1..029f40a 100644 --- a/json/bundles/org.eclipse.wst.json.npm.ui/pom.xml +++ b/json/bundles/org.eclipse.wst.json.npm.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.npm.ui</artifactId> - <version>1.0.200-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/json/bundles/org.eclipse.wst.json.schemaprocessor/.classpath b/json/bundles/org.eclipse.wst.json.schemaprocessor/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.schemaprocessor/.classpath +++ b/json/bundles/org.eclipse.wst.json.schemaprocessor/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
diff --git a/json/bundles/org.eclipse.wst.json.schemaprocessor/.settings/org.eclipse.jdt.core.prefs b/json/bundles/org.eclipse.wst.json.schemaprocessor/.settings/org.eclipse.jdt.core.prefs index f287d53..e2860e9 100644 --- a/json/bundles/org.eclipse.wst.json.schemaprocessor/.settings/org.eclipse.jdt.core.prefs +++ b/json/bundles/org.eclipse.wst.json.schemaprocessor/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
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 f00e9ad..5100522 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.schemaprocessor;singleton:=true -Bundle-Version: 1.0.300.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.schemaprocessor.JSONSchemaProcessorCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -13,7 +13,7 @@ org.eclipse.wst.json.core, org.eclipse.wst.common.uriresolver, org.eclipse.json -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.wst.json.schemaprocessor, org.eclipse.wst.json.schemaprocessor.internal
diff --git a/json/bundles/org.eclipse.wst.json.schemaprocessor/pom.xml b/json/bundles/org.eclipse.wst.json.schemaprocessor/pom.xml index 5423f7e..bbc65d1 100644 --- a/json/bundles/org.eclipse.wst.json.schemaprocessor/pom.xml +++ b/json/bundles/org.eclipse.wst.json.schemaprocessor/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.schemaprocessor</artifactId> - <version>1.0.300-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/json/bundles/org.eclipse.wst.json.ui/.classpath b/json/bundles/org.eclipse.wst.json.ui/.classpath index ad32c83..eca7bdb 100644 --- a/json/bundles/org.eclipse.wst.json.ui/.classpath +++ b/json/bundles/org.eclipse.wst.json.ui/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="output" path="bin"/>
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 cc9a2ed..1842b0b 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.ui;singleton:=true -Bundle-Version: 1.0.700.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.wst.json.ui.internal.JSONUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -19,7 +19,7 @@ org.eclipse.ui.workbench.texteditor, org.eclipse.json, org.eclipse.wst.json.schemaprocessor;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.wst.json.ui, org.eclipse.wst.json.ui.contentassist,
diff --git a/json/bundles/org.eclipse.wst.json.ui/pom.xml b/json/bundles/org.eclipse.wst.json.ui/pom.xml index 3ba9a44..6f34c19 100644 --- a/json/bundles/org.eclipse.wst.json.ui/pom.xml +++ b/json/bundles/org.eclipse.wst.json.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.ui</artifactId> - <version>1.0.700-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF index 028e038..6d247e4 100644 --- a/web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF +++ b/web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.jsp.core;singleton:=true -Bundle-Version: 1.4.600.qualifier +Bundle-Version: 1.4.700.qualifier Bundle-Activator: org.eclipse.jst.jsp.core.internal.JSPCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -45,7 +45,7 @@ Import-Package: javax.servlet.jsp.tagext;version="[2.0.0,3.0.0)", org.w3c.dom.css, org.w3c.dom.stylesheets -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)", +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.core.jobs;bundle-version="[3.10.0,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.6.0,4.0.0)", @@ -55,7 +55,7 @@ org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)", org.eclipse.wst.css.core;bundle-version="[1.3.0,1.4.0)", org.eclipse.wst.html.core;bundle-version="[1.4.0,1.5.0)", - org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)", + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.0)", org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)", com.ibm.icu;bundle-version="73.1.0", org.eclipse.osgi.services;bundle-version="[3.7.0,4.0.0]",
diff --git a/web/bundles/org.eclipse.jst.jsp.core/pom.xml b/web/bundles/org.eclipse.jst.jsp.core/pom.xml index be6f2e2..34f875c 100644 --- a/web/bundles/org.eclipse.jst.jsp.core/pom.xml +++ b/web/bundles/org.eclipse.jst.jsp.core/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.jst.jsp.core</artifactId> - <version>1.4.600-SNAPSHOT</version> + <version>1.4.700-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/web/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/tips/LocalProvider.java b/web/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/tips/LocalProvider.java new file mode 100644 index 0000000..ba14ce9 --- /dev/null +++ b/web/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/tips/LocalProvider.java
@@ -0,0 +1,34 @@ +package org.eclipse.jst.jsp.core.internal.tips; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.tips.core.TipImage; + +public class LocalProvider extends org.eclipse.tips.core.TipProvider { + + @Override + public void dispose() { + + } + + @Override + public String getDescription() { + return "Tips for working with JSPs"; + } + + @Override + public String getID() { + return "org.eclipse.jst.jsp.core.internal.tips.LocalProvider"; + } + + @Override + public TipImage getImage() { + return null; + } + + @Override + public IStatus loadNewTips(IProgressMonitor monitor) { + return null; + } + +}
diff --git a/web/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF index 352af15..c5e2df2 100644 --- a/web/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF +++ b/web/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.standard.schemas;singleton:=true -Bundle-Version: 1.2.500.qualifier +Bundle-Version: 1.2.600.qualifier Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Require-Bundle: jakarta.servlet;bundle-version="5.0.0"
diff --git a/web/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_10.xsd b/web/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_10.xsd new file mode 100644 index 0000000..6e95b0b --- /dev/null +++ b/web/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_10.xsd
@@ -0,0 +1,307 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" + targetNamespace="https://jakarta.ee/xml/ns/jakartaee" + xmlns:jakartaee="https://jakarta.ee/xml/ns/jakartaee" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="10"> + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v. 2.0, which is available at + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + This is the XML Schema for the application client 10 + deployment descriptor. The deployment descriptor must + be named "META-INF/application-client.xml" in the + application client's jar file. All application client + deployment descriptors must indicate the application + client schema by using the Jakarta EE namespace: + + https://jakarta.ee/xml/ns/jakartaee + + and indicate the version of the schema by + using the version element as shown below: + + <application-client xmlns="https://jakarta.ee/xml/ns/jakartaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee + https://jakarta.ee/xml/ns/jakartaee/application-client_10.xsd" + version="10"> + ... + </application-client> + + The instance documents may indicate the published version of + the schema using the xsi:schemaLocation attribute for Jakarta EE + namespace with the following location: + + https://jakarta.ee/xml/ns/jakartaee/application-client_10.xsd + + ]]> + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + The following conventions apply to all Jakarta EE + deployment descriptor elements unless indicated otherwise. + + - In elements that specify a pathname to a file within the + same JAR file, relative filenames (i.e., those not + starting with "/") are considered relative to the root of + the JAR file's namespace. Absolute filenames (i.e., those + starting with "/") also specify names in the root of the + JAR file's namespace. In general, relative names are + preferred. The exception is .war files where absolute + names are preferred for consistency with the Servlet API. + + </xsd:documentation> + </xsd:annotation> + + <xsd:include schemaLocation="jakartaee_10.xsd"/> + + +<!-- **************************************************** --> + + <xsd:element name="application-client" + type="jakartaee:application-clientType"> + <xsd:annotation> + <xsd:documentation> + + The application-client element is the root element of an + application client deployment descriptor. The application + client deployment descriptor describes the enterprise bean + components and external resources referenced by the + application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:unique name="env-entry-name-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The env-entry-name element contains the name of an + application client's environment entry. The name is a JNDI + name relative to the java:comp/env context. The name must + be unique within an application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:env-entry"/> + <xsd:field xpath="jakartaee:env-entry-name"/> + </xsd:unique> + <xsd:unique name="ejb-ref-name-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The ejb-ref-name element contains the name of an enterprise bean + reference. The enterprise bean reference is an entry + in the application client's environment and is relative to the + java:comp/env context. The name must be unique within the + application client. + + It is recommended that name is prefixed with "ejb/". + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:ejb-ref"/> + <xsd:field xpath="jakartaee:ejb-ref-name"/> + </xsd:unique> + <xsd:unique name="res-ref-name-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The res-ref-name element specifies the name of a + resource manager connection factory reference.The name + is a JNDI name relative to the java:comp/env context. + The name must be unique within an application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:resource-ref"/> + <xsd:field xpath="jakartaee:res-ref-name"/> + </xsd:unique> + <xsd:unique name="resource-env-ref-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The resource-env-ref-name element specifies the name of + a resource environment reference; its value is the + environment entry name used in the application client + code. The name is a JNDI name relative to the + java:comp/env context and must be unique within an + application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:resource-env-ref"/> + <xsd:field xpath="jakartaee:resource-env-ref-name"/> + </xsd:unique> + <xsd:unique name="message-destination-ref-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The message-destination-ref-name element specifies the + name of a message destination reference; its value is + the message destination reference name used in the + application client code. The name is a JNDI name + relative to the java:comp/env context and must be unique + within an application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:message-destination-ref"/> + <xsd:field xpath="jakartaee:message-destination-ref-name"/> + </xsd:unique> + </xsd:element> + + +<!-- **************************************************** --> + + <xsd:complexType name="application-clientType"> + <xsd:sequence> + <xsd:element name="module-name" + type="jakartaee:string" + minOccurs="0"/> + <xsd:group ref="jakartaee:descriptionGroup"/> + <xsd:element name="env-entry" + type="jakartaee:env-entryType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="ejb-ref" + type="jakartaee:ejb-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:group ref="jakartaee:service-refGroup"/> + <xsd:element name="resource-ref" + type="jakartaee:resource-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="resource-env-ref" + type="jakartaee:resource-env-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="message-destination-ref" + type="jakartaee:message-destination-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="persistence-unit-ref" + type="jakartaee:persistence-unit-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="post-construct" + type="jakartaee:lifecycle-callbackType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="pre-destroy" + type="jakartaee:lifecycle-callbackType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="callback-handler" + type="jakartaee:fully-qualified-classType" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The callback-handler element names a class provided by + the application. The class must have a no args + constructor and must implement the + jakarta.security.auth.callback.CallbackHandler + interface. The class will be instantiated by the + application client container and used by the container + to collect authentication information from the user. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="message-destination" + type="jakartaee:message-destinationType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="data-source" + type="jakartaee:data-sourceType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="jms-connection-factory" + type="jakartaee:jms-connection-factoryType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="jms-destination" + type="jakartaee:jms-destinationType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="mail-session" + type="jakartaee:mail-sessionType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="connection-factory" + type="jakartaee:connection-factory-resourceType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="administered-object" + type="jakartaee:administered-objectType" + minOccurs="0" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="version" + type="jakartaee:dewey-versionType" + fixed="10" + use="required"> + <xsd:annotation> + <xsd:documentation> + + The required value for the version is 10. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="metadata-complete" + type="xsd:boolean"> + <xsd:annotation> + <xsd:documentation> + + The metadata-complete attribute defines whether this + deployment descriptor and other related deployment + descriptors for this module (e.g., web service + descriptors) are complete, or whether the class + files available to this module and packaged with + this application should be examined for annotations + that specify deployment information. + + If metadata-complete is set to "true", the deployment + tool must ignore any annotations that specify deployment + information, which might be present in the class files + of the application. + + If metadata-complete is not specified or is set to + "false", the deployment tool must examine the class + files of the application for annotations, as + specified by the specifications. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="id" + type="xsd:ID"/> + </xsd:complexType> + +</xsd:schema>
diff --git a/web/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_9.xsd b/web/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_9.xsd new file mode 100644 index 0000000..a4df45b --- /dev/null +++ b/web/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_9.xsd
@@ -0,0 +1,307 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" + targetNamespace="https://jakarta.ee/xml/ns/jakartaee" + xmlns:jakartaee="https://jakarta.ee/xml/ns/jakartaee" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="9"> + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v. 2.0, which is available at + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + This is the XML Schema for the application client 9 + deployment descriptor. The deployment descriptor must + be named "META-INF/application-client.xml" in the + application client's jar file. All application client + deployment descriptors must indicate the application + client schema by using the Jakarta EE namespace: + + https://jakarta.ee/xml/ns/jakartaee + + and indicate the version of the schema by + using the version element as shown below: + + <application-client xmlns="https://jakarta.ee/xml/ns/jakartaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee + https://jakarta.ee/xml/ns/jakartaee/application-client_9.xsd" + version="9"> + ... + </application-client> + + The instance documents may indicate the published version of + the schema using the xsi:schemaLocation attribute for Jakarta EE + namespace with the following location: + + https://jakarta.ee/xml/ns/jakartaee/application-client_9.xsd + + ]]> + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + The following conventions apply to all Jakarta EE + deployment descriptor elements unless indicated otherwise. + + - In elements that specify a pathname to a file within the + same JAR file, relative filenames (i.e., those not + starting with "/") are considered relative to the root of + the JAR file's namespace. Absolute filenames (i.e., those + starting with "/") also specify names in the root of the + JAR file's namespace. In general, relative names are + preferred. The exception is .war files where absolute + names are preferred for consistency with the Servlet API. + + </xsd:documentation> + </xsd:annotation> + + <xsd:include schemaLocation="jakartaee_9.xsd"/> + + +<!-- **************************************************** --> + + <xsd:element name="application-client" + type="jakartaee:application-clientType"> + <xsd:annotation> + <xsd:documentation> + + The application-client element is the root element of an + application client deployment descriptor. The application + client deployment descriptor describes the enterprise bean + components and external resources referenced by the + application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:unique name="env-entry-name-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The env-entry-name element contains the name of an + application client's environment entry. The name is a JNDI + name relative to the java:comp/env context. The name must + be unique within an application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:env-entry"/> + <xsd:field xpath="jakartaee:env-entry-name"/> + </xsd:unique> + <xsd:unique name="ejb-ref-name-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The ejb-ref-name element contains the name of an enterprise bean + reference. The enterprise bean reference is an entry + in the application client's environment and is relative to the + java:comp/env context. The name must be unique within the + application client. + + It is recommended that name is prefixed with "ejb/". + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:ejb-ref"/> + <xsd:field xpath="jakartaee:ejb-ref-name"/> + </xsd:unique> + <xsd:unique name="res-ref-name-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The res-ref-name element specifies the name of a + resource manager connection factory reference.The name + is a JNDI name relative to the java:comp/env context. + The name must be unique within an application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:resource-ref"/> + <xsd:field xpath="jakartaee:res-ref-name"/> + </xsd:unique> + <xsd:unique name="resource-env-ref-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The resource-env-ref-name element specifies the name of + a resource environment reference; its value is the + environment entry name used in the application client + code. The name is a JNDI name relative to the + java:comp/env context and must be unique within an + application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:resource-env-ref"/> + <xsd:field xpath="jakartaee:resource-env-ref-name"/> + </xsd:unique> + <xsd:unique name="message-destination-ref-uniqueness"> + <xsd:annotation> + <xsd:documentation> + + The message-destination-ref-name element specifies the + name of a message destination reference; its value is + the message destination reference name used in the + application client code. The name is a JNDI name + relative to the java:comp/env context and must be unique + within an application client. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="jakartaee:message-destination-ref"/> + <xsd:field xpath="jakartaee:message-destination-ref-name"/> + </xsd:unique> + </xsd:element> + + +<!-- **************************************************** --> + + <xsd:complexType name="application-clientType"> + <xsd:sequence> + <xsd:element name="module-name" + type="jakartaee:string" + minOccurs="0"/> + <xsd:group ref="jakartaee:descriptionGroup"/> + <xsd:element name="env-entry" + type="jakartaee:env-entryType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="ejb-ref" + type="jakartaee:ejb-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:group ref="jakartaee:service-refGroup"/> + <xsd:element name="resource-ref" + type="jakartaee:resource-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="resource-env-ref" + type="jakartaee:resource-env-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="message-destination-ref" + type="jakartaee:message-destination-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="persistence-unit-ref" + type="jakartaee:persistence-unit-refType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="post-construct" + type="jakartaee:lifecycle-callbackType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="pre-destroy" + type="jakartaee:lifecycle-callbackType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="callback-handler" + type="jakartaee:fully-qualified-classType" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The callback-handler element names a class provided by + the application. The class must have a no args + constructor and must implement the + jakarta.security.auth.callback.CallbackHandler + interface. The class will be instantiated by the + application client container and used by the container + to collect authentication information from the user. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="message-destination" + type="jakartaee:message-destinationType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="data-source" + type="jakartaee:data-sourceType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="jms-connection-factory" + type="jakartaee:jms-connection-factoryType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="jms-destination" + type="jakartaee:jms-destinationType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="mail-session" + type="jakartaee:mail-sessionType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="connection-factory" + type="jakartaee:connection-factory-resourceType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="administered-object" + type="jakartaee:administered-objectType" + minOccurs="0" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="version" + type="jakartaee:dewey-versionType" + fixed="9" + use="required"> + <xsd:annotation> + <xsd:documentation> + + The required value for the version is 9. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="metadata-complete" + type="xsd:boolean"> + <xsd:annotation> + <xsd:documentation> + + The metadata-complete attribute defines whether this + deployment descriptor and other related deployment + descriptors for this module (e.g., web service + descriptors) are complete, or whether the class + files available to this module and packaged with + this application should be examined for annotations + that specify deployment information. + + If metadata-complete is set to "true", the deployment + tool must ignore any annotations that specify deployment + information, which might be present in the class files + of the application. + + If metadata-complete is not specified or is set to + "false", the deployment tool must examine the class + files of the application for annotations, as + specified by the specifications. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="id" + type="xsd:ID"/> + </xsd:complexType> + +</xsd:schema>
diff --git a/web/bundles/org.eclipse.jst.standard.schemas/pom.xml b/web/bundles/org.eclipse.jst.standard.schemas/pom.xml index 6179a24..c5f4d91 100644 --- a/web/bundles/org.eclipse.jst.standard.schemas/pom.xml +++ b/web/bundles/org.eclipse.jst.standard.schemas/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.jst.standard.schemas</artifactId> - <version>1.2.500-SNAPSHOT</version> + <version>1.2.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
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 0a0b976..f364d0f 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.html.core; singleton:=true -Bundle-Version: 1.4.300.qualifier +Bundle-Version: 1.4.301.qualifier Bundle-Activator: org.eclipse.wst.html.core.internal.HTMLCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -39,7 +39,7 @@ org.eclipse.wst.css.core;bundle-version="[1.3.0,1.4.0)", 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)", + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.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
diff --git a/web/bundles/org.eclipse.wst.html.core/pom.xml b/web/bundles/org.eclipse.wst.html.core/pom.xml index be18c49..59bef44 100644 --- a/web/bundles/org.eclipse.wst.html.core/pom.xml +++ b/web/bundles/org.eclipse.wst.html.core/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.html.core</artifactId> - <version>1.4.300-SNAPSHOT</version> + <version>1.4.301-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
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 343d04b..18999b4 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.html.ui; singleton:=true -Bundle-Version: 1.1.800.qualifier +Bundle-Version: 1.1.801.qualifier Bundle-Activator: org.eclipse.wst.html.ui.internal.HTMLUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -44,7 +44,7 @@ org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)", 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)", + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.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
diff --git a/web/bundles/org.eclipse.wst.html.ui/pom.xml b/web/bundles/org.eclipse.wst.html.ui/pom.xml index 1ed1288..53c8612 100644 --- a/web/bundles/org.eclipse.wst.html.ui/pom.xml +++ b/web/bundles/org.eclipse.wst.html.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.html.ui</artifactId> - <version>1.1.800-SNAPSHOT</version> + <version>1.1.801-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs b/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs index 1a8a136..70e465b 100755 --- a/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs +++ b/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs
@@ -107,6 +107,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled 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 @@ -130,7 +131,6 @@ 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 @@ -264,7 +264,6 @@ 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 @@ -339,7 +338,6 @@ 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 @@ -502,7 +500,6 @@ 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
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 75c6df7..0ac206d 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.jsdt.web.ui; singleton:=true -Bundle-Version: 1.2.500.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin @@ -33,9 +33,9 @@ org.eclipse.ui.workbench;bundle-version="[3.111.0,4.0.0)", org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)", org.eclipse.ui;bundle-version="[3.109.0,4.0.0)", - org.eclipse.wst.sse.ui;bundle-version="[1.4.0,2.0.0)", + org.eclipse.wst.sse.ui;bundle-version="[1.7.0,2.0.0)", org.eclipse.wst.xml.ui;bundle-version="[1.2.300,2.0.0)", - org.eclipse.wst.jsdt.web.core;bundle-version="[1.1.0,2.0.0)", + org.eclipse.wst.jsdt.web.core;bundle-version="[1.1.300,2.0.0)", org.eclipse.wst.css.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.wst.xml.core;bundle-version="[1.2.0,2.0.0)", org.eclipse.wst.sse.core;bundle-version="[1.2.500,2.0.0)", @@ -44,10 +44,10 @@ org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.search;bundle-version="[3.11.0,4.0.0)", org.eclipse.ltk.core.refactoring;bundle-version="[3.8.0,4.0.0)", - org.eclipse.wst.common.uriresolver;bundle-version="[1.2.300,2.0.0)", - org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)", + org.eclipse.wst.common.uriresolver;bundle-version="[1.4.0,2.0.0)", + org.eclipse.ui.ide;bundle-version="[3.21.0,4.0.0)", org.eclipse.wst.jsdt.core;bundle-version="[2.0.300,3.0.0)", - org.eclipse.wst.jsdt.ui;bundle-version="[2.0.300,3.0.0)", + org.eclipse.wst.jsdt.ui;bundle-version="[2.1.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="73.1.0",
diff --git a/web/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml b/web/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml index 4c2359e..22a37bf 100644 --- a/web/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml +++ b/web/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml
@@ -21,7 +21,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.jsdt.web.ui</artifactId> - <version>1.2.500-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <!-- added this "constraint" for bug 458962 -->
diff --git a/web/bundles/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF index ea8b759..92c0aa5 100644 --- a/web/bundles/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF +++ b/web/bundles/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.wst.web.ui Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.web.ui; singleton:=true -Bundle-Version: 1.2.400.qualifier +Bundle-Version: 1.2.401.qualifier Bundle-Activator: org.eclipse.wst.web.ui.internal.WSTWebUIPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 @@ -21,7 +21,7 @@ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.4.600,2.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.300,2.0.0)", org.eclipse.wst.server.ui;bundle-version="[1.5.400,2.0.0)", - org.eclipse.wst.common.environment;bundle-version="[1.0.400,1.1.0)", + org.eclipse.wst.common.environment;bundle-version="[1.1.0,2.0.0)", org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)", org.eclipse.search;bundle-version="[3.11.0,4.0.0)", org.eclipse.ui.console;bundle-version="[3.7.0,4.0.0)",
diff --git a/web/bundles/org.eclipse.wst.web.ui/pom.xml b/web/bundles/org.eclipse.wst.web.ui/pom.xml index c371dcf..99abda1 100644 --- a/web/bundles/org.eclipse.wst.web.ui/pom.xml +++ b/web/bundles/org.eclipse.wst.web.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.wst.web.ui</artifactId> - <version>1.2.400-SNAPSHOT</version> + <version>1.2.401-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/web/bundles/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java b/web/bundles/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java index b49090e..3e5909e 100644 --- a/web/bundles/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java +++ b/web/bundles/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java
@@ -33,10 +33,12 @@ protected static final String TOP_RIGHT_LOCATION = "topRight"; //$NON-NLS-1$ protected static final String BOTTOM_LOCATION = "bottom"; //$NON-NLS-1$ - // view id's - protected static final String ID_SERVER = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$ - protected static String ID_WST_SNIPPETS_VIEW = "org.eclipse.wst.common.snippets.internal.ui.SnippetsView"; //$NON-NLS-1$ + // view ids + private static final String ID_SERVER = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$ + private static String ID_WST_SNIPPETS_VIEW = "org.eclipse.wst.common.snippets.internal.ui.SnippetsView"; //$NON-NLS-1$ private static final String ID_TERMINAL_VIEW = "org.eclipse.tm.terminal.view.ui.TerminalsView"; //$NON-NLS-1$ + private static final String ID_SEARCH_VIEW = "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$ + private static final String ID_CONSOLE_VIEW= "org.eclipse.ui.console.ConsoleView"; //$NON-NLS-1$ String fExplorerViewID = IPageLayout.ID_PROJECT_EXPLORER; public WebDevelopmentPerspective() { @@ -81,8 +83,10 @@ // LEFT Area (Project Explorer) IFolderLayout topLeft = layout.createFolder(TOP_LEFT_LOCATION, - IPageLayout.LEFT, 0.25f, editorArea); + IPageLayout.LEFT, 0.2f, editorArea); topLeft.addView(fExplorerViewID); + topLeft.addPlaceholder(NewSearchUI.SEARCH_VIEW_ID); + topLeft.addPlaceholder("org.eclipse.jdt.ui.PackagesView"); //$NON-NLS-1$ // TOP RIGHT Area (Outline) IFolderLayout topRight = layout.createFolder(TOP_RIGHT_LOCATION, @@ -92,21 +96,32 @@ // BOTTOM Area (Problems, Server, Properties) IFolderLayout bottom = layout.createFolder(BOTTOM_LOCATION, - IPageLayout.BOTTOM, 0.70f, editorArea); + IPageLayout.BOTTOM, 0.80f, editorArea); bottom.addView(IPageLayout.ID_PROBLEM_VIEW); - bottom.addView(ID_SERVER); + addViewIfPresent(bottom, ID_SERVER); + addViewIfPresent(bottom, ID_TERMINAL_VIEW); bottom.addView(IPageLayout.ID_PROP_SHEET); - bottom.addView(ID_WST_SNIPPETS_VIEW); - bottom.addPlaceholder(NewSearchUI.SEARCH_VIEW_ID); + bottom.addPlaceholder(ID_WST_SNIPPETS_VIEW); bottom.addPlaceholder(IConsoleConstants.ID_CONSOLE_VIEW); bottom.addPlaceholder(IPageLayout.ID_BOOKMARKS); bottom.addPlaceholder(IPageLayout.ID_TASK_LIST); String allMarkersViewId = "org.eclipse.ui.views.AllMarkersView"; //$NON-NLS-1$ - if (PlatformUI.getWorkbench().getViewRegistry().find(allMarkersViewId) != null) { - bottom.addPlaceholder(allMarkersViewId); - } + bottom.addPlaceholder(allMarkersViewId); bottom.addPlaceholder(IProgressConstants.PROGRESS_VIEW_ID); - addViewIfPresent(bottom, ID_TERMINAL_VIEW); - } + + layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET); + layout.addShowViewShortcut(IPageLayout.ID_BOOKMARKS); + layout.addShowViewShortcut(IPageLayout.ID_OUTLINE); + layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET); + layout.addShowViewShortcut(IPageLayout.ID_PROJECT_EXPLORER); + layout.addShowViewShortcut(ID_WST_SNIPPETS_VIEW); + layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW); + layout.addShowViewShortcut(ID_TERMINAL_VIEW); + + // views - search + layout.addShowViewShortcut(ID_SEARCH_VIEW); + // views - debugging + layout.addShowViewShortcut(ID_CONSOLE_VIEW); + } }
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 5a4d64a..aca0023 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.30.0.qualifier" + version="3.31.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 bea9226..8118af4 100644 --- a/web/features/org.eclipse.wst.web_core.feature/pom.xml +++ b/web/features/org.eclipse.wst.web_core.feature/pom.xml
@@ -21,21 +21,21 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.web_core.feature</artifactId> - <version>3.30.0-SNAPSHOT</version> + <version>3.31.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras.version}</version> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho.version}</version> <executions> <execution> - <id>source-feature</id> + <id>feature-source</id> <phase>package</phase> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> </execution> </executions>
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/pom.xml b/web/features/org.eclipse.wst.web_js_support.feature/pom.xml index dc9f75b..4fb1e64 100644 --- a/web/features/org.eclipse.wst.web_js_support.feature/pom.xml +++ b/web/features/org.eclipse.wst.web_js_support.feature/pom.xml
@@ -27,15 +27,15 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras.version}</version> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho.version}</version> <executions> <execution> - <id>source-feature</id> + <id>feature-source</id> <phase>package</phase> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> <configuration> <excludes>
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 55590f5..af91a14 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.30.0.qualifier" + version="3.31.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 374d880..1aeeea4 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.30.0-SNAPSHOT</version> + <version>3.31.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/web/features/org.eclipse.wst.web_tests.feature/feature.xml b/web/features/org.eclipse.wst.web_tests.feature/feature.xml index 2eaf5a8..dc7452f 100644 --- a/web/features/org.eclipse.wst.web_tests.feature/feature.xml +++ b/web/features/org.eclipse.wst.web_tests.feature/feature.xml
@@ -14,7 +14,7 @@ <feature id="org.eclipse.wst.web_tests.feature" label="%featureName" - version="3.30.0.qualifier" + version="3.31.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_tests.feature/pom.xml b/web/features/org.eclipse.wst.web_tests.feature/pom.xml index 7127449..1c8a8a9 100644 --- a/web/features/org.eclipse.wst.web_tests.feature/pom.xml +++ b/web/features/org.eclipse.wst.web_tests.feature/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.web_tests.feature</artifactId> - <version>3.30.0-SNAPSHOT</version> + <version>3.31.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 7f4a922..3defa30 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.30.0.qualifier" + version="3.31.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 fcfd2bd..a94bc08 100644 --- a/web/features/org.eclipse.wst.web_ui.feature/pom.xml +++ b/web/features/org.eclipse.wst.web_ui.feature/pom.xml
@@ -21,21 +21,21 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.web_ui.feature</artifactId> - <version>3.30.0-SNAPSHOT</version> + <version>3.31.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras.version}</version> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho.version}</version> <executions> <execution> - <id>source-feature</id> + <id>feature-source</id> <phase>package</phase> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> <configuration> <excludes>
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 f854122..f89068b 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.500.qualifier +Bundle-Version: 1.2.501.qualifier Bundle-Activator: org.eclipse.wst.dtd.core.internal.DTDCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -35,7 +35,7 @@ org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,2.0.0)", 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)", + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.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/pom.xml b/xml/bundles/org.eclipse.wst.dtd.core/pom.xml index c5d12e3..d516c52 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.500-SNAPSHOT</version> + <version>1.2.501-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build>
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 1871369..a8cb7d8 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.xml.core; singleton:=true -Bundle-Version: 1.2.700.qualifier +Bundle-Version: 1.2.800.qualifier Bundle-Activator: org.eclipse.wst.xml.core.internal.XMLCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -315,10 +315,10 @@ org.eclipse.wst.common.uriresolver;bundle-version="[1.2.300,2.0.0)", org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)", org.eclipse.jem.util;bundle-version="[2.1.200,3.0.0)";resolution:=optional, - org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)";resolution:=optional, + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.0)";resolution:=optional, org.eclipse.wst.common.emf;bundle-version="[1.2.500,1.3.0)";resolution:=optional, 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.emfworkbench.integration;bundle-version="[1.3.0,2.0.0)";resolution:=optional, org.eclipse.wst.common.core;bundle-version="[1.2.0,2.0.0)", com.ibm.icu;bundle-version="73.1.0", org.eclipse.osgi.services;bundle-version="[3.7.0,4.0.0)"
diff --git a/xml/bundles/org.eclipse.wst.xml.core/pom.xml b/xml/bundles/org.eclipse.wst.xml.core/pom.xml index c5d6e2a..b710c90 100644 --- a/xml/bundles/org.eclipse.wst.xml.core/pom.xml +++ b/xml/bundles/org.eclipse.wst.xml.core/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xml.core</artifactId> - <version>1.2.700-SNAPSHOT</version> + <version>1.2.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
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 bf1360e..fb360b5 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.xml.ui; singleton:=true -Bundle-Version: 1.2.700.qualifier +Bundle-Version: 1.2.701.qualifier Bundle-Activator: org.eclipse.wst.xml.ui.internal.XMLUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -60,8 +60,8 @@ org.eclipse.wst.common.uriresolver;bundle-version="[1.2.300,2.0.0)", org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)", org.eclipse.wst.common.ui;bundle-version="[1.1.500,2.0.0)", - org.eclipse.wst.validation;bundle-version="[1.2.800,1.3.0)", - org.eclipse.wst.validation.ui;bundle-version="[1.2.600,1.3.0)", + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.0)", + org.eclipse.wst.validation.ui;bundle-version="[1.3.0,2.0.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="73.1.0"
diff --git a/xml/bundles/org.eclipse.wst.xml.ui/pom.xml b/xml/bundles/org.eclipse.wst.xml.ui/pom.xml index 8ca8cb5..9625d57 100755 --- a/xml/bundles/org.eclipse.wst.xml.ui/pom.xml +++ b/xml/bundles/org.eclipse.wst.xml.ui/pom.xml
@@ -21,7 +21,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xml.ui</artifactId> - <version>1.2.700-SNAPSHOT</version> + <version>1.2.701-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build>
diff --git a/xml/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF index be4c8ae..9a0522d 100644 --- a/xml/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF +++ b/xml/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %_UI_PLUGIN_NAME Bundle-SymbolicName: org.eclipse.wst.xsd.core; singleton:=true -Bundle-Version: 1.2.100.qualifier +Bundle-Version: 1.2.101.qualifier Bundle-Activator: org.eclipse.wst.xsd.core.internal.XSDCorePlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin @@ -16,7 +16,7 @@ org.eclipse.wst.common.uriresolver;bundle-version="[1.2.300,2.0.0)", org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)", org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)", - org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)", + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/xml/bundles/org.eclipse.wst.xsd.core/pom.xml b/xml/bundles/org.eclipse.wst.xsd.core/pom.xml index 931eeaf..d3e0450 100644 --- a/xml/bundles/org.eclipse.wst.xsd.core/pom.xml +++ b/xml/bundles/org.eclipse.wst.xsd.core/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xsd.core</artifactId> - <version>1.2.100-SNAPSHOT</version> + <version>1.2.101-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
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 3e2dbed..4cb5148 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
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %_UI_PLUGIN_NAME Bundle-SymbolicName: org.eclipse.wst.xsd.ui; singleton:=true -Bundle-Version: 1.3.600.qualifier +Bundle-Version: 1.3.601.qualifier Bundle-Activator: org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin @@ -75,7 +75,7 @@ org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.xsd.edit;bundle-version="[2.2.0,3.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)", - org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)", + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.0)", org.eclipse.ltk.core.refactoring;bundle-version="[3.8.0,4.0.0)", 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)",
diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/pom.xml b/xml/bundles/org.eclipse.wst.xsd.ui/pom.xml index df303ed..21e05a9 100644 --- a/xml/bundles/org.eclipse.wst.xsd.ui/pom.xml +++ b/xml/bundles/org.eclipse.wst.xsd.ui/pom.xml
@@ -21,7 +21,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xsd.ui</artifactId> - <version>1.3.600-SNAPSHOT</version> + <version>1.3.601-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <!-- added this "constraint" for bug 458962 -->
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 2538a96..9590205 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.30.0.qualifier" + version="3.31.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 dda8591..7d17f56 100644 --- a/xml/features/org.eclipse.wst.xml_core.feature/pom.xml +++ b/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
@@ -21,21 +21,21 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xml_core.feature</artifactId> - <version>3.30.0-SNAPSHOT</version> + <version>3.31.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras.version}</version> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho.version}</version> <executions> <execution> - <id>source-feature</id> + <id>feature-source</id> <phase>package</phase> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> <configuration> <excludes>
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 9b72b6b..8db762d 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.30.0.qualifier" + version="3.31.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 6d988ff..f080de2 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.30.0-SNAPSHOT</version> + <version>3.31.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml b/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml index d287ba7..9583467 100644 --- a/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml +++ b/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml
@@ -14,7 +14,7 @@ <feature id="org.eclipse.wst.xml_tests.feature" label="%featureName" - version="3.30.0.qualifier" + version="3.31.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_tests.feature/pom.xml b/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml index e5f2943..1fab690 100644 --- a/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml +++ b/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xml_tests.feature</artifactId> - <version>3.30.0-SNAPSHOT</version> + <version>3.31.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 24934c3..a92c5d1 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.30.0.qualifier" + version="3.31.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 baf0a04..fd293a8 100644 --- a/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml +++ b/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
@@ -21,21 +21,21 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xml_ui.feature</artifactId> - <version>3.30.0-SNAPSHOT</version> + <version>3.31.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras.version}</version> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho.version}</version> <executions> <execution> - <id>source-feature</id> + <id>feature-source</id> <phase>package</phase> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> <configuration> <excludes>
diff --git a/xsl/features/org.eclipse.wst.xsl.feature/pom.xml b/xsl/features/org.eclipse.wst.xsl.feature/pom.xml index 86a51d5..486d6a6 100644 --- a/xsl/features/org.eclipse.wst.xsl.feature/pom.xml +++ b/xsl/features/org.eclipse.wst.xsl.feature/pom.xml
@@ -29,15 +29,15 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras.version}</version> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho.version}</version> <executions> <execution> - <id>source-feature</id> + <id>feature-source</id> <phase>package</phase> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> <configuration> <excludes>
diff --git a/xsl/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF b/xsl/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF index f673f96..25a0095 100644 --- a/xsl/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF +++ b/xsl/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.xsl.ui.tests;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.2.1.qualifier Bundle-Activator: org.eclipse.wst.xsl.ui.tests.Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.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)", - org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)", + org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.0)", org.eclipse.wst.xsl.ui;bundle-version="[1.2.0,2.0.0)", org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)", org.eclipse.wst.xml.core;bundle-version="[1.2.0,2.0.0)",
diff --git a/xsl/tests/org.eclipse.wst.xsl.ui.tests/pom.xml b/xsl/tests/org.eclipse.wst.xsl.ui.tests/pom.xml index 96984da..2490695 100644 --- a/xsl/tests/org.eclipse.wst.xsl.ui.tests/pom.xml +++ b/xsl/tests/org.eclipse.wst.xsl.ui.tests/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xsl.ui.tests</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>XSLT UI Tests</name>