From a0dc64da50c22251612a4706e2dd65ed4029ec4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sun, 28 Jan 2024 17:31:25 +0100
Subject: [PATCH] Remove tycho.mode=maven

Fix https://github.com/eclipse-tycho/tycho/issues/676
---
 .../maven/TychoMavenLifecycleParticipant.java | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
index e3126fbe2d..74c3877ed9 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@@ -34,7 +34,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -364,7 +363,7 @@ private void validateUniqueBaseDirs(List<MavenProject> projects) throws MavenExe
     private static final Set<String> CLEAN_PHASES = Set.of("pre-clean", "clean", "post-clean");
 
     private boolean disableLifecycleParticipation(MavenSession session) {
-        return isMavenMode(session) || isM2E(session) || isCleanOnly(session);
+        return isM2E(session) || isCleanOnly(session);
     }
 
     private boolean isCleanOnly(MavenSession session) {
@@ -376,28 +375,6 @@ private boolean isM2E(MavenSession session) {
         return session.getUserProperties().containsKey("m2e.version");
     }
 
-    private boolean isMavenMode(MavenSession session) {
-        // command line property to disable Tycho lifecycle participant
-        if ("maven".equals(session.getUserProperties().get(TychoConstants.SESSION_PROPERTY_TYCHO_MODE))) {
-            synchronized (TychoMavenLifecycleParticipant.class) {
-                if (!warnedAboutTychoMode) {
-                    warnedAboutTychoMode = true;
-                    log.warn("######## IMPORTANT #######");
-                    log.warn("Usage of " + TychoConstants.SESSION_PROPERTY_TYCHO_MODE
-                            + "=maven is deprecated and will be removed in later Tycho versions, see https://github.com/eclipse-tycho/tycho/issues/676");
-                    log.warn("######## IMPORTANT #######");
-                    try {
-                        //to give user change to see the message....
-                        TimeUnit.SECONDS.sleep(5);
-                    } catch (InterruptedException e) {
-                    }
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
     private void configureComponents(MavenSession session) {
         // TODO why does the bundle reader need to cache stuff in the local maven repository?
         File localRepository = new File(session.getLocalRepository().getBasedir());