Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove tycho.mode=maven #3426

Merged
merged 1 commit into from
Jan 28, 2024
Merged

Remove tycho.mode=maven #3426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -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());
Expand Down
Loading