[nobug] Update from tycho-source-feature-plugin to tycho-source-plugin Change-Id: I0eb03f37e8fc6ca20781cf1829fe18bdb085b6b9
diff --git a/features/org.eclipse.wst.server_adapters.feature/feature.xml b/features/org.eclipse.wst.server_adapters.feature/feature.xml index f349f4a..ff6987f 100644 --- a/features/org.eclipse.wst.server_adapters.feature/feature.xml +++ b/features/org.eclipse.wst.server_adapters.feature/feature.xml
@@ -53,20 +53,6 @@ unpack="false"/> <plugin - id="org.eclipse.jetty.jndi" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jetty.plus" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.jetty.xml" download-size="0" install-size="0"
diff --git a/features/org.eclipse.wst.server_adapters.feature/pom.xml b/features/org.eclipse.wst.server_adapters.feature/pom.xml index a290e20..a094d18 100644 --- a/features/org.eclipse.wst.server_adapters.feature/pom.xml +++ b/features/org.eclipse.wst.server_adapters.feature/pom.xml
@@ -28,14 +28,15 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho.version}</version> <executions> <execution> <phase>package</phase> <id>source-feature</id> <goals> - <goal>source-feature</goal> + <goal>feature-source</goal> </goals> </execution> </executions>
diff --git a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF index e105ea5..e2377ab 100644 --- a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.server.preview; singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.2.100.qualifier Bundle-Activator: org.eclipse.wst.server.preview.internal.PreviewServerPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.server.preview/pom.xml b/plugins/org.eclipse.wst.server.preview/pom.xml index 69bd86c..f09d077 100644 --- a/plugins/org.eclipse.wst.server.preview/pom.xml +++ b/plugins/org.eclipse.wst.server.preview/pom.xml
@@ -23,6 +23,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server.preview</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/PreviewStarter.java b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/PreviewStarter.java index 81e50d3..7e9eca8 100644 --- a/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/PreviewStarter.java +++ b/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/PreviewStarter.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2021 IBM Corporation and others. + * Copyright (c) 2007, 2022 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 @@ -41,8 +41,9 @@ int size = m.length; if (size > 0) { System.out.println("Modules:"); - for (Module mm : m) + for (Module mm : m) { System.out.println(" " + mm.getName() + " (" + mm.getContext() + ")"); + } System.out.println(); }