Improve handling of 'none' EE configuration

Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>

Author: laeubi

tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/ExecutionEnvironmentResolutionHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2014 SAP SE and others.
+ * Copyright (c) 2012, 2022 SAP SE and others.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *    SAP SE - initial API and implementation
+ *    Christoph Läubrich - #519 - Provide better feedback to the user about the cause of a failed resolution
  *******************************************************************************/
 package org.eclipse.tycho.p2.target.ee;
 
@@ -22,16 +23,17 @@ public abstract class ExecutionEnvironmentResolutionHandler {
 
     public static ExecutionEnvironmentResolutionHandler adapt(ExecutionEnvironmentConfiguration eeConfiguration) {
         if (eeConfiguration.ignoreExecutionEnvironment()) {
-            return new StandardEEResolutionHandler(NoExecutionEnvironmentResolutionHints.INSTANCE);
+            return new StandardEEResolutionHandler(NoExecutionEnvironmentResolutionHints.INSTANCE, eeConfiguration);
         }
         if (eeConfiguration.isIgnoredByResolver()) {
-            return new StandardEEResolutionHandler(new AllKnownEEsResolutionHints(eeConfiguration.getAllKnownEEs()));
+            return new StandardEEResolutionHandler(new AllKnownEEsResolutionHints(eeConfiguration.getAllKnownEEs()),
+                    eeConfiguration);
         } else if (eeConfiguration.isCustomProfile()) {
             // TODO consider whether custom and standard EE couldn't build their "hints" the same way
             return new CustomEEResolutionHandler(eeConfiguration);
         } else {
             return new StandardEEResolutionHandler(
-                    new StandardEEResolutionHints(eeConfiguration.getFullSpecification()));
+                    new StandardEEResolutionHints(eeConfiguration.getFullSpecification()), eeConfiguration);
         }
     }
 

tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/StandardEEResolutionHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2014 SAP SE and others.
+ * Copyright (c) 2012, 2022 SAP SE and others.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -9,22 +9,34 @@
  *
  * Contributors:
  *    SAP SE - initial API and implementation
+ *    Christoph Läubrich - #519 - Provide better feedback to the user about the cause of a failed resolution
  *******************************************************************************/
 package org.eclipse.tycho.p2.target.ee;
 
 import java.util.Collection;
+import java.util.Collections;
 
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration;
 import org.eclipse.tycho.p2.util.resolution.ExecutionEnvironmentResolutionHints;
 
 class StandardEEResolutionHandler extends ExecutionEnvironmentResolutionHandler {
 
-    public StandardEEResolutionHandler(ExecutionEnvironmentResolutionHints resolutionHints) {
+    private ExecutionEnvironmentConfiguration environmentConfiguration;
+
+    public StandardEEResolutionHandler(ExecutionEnvironmentResolutionHints resolutionHints,
+            ExecutionEnvironmentConfiguration environmentConfiguration) {
         super(resolutionHints);
+        this.environmentConfiguration = environmentConfiguration;
     }
 
     @Override
     public void readFullSpecification(Collection<IInstallableUnit> targetPlatformContent) {
+        if (environmentConfiguration.ignoreExecutionEnvironment()) {
+            //if it is ignored not setting the specification leads to strange errors in downstream mojos...
+            environmentConfiguration.setFullSpecificationForCustomProfile(Collections.emptyList());
+            return;
+        }
         // standard EEs are fully specified - no need to read anything from the target platform
     }
 

tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java

@@ -24,7 +24,8 @@
 
 public class ExecutionEnvironmentConfigurationImpl implements ExecutionEnvironmentConfiguration {
     // Most likely best to always be the latest known supported EE
-    private static final String DEFAULT_EXECUTION_ENVIRONMENT = "JavaSE-" + Integer.toString(Runtime.version().feature());
+    private static final String DEFAULT_EXECUTION_ENVIRONMENT = "JavaSE-"
+            + Integer.toString(Runtime.version().feature());
 
     private static final int PRIMARY = 0;
     private static final int SECONDARY = 1;
@@ -128,7 +129,8 @@ public void setFullSpecificationForCustomProfile(List<SystemCapability> systemCa
     public ExecutionEnvironment getFullSpecification() throws IllegalStateException {
         if (isCustomProfile()) {
             if (customExecutionEnvironment == null) {
-                throw new IllegalStateException("Full specification of custom profile is not (yet) determined");
+                throw new IllegalStateException(
+                        "Full specification of custom profile '" + getProfileName() + "' is not (yet) determined");
             }
             return customExecutionEnvironment;
         }

tycho-its/src/test/java/org/eclipse/tycho/test/compiler/TestErrorMessages.java

@@ -17,7 +17,6 @@
 import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -60,16 +59,14 @@ public void testMissingBREEWithPlainProfile() throws Exception {
 	 * @throws Exception
 	 */
 	@Test
-	@Ignore("This currently fails with an strange error in validate-classpath we should improve this")
 	public void testMissingBREEWithJustJProfile() throws Exception {
 		Verifier verifier = getVerifier("compiler.messages/missing-bree", false);
 		verifier.addCliOption("-Pjustj");
 		try {
 			verifier.executeGoal("compile");
 			fail();
 		} catch (VerificationException e) {
-			verifier.verifyTextInLog("java17.bundle 1.0.0 requires Execution Environment that matches");
-			verifier.verifyTextInLog("but the current resolution context uses");
+			verifier.verifyTextInLog("Unresolved requirement: Require-Capability: osgi.ee; filter:=");
 		}
 	}
 }