Resolve target platform variables during p2 assembly (#3040)

CONTRIBUTING.md

@@ -31,7 +31,7 @@ and the minimal reproducer project to Tycho's [issue tracker](https://github.com
 
 ### Prerequisites
 
-Java 11 and Maven 3.6.3, or newer.
+Java 17 and Maven 3.9.0, or newer.
 
 If your Internet connection uses a proxy, make sure that you have the proxy configured in your [Maven settings.xml](https://maven.apache.org/settings.html).
 

Jenkinsfile

@@ -1,4 +1,4 @@
-def deployBranch = 'master'
+def deployBranch = 'tycho-4.0.x'
 def agentLabel
 if(env.BRANCH_NAME == deployBranch) {
 	//branches that are deployable must run on eclipse infra

RELEASE_NOTES.md

@@ -2,7 +2,64 @@
 
 This page describes the noteworthy improvements provided by each release of Eclipse Tycho.
 
-## 4.0.0 (under development)
+## 4.0.5
+
+### backports:
+- support for PDE Api Tools Annotations
+- api tools fixes
+
+## 4.0.4
+
+Various bugfixes and backports
+
+## 4.0.3
+
+### new option to filter added repository-references when assembling a p2-repository
+
+If filtering provided artifacts is enabled, the repository references automatically added to a assembled p2-repository
+(via `tycho-p2-repository-plugin`'s `addIUTargetRepositoryReferences` or `addPomRepositoryReferences`) can now be filtered by their location
+using exclusion and inclusion patterns and therefore allows more fine-grained control which references are added.
+Additionally the automatically added references can be filter based on if they provide any of the filtered units or not.
+If `addOnlyProviding` is `true` repositories that don't provide any filtered unit are not added to the assembled repo.
+```xml
+<plugin>
+	<groupId>org.eclipse.tycho</groupId>
+	<artifactId>tycho-p2-repository-plugin</artifactId>
+	<version>${tycho-version}</version>
+	<configuration>
+		... other configuration options ...
+		<repositoryReferenceFilter>
+			<addOnlyProviding>true</addOnlyProviding>
+			<exclude>
+				<location>https://foo.bar.org/hidden/**</location>
+				<location>%regex[http(s)?:\/\/foo\.bar\.org\/secret\/.*]</location>
+				<location>![https://foo.bar.org/**]</location>
+			</exclude>
+		</repositoryReferenceFilter>
+	</configuration>
+</plugin>
+```
+
+## 4.0.2
+- new option to include referenced repositories when resolving the target platform
+- Add dummy parameter to prevent warnings with jgit as timestamp provider
+
+## 4.0.1
+
+backports:
+- new tycho-repository-plugin
+- Non existing but optional dependencies lead to resolving issue in target
+- SharedHttpCacheStorage doesn't resolve redirect correctly if the uri that is given isn't normalized
+- Non existing but optional dependencies lead to resolving issue in target
+- Make comparison of newlines in text files more precise
+- Fix resolving of project if target do not contains JUnit
+- Check if the about to be injected maven coordinates can be resolved
+
+## 4.0.0
+
+### Maven 3.9 required
+
+Tycho 4.x requires Maven Version 3.9
 
 ### creating maven p2 sites with Tycho packaging
 
@@ -505,6 +562,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

demo/osgi-repository/README.MD

@@ -0,0 +1,13 @@
+# Publish bundles as an OSGi Repository to maven repository
+
+This Demo shows how to publish a set of bundles as an OSGi Repository and deploy it to a maven repository (simulated by a folder here), 
+with this approach it is possible to deploy a whole project consumable by OSGi and maven users with only using the maven repository as the backing store.
+
+This example uses a single bundle build with bnd-maven-plugin, but actually any jar project that produces a bundle (including Tycho ones) would work!
+
+As a result of building the project with `mvn clean deploy -DaltDeploymentRepository=snapshot-repo::default::file:maven-repository` you can inspect the following items:
+
+- find the produced site in `site/target/repository`
+- see the deployed artifacts in the file base maven repository under `maven-repository`
+
+**Currently there is no support in Eclipse/Tycho for consuming such repository!**

demo/osgi-repository/maven-repository/.gitignore

@@ -0,0 +1 @@
+/org/

demo/osgi-repository/my-bundle/pom.xml

@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.tycho.demo</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<artifactId>my-bundle</artifactId>
+	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.annotation.bundle</artifactId>
+			<version>2.0.0</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+				<version>6.4.0</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<id>jar</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

demo/osgi-repository/my-bundle/src/main/java/hello/world/GreetingService.java

@@ -0,0 +1,6 @@
+package hello.world;
+
+public interface GreetingService {
+
+	void sayHello();
+}

demo/osgi-repository/my-bundle/src/main/java/hello/world/package-info.java

@@ -0,0 +1,3 @@
+@org.osgi.annotation.bundle.Export
+@org.osgi.annotation.versioning.Version("1.0")
+package hello.world;

demo/osgi-repository/pom.xml

@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.eclipse.tycho.demo</groupId>
+	<artifactId>parent</artifactId>
+	<version>1.0.0</version>
+	<packaging>pom</packaging>
+	<modules>
+		<module>repository</module>
+		<module>my-bundle</module>
+	</modules>
+	<properties>
+		<tycho-version>5.0.0-SNAPSHOT</tycho-version>
+	</properties>
+
+</project>

demo/osgi-repository/repository/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.tycho.demo</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<artifactId>repository</artifactId>
+	<packaging>repository</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<!-- Extensions must be enabled for this mojo to work reliable and for using the custom package type-->
+				<extensions>true</extensions>
+				<!-- EVERYTHING BELOW IS OPTIONAL -->
+				<!-- This is just used to show different options of the configuration and can be ommited if only a bare maven-repository is desired with default settings -->
+				<executions>
+					<!-- Additionally we create another repository using the 'local' layout and place it in a deploy folder -->
+					<execution>
+						<id>local</id>
+						<phase>package</phase>
+						<goals>
+							<goal>package-repository</goal>
+						</goals>
+						<configuration>
+							<repositoryLayout>local</repositoryLayout>
+							<settings>
+								<repositoryFolderName>deploy</repositoryFolderName>
+							</settings>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>