[nobug] Fix compile errors in non-shipping org.eclipse.jst.server.pde bundle Change-Id: I1212e2708735260c962deec28129a6f09982aa0c
diff --git a/plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF index 250cf79..5eab31f 100644 --- a/plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF
@@ -1,13 +1,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 +Automatic-Module-Name: org.eclipse.jst.server.generic.pde +Bundle-ActivationPolicy: lazy Bundle-Name: %Generic server PDE Template Bundle-SymbolicName: org.eclipse.jst.server.generic.pde; singleton:=true -Bundle-Version: 1.0.101.qualifier +Bundle-Version: 1.0.102.qualifier Bundle-Activator: org.eclipse.jst.server.generic.pde.ServerPdePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.pde.ui, + org.eclipse.core.runtime;bundle-version="3.28.0", + org.eclipse.core.resources, + org.eclipse.pde.ui;bundle-version="[3.14,4.0)", org.eclipse.pde.core Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.server.pde/pom.xml b/plugins/org.eclipse.jst.server.pde/pom.xml index 9628da7..5197b7e 100644 --- a/plugins/org.eclipse.jst.server.pde/pom.xml +++ b/plugins/org.eclipse.jst.server.pde/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.generic.pde</artifactId> - <version>1.0.101-SNAPSHOT</version> + <version>1.0.102-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java index e50c3f5..acaa523 100644 --- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java +++ b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
@@ -1,14 +1,15 @@ -/*************************************************************************************************** - * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. 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 +/******************************************************************************** + * Copyright (c) 2005, 2023 Eteration A.S., Gorkem Ercan, 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 * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 * * Contributors: Gorkem Ercan - initial API and implementation * - **************************************************************************************************/ + *******************************************************************************/ package org.eclipse.jst.server.generic.pde.internal; import java.net.URL; @@ -24,7 +25,7 @@ import org.eclipse.pde.core.plugin.IPluginExtension; import org.eclipse.pde.core.plugin.IPluginModelFactory; import org.eclipse.pde.core.plugin.IPluginReference; -import org.eclipse.pde.internal.ui.wizards.templates.PluginReference; +import org.eclipse.pde.ui.templates.PluginReference; import org.eclipse.pde.ui.templates.OptionTemplateSection; import org.eclipse.pde.ui.templates.TemplateOption; /**