Merge branch 'master' into master

.github/workflows/maven.yml

@@ -43,7 +43,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/[email protected]
       with:
-        maven-version: 3.9.0
+        maven-version: 3.9.2
     - name: Build Tycho
       env:
        JAVA_HOME: ${{ env.JAVA_HOME_17_X64 }}

.github/workflows/sitedocs.yml

@@ -44,7 +44,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/[email protected]
       with:
-        maven-version: 3.8.6
+        maven-version: 3.9.2
     - name: Build site-doc
       env:
        JAVA_HOME: ${{ env.JAVA_HOME_17_X64 }}

.github/workflows/verify-platform.yml

@@ -45,7 +45,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/[email protected]
       with:
-        maven-version: 3.8.6
+        maven-version: 3.9.2
     - name: Build Tycho
       env:
        JAVA_HOME: ${{ env.JAVA_HOME_17_X64 }}

.github/workflows/verify-platform2.yml

@@ -45,7 +45,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/[email protected]
       with:
-        maven-version: 3.8.6
+        maven-version: 3.9.2
     - name: Build Tycho
       env:
        JAVA_HOME: ${{ env.JAVA_HOME_17_X64 }}

Jenkinsfile

@@ -18,7 +18,7 @@ pipeline {
 		label agentLabel
 	}
 	tools {
-		maven 'apache-maven-3.8.6'
+		maven 'apache-maven-3.9.1'
 		jdk 'openjdk-jdk17-latest'
 	}
 	stages {

RELEASE_NOTES.md

@@ -245,6 +245,13 @@ This can be disabled with the following configuration in the pom:
   </plugin>
 ```
 
+### Variable resolution in target repository location
+
+URI in `<repository location="...">` in `*.target` files can contain:
+- Environment variable as `${env_var:MY_VARIABLE}`
+- System variable as `${system_property:myProp}` passed at build time as `-DmyProp`
+- Project location as `${project_loc:ProjectName}`
+
 ### Migration guide 3.x > 4.x
 
 ### New delayed target platform resolving

p2-maven-plugin/pom.xml

@@ -21,6 +21,9 @@
 	<name>P2 Maven Integration</name>
 	<description>The P2 Maven Plugin provides access to the P2 eco-system inside maven.</description>
 	<properties></properties>
+	<prerequisites>
+		<maven>${minimal-maven-version}</maven>
+	</prerequisites>
 	<dependencies>
 		<dependency>
 			<groupId>org.eclipse.platform</groupId>

pom.xml

@@ -47,9 +47,6 @@
 			<organizationUrl>https://projects.eclipse.org/projects/technology.tycho</organizationUrl>
 		</developer>
 	</developers>
-	<prerequisites>
-		<maven>3.8.6</maven>
-	</prerequisites>
 	<groupId>org.eclipse.tycho</groupId>
 	<artifactId>tycho</artifactId>
 	<version>4.0.0-SNAPSHOT</version>
@@ -68,6 +65,7 @@
 		<pluginToolsVersion>3.9.0</pluginToolsVersion>
 		<jgit-version>6.5.0.202303070854-r</jgit-version>
 		<maven-version>3.9.2</maven-version>
+		<minimal-maven-version>3.9.0</minimal-maven-version>
 		<!-- When updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
 		<!-- Stick to 3.0.0-M5 because of https://github.com/eclipse-tycho/tycho/issues/879 / https://issues.apache.org/jira/projects/SUREFIRE/issues/SUREFIRE-2072 -->
 		<surefire-version>3.1.0</surefire-version>
@@ -335,6 +333,9 @@
 							</goals>
 						</execution>
 					</executions>
+					<configuration>
+						<extractors>class</extractors>
+					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -489,15 +490,15 @@
 				<version>${pluginToolsVersion}</version>
 				<configuration>
 					<requirements>
-						<maven>${maven-version}</maven>
+						<maven>${minimal-maven-version}</maven>
 						<jdk>${min.jdk.version}</jdk>
 					</requirements>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>3.4.3</version>
+				<version>3.4.4</version>
 				<reportSets>
 					<reportSet>
 						<reports>
@@ -510,6 +511,7 @@
 	</reporting>
 	<modules>
 		<module>tycho-bundles</module>
+		<module>tycho-api</module>
 		<module>sisu-osgi</module>
 		<module>p2-maven-plugin</module>
 		<module>tycho-metadata-model</module>
@@ -531,7 +533,10 @@
 		<!-- release -->
 		<module>tycho-versions-plugin</module>
 		<!-- tycho-p2 -->
-		<module>tycho-p2</module>
+		<module>tycho-p2-director-plugin</module>
+		<module>tycho-p2-plugin</module>
+		<module>tycho-p2-publisher-plugin</module>
+		<module>tycho-p2-repository-plugin</module>
 		<module>tycho-artifactcomparator</module>
 		<module>tycho-gpg-plugin</module>
 		<module>tycho-extras</module>

sisu-osgi/sisu-equinox-launching/pom.xml

@@ -27,12 +27,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>
-			<artifactId>org.eclipse.tycho.core.shared</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.tycho</groupId>
-			<artifactId>org.eclipse.tycho.embedder.shared</artifactId>
+			<artifactId>tycho-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

target-platform-configuration/pom.xml

@@ -21,7 +21,9 @@
 
 	<artifactId>target-platform-configuration</artifactId>
 	<packaging>maven-plugin</packaging>
-
+	<prerequisites>
+		<maven>${minimal-maven-version}</maven>
+	</prerequisites>
 	<name>Tycho Target Platform Configuration Plugin</name>
 
 	<build>

target-platform-configuration/src/main/java/org/eclipse/tycho/target/TargetPlatformConfigurationMojo.java

@@ -22,11 +22,11 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.eclipse.tycho.TargetEnvironment;
-import org.eclipse.tycho.artifacts.TargetPlatformFilter.CapabilityPattern;
 import org.eclipse.tycho.core.TargetPlatformConfiguration.BREEHeaderSelectionPolicy;
 import org.eclipse.tycho.core.resolver.DefaultTargetPlatformConfigurationReader;
 import org.eclipse.tycho.core.resolver.shared.IncludeSourceMode;
 import org.eclipse.tycho.core.resolver.shared.PomDependencies;
+import org.eclipse.tycho.targetplatform.TargetPlatformFilter.CapabilityPattern;
 
 /**
  * Configures the target-platform to use in order to resolve dependencies. <br>

tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml → tycho-api/pom.xml

@@ -17,10 +17,9 @@
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
 		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.tycho.embedder.shared</artifactId>
+	<artifactId>tycho-api</artifactId>
 	<packaging>jar</packaging>
 
 	<name>Tycho Embedder API Maven/OSGi Shared Classes</name>

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/artifact/provider/streaming/ArtifactSinkException.java → tycho-api/src/main/java/org/eclipse/tycho/ArtifactSinkException.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    Tobias Oberlies (SAP SE) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.p2.artifact.provider.streaming;
+package org.eclipse.tycho;
 
 /**
  * Exception thrown when one of the operations of {@link IArtifactSink} fails.

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/ee/shared/ExecutionEnvironment.java → tycho-api/src/main/java/org/eclipse/tycho/ExecutionEnvironment.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    SAP AG - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.core.ee.shared;
+package org.eclipse.tycho;
 
 import java.util.Collection;
 import java.util.Objects;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/ee/shared/ExecutionEnvironmentConfiguration.java → tycho-api/src/main/java/org/eclipse/tycho/ExecutionEnvironmentConfiguration.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    SAP SE - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.core.ee.shared;
+package org.eclipse.tycho;
 
 import java.util.Collection;
 import java.util.List;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/locking/facade/FileLockService.java → tycho-api/src/main/java/org/eclipse/tycho/FileLockService.java

@@ -11,7 +11,7 @@
  *     SAP AG - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.tycho.locking.facade;
+package org.eclipse.tycho;
 
 import java.io.File;
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/locking/facade/FileLocker.java → tycho-api/src/main/java/org/eclipse/tycho/FileLocker.java

@@ -11,7 +11,7 @@
  *     SAP AG - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.tycho.locking.facade;
+package org.eclipse.tycho;
 
 /**
  * Provides process-level file locking. Locking is advisory, meaning that processes must

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/artifact/provider/IArtifactFileProvider.java → tycho-api/src/main/java/org/eclipse/tycho/IArtifactFileProvider.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    Tobias Oberlies (SAP SE) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.p2.artifact.provider;
+package org.eclipse.tycho;
 
 import java.io.File;
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/artifact/provider/IArtifactProvider.java → tycho-api/src/main/java/org/eclipse/tycho/IArtifactProvider.java

@@ -10,14 +10,12 @@
  * Contributors:
  *    Tobias Oberlies (SAP SE) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.p2.artifact.provider;
+package org.eclipse.tycho;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 import org.eclipse.equinox.p2.query.IQueryable;
-import org.eclipse.tycho.p2.artifact.provider.streaming.ArtifactSinkException;
-import org.eclipse.tycho.p2.artifact.provider.streaming.IArtifactSink;
 
 /**
  * Provider for artifact content.

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/artifact/provider/streaming/IArtifactSink.java → tycho-api/src/main/java/org/eclipse/tycho/IArtifactSink.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    Tobias Oberlies (SAP SE) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.p2.artifact.provider.streaming;
+package org.eclipse.tycho;
 
 import java.io.OutputStream;
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/artifact/provider/IRawArtifactFileProvider.java → tycho-api/src/main/java/org/eclipse/tycho/IRawArtifactFileProvider.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    Tobias Oberlies (SAP SE) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.p2.artifact.provider;
+package org.eclipse.tycho;
 
 import java.io.File;
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/artifact/provider/IRawArtifactProvider.java → tycho-api/src/main/java/org/eclipse/tycho/IRawArtifactProvider.java

@@ -10,15 +10,12 @@
  * Contributors:
  *    Tobias Oberlies (SAP SE) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.p2.artifact.provider;
+package org.eclipse.tycho;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
-import org.eclipse.tycho.p2.artifact.provider.streaming.ArtifactSinkException;
-import org.eclipse.tycho.p2.artifact.provider.streaming.IArtifactSink;
-import org.eclipse.tycho.p2.artifact.provider.streaming.IRawArtifactSink;
 
 /**
  * Provider for artifact content in different formats.

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/p2/artifact/provider/streaming/IRawArtifactSink.java → tycho-api/src/main/java/org/eclipse/tycho/IRawArtifactSink.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    Tobias Oberlies (SAP SE) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.p2.artifact.provider.streaming;
+package org.eclipse.tycho;
 
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/locking/facade/LockTimeoutException.java → tycho-api/src/main/java/org/eclipse/tycho/LockTimeoutException.java

@@ -11,7 +11,7 @@
  *     SAP AG - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.tycho.locking.facade;
+package org.eclipse.tycho;
 
 public class LockTimeoutException extends RuntimeException {
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/repository/registry/facade/PublishingRepositoryFacade.java → tycho-api/src/main/java/org/eclipse/tycho/PublishingRepositoryFacade.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    SAP AG - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.repository.registry.facade;
+package org.eclipse.tycho;
 
 import java.io.File;
 import java.util.Map;

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/ee/shared/SystemCapability.java → tycho-api/src/main/java/org/eclipse/tycho/SystemCapability.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    SAP AG - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.core.ee.shared;
+package org.eclipse.tycho;
 
 import java.util.Objects;
 

tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/repository/publishing/WriteSessionContext.java → tycho-api/src/main/java/org/eclipse/tycho/WriteSessionContext.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    SAP SE - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.repository.publishing;
+package org.eclipse.tycho;
 
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 

tycho-apitools-plugin/pom.xml

@@ -8,6 +8,9 @@
 	<artifactId>tycho-apitools-plugin</artifactId>
 	<name>Plugin for performing API analysis tasks</name>
 	<packaging>maven-plugin</packaging>
+	<prerequisites>
+		<maven>${minimal-maven-version}</maven>
+	</prerequisites>
 	<properties>
 		<asm.version>9.5</asm.version>
 	</properties>

tycho-baseline-plugin/pom.xml

@@ -7,6 +7,9 @@
 	</parent>
 	<artifactId>tycho-baseline-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
+	<prerequisites>
+		<maven>${minimal-maven-version}</maven>
+	</prerequisites>
 	<name>Tycho Baseline Plugin</name>
 	<description>A plugin for handling OSGi Declarative Services</description>
 	<dependencies>

tycho-bnd-plugin/pom.xml

@@ -10,7 +10,7 @@
 	<description>Builds BND Workspace with Maven</description>
 	<packaging>maven-plugin</packaging>
 	<prerequisites>
-		<maven>3.8.6</maven>
+		<maven>${minimal-maven-version}</maven>
 	</prerequisites>
 	<dependencies>
 		<dependency>

tycho-build/pom.xml

@@ -35,11 +35,6 @@
 			<artifactId>tycho-pomless</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.tycho</groupId>
-			<artifactId>org.eclipse.tycho.core.shared</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>
 			<artifactId>tycho-buildtimestamp-jgit</artifactId>
@@ -142,6 +137,19 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
+		<dependency>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>biz.aQute.bndlib</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.repository</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.util.promise</artifactId>
+			<version>1.3.0</version>
+		</dependency>
 	</dependencies>
 </project>