From 2292cded56a76cd04bc7fec706bb4e085e37e15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Mon, 11 Mar 2024 09:39:57 +0100
Subject: [PATCH] Remove publish-osgi-ee from the default life-cycle

---
 RELEASE_NOTES.md                              | 27 ++++++++++++++++++-
 .../eeProfile.java11/repository/pom.xml       | 13 +++++++++
 .../eeProfile.java17/repository/pom.xml       | 13 +++++++++
 .../resources/META-INF/plexus/components.xml  |  1 -
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0e0f5a96d8..eb948f9a42 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -305,7 +305,6 @@ If `addOnlyProviding` is `true` repositories that don't provide any filtered uni
         </repositoryReferenceFilter>
     </configuration>
 </plugin>
-
 ```
 
 ### Remove support for deployableFeature option
@@ -368,6 +367,32 @@ backports:
 - api tools fixes
 - new `tycho-eclipse-plugin`
 
+### OSGi Execution Environment Units are no longer published by default
+
+Previously Tycho has published so called 'Execution Environment Units' that represents the packages of the used Java version,
+but this has the drawback that these units represents the packages used during the build and not represent what is actually available at runtime.
+It could therefore happen that something is installed by P2 that later can't be resolved, especially since modular VMs can have any set of packages,
+additional packages are exposed by the framework and so on.
+
+Because of this there are some initiative to get rid of these generated units and let them be generated at runtime based on the actual VM present,
+if one requires previous behavior (e.g. to support older Eclipse / P2 / PDE / ...) it can be enabled as follows:
+
+```xml
+<plugin>
+	<groupId>org.eclipse.tycho</groupId>
+	<artifactId>tycho-p2-publisher-plugin</artifactId>
+	<version>${tycho-version}</version>
+	<executions>
+		<execution>
+			<id>publish-osgi-ee</id>
+			<goals>
+				<goal>publish-osgi-ee</goal>
+			</goals>
+		</execution>
+	</executions>
+</plugin>
+```
+
 ## 4.0.4
 
 Backports:
diff --git a/tycho-its/projects/eeProfile.java11/repository/pom.xml b/tycho-its/projects/eeProfile.java11/repository/pom.xml
index e86cf75637..e1caf60c27 100644
--- a/tycho-its/projects/eeProfile.java11/repository/pom.xml
+++ b/tycho-its/projects/eeProfile.java11/repository/pom.xml
@@ -10,6 +10,19 @@
 	<packaging>eclipse-repository</packaging>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-publisher-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>publish-osgi-ee</id>
+						<goals>
+							<goal>publish-osgi-ee</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-director-plugin</artifactId>
diff --git a/tycho-its/projects/eeProfile.java17/repository/pom.xml b/tycho-its/projects/eeProfile.java17/repository/pom.xml
index 43ced87063..a9cc48060b 100644
--- a/tycho-its/projects/eeProfile.java17/repository/pom.xml
+++ b/tycho-its/projects/eeProfile.java17/repository/pom.xml
@@ -18,6 +18,19 @@
 					<executionEnvironment>JavaSE-17</executionEnvironment>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-publisher-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>publish-osgi-ee</id>
+						<goals>
+							<goal>publish-osgi-ee</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-director-plugin</artifactId>
diff --git a/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml
index c8b238f511..e3ecf6585e 100644
--- a/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/tycho-maven-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -187,7 +187,6 @@
                 org.apache.maven.plugins:maven-resources-plugin:${resources-plugin.version}:resources
               </process-resources>
               <prepare-package>
-                org.eclipse.tycho:tycho-p2-publisher-plugin:${project.version}:publish-osgi-ee,
                 org.eclipse.tycho:tycho-p2-publisher-plugin:${project.version}:publish-products,
                 org.eclipse.tycho:tycho-p2-publisher-plugin:${project.version}:publish-categories,
                 org.eclipse.tycho:tycho-p2-publisher-plugin:${project.version}:attach-artifacts,