Prepare for Tycho 5 development

eclipse-tycho · Jun 23, 2023 · f61faab · f61faab
1 parent 6ee26e7
commit f61faab
Show file tree

Hide file tree

Showing 71 changed files with 98 additions and 78 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -14,7 +14,7 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  target-branch: "tycho-3.0.x"
+  target-branch: "tycho-4.0.x"
   labels:
     - "backport"
     - "dependencies"
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       github.event.pull_request.merged == true
-      && contains(github.event.pull_request.labels.*.name, 'backport-to-tycho-3.0.x')
+      && contains(github.event.pull_request.labels.*.name, 'backport-to-tycho-4.0.x')
       && (
-        (github.event.action == 'labeled' && github.event.label.name == 'backport-to-tycho-3.0.x')
+        (github.event.action == 'labeled' && github.event.label.name == 'backport-to-tycho-4.0.x')
         || (github.event.action == 'closed')
       )
     permissions:

diff --git a/.github/workflows/verify-platform.yml b/.github/workflows/verify-platform.yml
@@ -69,5 +69,5 @@ jobs:
         -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
         -DskipTests
         -Pbree-libs
-        -Dtycho.version=4.0.0-SNAPSHOT
+        -Dtycho.version=5.0.0-SNAPSHOT
         clean verify
diff --git a/.github/workflows/verify-platform2.yml b/.github/workflows/verify-platform2.yml
@@ -69,6 +69,6 @@ jobs:
         -Pbuild-individual-bundles
         -Pbree-libs
         -Dmaven.test.failure.ignore=true
-        -Dtycho.version=4.0.0-SNAPSHOT
+        -Dtycho.version=5.0.0-SNAPSHOT
         -T1C
         clean verify
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -2,7 +2,10 @@
 
 This page describes the noteworthy improvements provided by each release of Eclipse Tycho.
 
-## 4.0.0 (under development)
+## 5.0.0 (under development)
+
+
+## 4.0.0
 
 ### creating maven p2 sites with Tycho packaging
 
@@ -505,6 +508,23 @@ Old behavior can be restored through configuration of the tycho-surefire-plugin:
 </plugin>
 ```
 
+## 3.0.5
+
+### Backports
+
+- inject source folders into maven model
+- improve CI friendly versions
+- Report download speed to the caller
+- redirectTestOutputToFile for OsgiSurefireBooter
+
+## 3.0.4
+
+### Backports
+
+- Include smartbuilder (but disabled by default), can be enabled with `-Dtycho.build.smartbuilder=true`
+- tycho-bnd-plugin support
+- Version Mojo Bugfixes
+
 ## 3.0.3
 
 ### Dependency upgrades and Maven 3.9.0 support

diff --git a/p2-maven-plugin/pom.xml b/p2-maven-plugin/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>p2-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>

diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
 	</developers>
 	<groupId>org.eclipse.tycho</groupId>
 	<artifactId>tycho</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Tycho</name>
 	<description>Tycho integrates Maven with Eclipse and OSGi</description>

diff --git a/sisu-osgi/pom.xml b/sisu-osgi/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sisu-osgi</artifactId>

diff --git a/sisu-osgi/sisu-equinox-embedder/pom.xml b/sisu-osgi/sisu-equinox-embedder/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-osgi</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sisu-equinox-embedder</artifactId>
 

diff --git a/sisu-osgi/sisu-equinox-launching/pom.xml b/sisu-osgi/sisu-equinox-launching/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-osgi</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sisu-equinox-launching</artifactId>
 

diff --git a/sisu-osgi/sisu-osgi-api/pom.xml b/sisu-osgi/sisu-osgi-api/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-osgi</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sisu-osgi-api</artifactId>
 

diff --git a/sisu-osgi/sisu-osgi-connect/pom.xml b/sisu-osgi/sisu-osgi-connect/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>sisu-osgi</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>sisu-osgi-connect</artifactId>
   <name>Sisu Implementation of the OSGi R8 Framework Connect Specification</name>

diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>tycho</artifactId>
 		<groupId>org.eclipse.tycho</groupId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>target-platform-configuration</artifactId>

diff --git a/tycho-api/pom.xml b/tycho-api/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>tycho-api</artifactId>

diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-apitools-plugin</artifactId>
 	<name>Plugin for performing API analysis tasks</name>

diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-artifactcomparator</artifactId>
 	<properties>

diff --git a/tycho-baseline-plugin/pom.xml b/tycho-baseline-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-baseline-plugin</artifactId>
 	<packaging>maven-plugin</packaging>

diff --git a/tycho-bnd-plugin/pom.xml b/tycho-bnd-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-bnd-plugin</artifactId>
 	<name>Tycho BND Plugin</name>

diff --git a/tycho-build/pom.xml b/tycho-build/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-build</artifactId>
 

diff --git a/tycho-buildtimestamp-jgit/pom.xml b/tycho-buildtimestamp-jgit/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-buildtimestamp-jgit</artifactId>
 

diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-compiler-jdt</artifactId>
 

diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>tycho-compiler-plugin</artifactId>

diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-core</artifactId>
 

diff --git a/tycho-ds-plugin/pom.xml b/tycho-ds-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-ds-plugin</artifactId>
 	<packaging>maven-plugin</packaging>

diff --git a/tycho-extras/pom.xml b/tycho-extras/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.eclipse.tycho.extras</groupId>

diff --git a/tycho-extras/target-platform-validation-plugin/pom.xml b/tycho-extras/target-platform-validation-plugin/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>target-platform-validation-plugin</artifactId>

diff --git a/tycho-extras/tycho-custom-bundle-plugin/pom.xml b/tycho-extras/tycho-custom-bundle-plugin/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-extras</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tycho-custom-bundle-plugin</artifactId>

diff --git a/tycho-extras/tycho-dependency-tools-plugin/pom.xml b/tycho-extras/tycho-dependency-tools-plugin/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>tycho-dependency-tools-plugin</artifactId>

diff --git a/tycho-extras/tycho-document-bundle-plugin/pom.xml b/tycho-extras/tycho-document-bundle-plugin/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-document-bundle-plugin</artifactId>
 	<packaging>maven-plugin</packaging>

diff --git a/tycho-extras/tycho-eclipserun-plugin/pom.xml b/tycho-extras/tycho-eclipserun-plugin/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tycho-extras</artifactId>
     <groupId>org.eclipse.tycho.extras</groupId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tycho-eclipserun-plugin</artifactId>

diff --git a/tycho-extras/tycho-extras-its/pom.xml b/tycho-extras/tycho-extras-its/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>tycho-extras-its</artifactId>

diff --git a/tycho-extras/tycho-p2-extras-plugin/pom.xml b/tycho-extras/tycho-p2-extras-plugin/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>tycho-p2-extras-plugin</artifactId>

diff --git a/tycho-extras/tycho-pomless/pom.xml b/tycho-extras/tycho-pomless/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-pomless</artifactId>
 	<name>Tycho POM-less build extension</name>

diff --git a/tycho-extras/tycho-sourceref-jgit/pom.xml b/tycho-extras/tycho-sourceref-jgit/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-sourceref-jgit</artifactId>
 

diff --git a/tycho-extras/tycho-version-bump-plugin/pom.xml b/tycho-extras/tycho-version-bump-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>tycho-version-bump-plugin</artifactId>

diff --git a/tycho-gpg-plugin/pom.xml b/tycho-gpg-plugin/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>tycho-gpg-plugin</artifactId>

diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tycho-its</artifactId>
 

diff --git a/tycho-its/projects/p2Repository.includeAllSources.oldOrbit/pom.xml b/tycho-its/projects/p2Repository.includeAllSources.oldOrbit/pom.xml
@@ -7,20 +7,20 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<properties>
-		<tycho.version>4.0.0-SNAPSHOT</tycho.version>
+		<tycho-version>4.0.0-SNAPSHOT</tycho-version>
 	</properties>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho.version}</version>
+				<version>${tycho-version}</version>
 				<extensions>true</extensions>
 			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho.version}</version>
+				<version>${tycho-version}</version>
 				<configuration>
 					<target>
 						<file>jdom-from-old-orbit.target</file>
@@ -30,7 +30,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho.version}</version>
+				<version>${tycho-version}</version>
 				<configuration>
 					<compress>false</compress>
 					<includeAllDependencies>true</includeAllDependencies>