Build with Tycho 2.2.0
And move to new feature-source mojo.
Change-Id: I8de19d9a8d51efc0f480d27cbdf0c28b309e9a59
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/linuxtools/org.eclipse.linuxtools/+/175035
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
index 8a6746e..7b959ff 100644
--- a/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
index f91cb14..0fddb6a 100644
--- a/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
index e961b85..0e5f702 100644
--- a/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/containers/org.eclipse.linuxtools.docker-feature/pom.xml b/containers/org.eclipse.linuxtools.docker-feature/pom.xml
index 3a998a3..b44369f 100644
--- a/containers/org.eclipse.linuxtools.docker-feature/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker-feature/pom.xml
@@ -25,14 +25,14 @@
<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>
<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>
@@ -43,7 +43,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls-feature/pom.xml b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/pom.xml
index a1e8b60..969c186 100644
--- a/containers/org.eclipse.linuxtools.docker.editor.ls-feature/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/pom.xml
@@ -25,14 +25,14 @@
<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>
<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>
@@ -43,7 +43,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml b/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
index 428c16a..e45bd2a 100644
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -44,7 +44,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml
index 009b0cf..b7e54fd 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -44,7 +44,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml b/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
index 3aa926e..35bd940 100644
--- a/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml b/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
index cee5c5a..e6d3402 100644
--- a/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml
index 6cfe6f8..9bd39fd 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml
@@ -26,19 +26,19 @@
<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>
<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>
<plugin id="org.eclipse.linuxtools.cdt.libhover.library.docs"/>
- <plugin id="org.eclipse.linuxtools.cdt.libhover.glibc"/>
+ <plugin id="org.eclipse.linuxtools.cdt.libhover.glibc"/>
</excludes>
</configuration>
</execution>
@@ -50,7 +50,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib-feature/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib-feature/pom.xml
index daa0e0d..4d9b70f 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib-feature/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/perf/org.eclipse.linuxtools.perf-feature/pom.xml b/perf/org.eclipse.linuxtools.perf-feature/pom.xml
index 7e1cc43..ed157af 100644
--- a/perf/org.eclipse.linuxtools.perf-feature/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml b/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml
index facbe3a..461106c 100644
--- a/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/pom.xml b/pom.xml
index c1fa8bf..6be5523 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<mirror-repo-name>updates-nightly</mirror-repo-name>
<mirror-docker-repo-name>updates-docker-nightly</mirror-docker-repo-name>
<mirror-mylyn-repo-name>updates-mylyn-nightly</mirror-mylyn-repo-name>
- <tycho-version>2.1.0</tycho-version>
+ <tycho-version>2.2.0</tycho-version>
<target-platform>linuxtools-e4.18</target-platform>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -329,33 +329,26 @@
</configuration>
</plugin>
<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>
<configuration>
<includeBinaryFeature>false</includeBinaryFeature>
</configuration>
<executions>
<execution>
- <id>source-feature</id>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
<id>plugin-source</id>
<goals>
<goal>plugin-source</goal>
</goals>
</execution>
+ <execution>
+ <id>feature-source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>feature-source</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml
index 4d5e1f7..b3d2ae0 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml
@@ -27,11 +27,24 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>feature-source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>feature-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml b/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml
index 042703e..6a16c2f 100644
--- a/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml b/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
index 680977e..f7cd041 100644
--- a/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
index 287c630..980e81b 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
@@ -25,14 +25,14 @@
<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>
<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>
@@ -48,7 +48,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml
index 1fe8112..b417216 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml
@@ -25,14 +25,14 @@
<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>
<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>
@@ -48,7 +48,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant-feature/pom.xml b/vagrant/org.eclipse.linuxtools.vagrant-feature/pom.xml
index 00f269a..cfa2e0d 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant-feature/pom.xml
+++ b/vagrant/org.eclipse.linuxtools.vagrant-feature/pom.xml
@@ -25,14 +25,14 @@
<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>
<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>
@@ -43,7 +43,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
index 728104c..c1ea029 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
index 31c1e15..94ec597 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
@@ -26,14 +26,14 @@
<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>
<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>
@@ -49,7 +49,7 @@
<version>${tycho-version}</version>
<executions>
<execution>
- <id>attached-p2-metadata</id>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
