[releng] Move to Tycho 2.5
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d1a7dda..f58ddf6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,7 +44,7 @@
[Eclipse Tycho](https://www.eclipse.org/tycho/) and is easy to run
on a local machine:
- 1. Make sure you have JDK 11 and Maven 3.5 or above installed.
+ 1. Make sure you have JDK 11 and Maven 3.8.2 or above installed.
Both should be on the path.
2. Make sure you have a local clone of the Handly Git repository.
diff --git a/org.eclipse.handly-feature/pom.xml b/org.eclipse.handly-feature/pom.xml
index 2bc68e8..80325ef 100644
--- a/org.eclipse.handly-feature/pom.xml
+++ b/org.eclipse.handly-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2020 1C-Soft LLC and others.
+ Copyright (c) 2014, 2021 1C-Soft LLC and others.
This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which is available at
@@ -27,22 +27,11 @@
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<executions>
<execution>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/org.eclipse.handly.examples-feature/pom.xml b/org.eclipse.handly.examples-feature/pom.xml
index 7e94e1c..491c64d 100644
--- a/org.eclipse.handly.examples-feature/pom.xml
+++ b/org.eclipse.handly.examples-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2020 1C-Soft LLC and others.
+ Copyright (c) 2014, 2021 1C-Soft LLC and others.
This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which is available at
@@ -27,22 +27,11 @@
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<executions>
<execution>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/org.eclipse.handly.tests-feature/pom.xml b/org.eclipse.handly.tests-feature/pom.xml
index e84e3ca..8f934a8 100644
--- a/org.eclipse.handly.tests-feature/pom.xml
+++ b/org.eclipse.handly.tests-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2020 1C-Soft LLC and others.
+ Copyright (c) 2014, 2021 1C-Soft LLC and others.
This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which is available at
@@ -27,22 +27,11 @@
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<executions>
<execution>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/org.eclipse.handly.xtext-feature/pom.xml b/org.eclipse.handly.xtext-feature/pom.xml
index 5b4e9d7..fac53b0 100644
--- a/org.eclipse.handly.xtext-feature/pom.xml
+++ b/org.eclipse.handly.xtext-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2020 1C-Soft LLC and others.
+ Copyright (c) 2014, 2021 1C-Soft LLC and others.
This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which is available at
@@ -27,22 +27,11 @@
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<executions>
<execution>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
diff --git a/releng/pom.xml b/releng/pom.xml
index 27deebe..8fa486d 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -20,11 +20,11 @@
<version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>
- <maven>3.5.0</maven>
+ <maven>3.8.2</maven>
</prerequisites>
<properties>
- <tycho.version>1.6.0</tycho.version>
- <tycho.extras.version>1.6.0</tycho.extras.version>
+ <tycho.version>2.5.0</tycho.version>
+ <tycho.extras.version>2.5.0</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
@@ -89,10 +89,21 @@
</configuration>
<executions>
<execution>
+ <id>plugin-source</id>
<goals>
<goal>plugin-source</goal>
</goals>
</execution>
+ <execution>
+ <id>feature-source</id>
+ <goals>
+ <goal>feature-source</goal>
+ </goals>
+ <configuration>
+ <includeBinaryFeature>false</includeBinaryFeature>
+ <reuseBrandingPlugin>false</reuseBrandingPlugin>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -160,18 +171,6 @@
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho.extras.version}</version>
- <configuration>
- <includeBinaryFeature>false</includeBinaryFeature>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- <reuseBrandingPlugin>false</reuseBrandingPlugin>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho.extras.version}</version>
</plugin>
