-rf " + resumeFromSelector);
- }
- }
-
- if (MavenExecutionRequest.REACTOR_FAIL_NEVER.equals(cliRequest.request.getReactorFailureBehavior())) {
- slf4jLogger.info("Build failures were ignored.");
-
- return 0;
- } else {
- return 1;
- }
- } else {
- Path directory = Paths.get(request.getBaseDirectory()).resolve("target");
- new DefaultBuildResumptionDataRepository().removeResumptionData(directory);
- return 0;
- }
- }
-
- private void logBuildResumeHint(String resumeBuildHint) {
- slf4jLogger.error("");
- slf4jLogger.error("After correcting the problems, you can resume the build with the command");
- slf4jLogger.error(buffer().a(" ").strong(resumeBuildHint).toString());
- }
-
- /**
- * A helper method to determine the value to resume the build with {@code -rf} taking into account the
- * edge case where multiple modules in the reactor have the same artifactId.
- *
- * {@code -rf :artifactId} will pick up the first module which matches, but when multiple modules in the
- * reactor have the same artifactId, effective failed module might be later in build reactor.
- * This means that developer will either have to type groupId or wait for build execution of all modules
- * which were fine, but they are still before one which reported errors.
- *
- * Then the returned value is {@code groupId:artifactId} when there is a name clash and
- * {@code :artifactId} if there is no conflict.
- *
- * @param mavenProjects Maven projects which are part of build execution.
- * @param failedProject Project which has failed.
- * @return Value for -rf flag to resume build exactly from place where it failed ({@code :artifactId} in
- * general and {@code groupId:artifactId} when there is a name clash).
- */
- private String getResumeFromSelector(List mavenProjects, MavenProject failedProject) {
- for (MavenProject buildProject : mavenProjects) {
- if (failedProject.getArtifactId().equals(buildProject.getArtifactId())
- && !failedProject.equals(buildProject)) {
- return failedProject.getGroupId() + ":" + failedProject.getArtifactId();
- }
- }
- return ":" + failedProject.getArtifactId();
- }
-
- private void logSummary(
- ExceptionSummary summary, Map references, String indent, boolean showErrors) {
- String msg = summary.getMessage();
-
- if (!summary.getReference().isEmpty()) {
- String referenceKey =
- references.computeIfAbsent(summary.getReference(), k -> "[Help " + (references.size() + 1) + "]");
- if (msg.indexOf('\n') < 0) {
- msg += " -> " + buffer().strong(referenceKey);
- } else {
- msg += "\n-> " + buffer().strong(referenceKey);
- }
- }
-
- String[] lines = msg.split("(\r\n)|(\r)|(\n)");
- String currentColor = "";
-
- for (int i = 0; i < lines.length; i++) {
- // add eventual current color inherited from previous line
- String line = currentColor + lines[i];
-
- // look for last ANSI escape sequence to check if nextColor
- Matcher matcher = LAST_ANSI_SEQUENCE.matcher(line);
- String nextColor = "";
- if (matcher.find()) {
- nextColor = matcher.group(1);
- if (ANSI_RESET.equals(nextColor)) {
- // last ANSI escape code is reset: no next color
- nextColor = "";
- }
- }
-
- // effective line, with indent and reset if end is colored
- line = indent + line + ("".equals(nextColor) ? "" : ANSI_RESET);
-
- if ((i == lines.length - 1) && (showErrors || (summary.getException() instanceof InternalErrorException))) {
- slf4jLogger.error(line, summary.getException());
- } else {
- slf4jLogger.error(line);
- }
-
- currentColor = nextColor;
- }
-
- indent += " ";
-
- for (ExceptionSummary child : summary.getChildren()) {
- logSummary(child, references, indent, showErrors);
- }
- }
-
- private static final Pattern LAST_ANSI_SEQUENCE = Pattern.compile("(\u001B\\[[;\\d]*[ -/]*[@-~])[^\u001B]*$");
-
- private static final String ANSI_RESET = "\u001B\u005Bm";
-
- private static void configure(
- CliRequest cliRequest,
- EventSpyDispatcher eventSpyDispatcher,
- Map configurationProcessors)
- throws Exception {
- //
- // This is not ideal but there are events specifically for configuration from the CLI which I don't
- // believe are really valid but there are ITs which assert the right events are published so this
- // needs to be supported so the EventSpyDispatcher needs to be put in the CliRequest so that
- // it can be accessed by configuration processors.
- //
- cliRequest.request.setEventSpyDispatcher(eventSpyDispatcher);
-
- //
- // We expect at most 2 implementations to be available. The SettingsXmlConfigurationProcessor implementation
- // is always available in the core and likely always will be, but we may have another ConfigurationProcessor
- // present supplied by the user. The rule is that we only allow the execution of one ConfigurationProcessor.
- // If there is more than one then we execute the one supplied by the user, otherwise we execute the
- // the default SettingsXmlConfigurationProcessor.
- //
- int userSuppliedConfigurationProcessorCount = configurationProcessors.size() - 1;
-
- if (userSuppliedConfigurationProcessorCount == 0) {
- //
- // Our settings.xml source is historically how we have configured Maven from the CLI so we are going to
- // have to honour its existence forever. So let's run it.
- //
- configurationProcessors.get(SettingsXmlConfigurationProcessor.HINT).process(cliRequest);
- } else if (userSuppliedConfigurationProcessorCount == 1) {
- //
- // Run the user supplied ConfigurationProcessor
- //
- for (Entry entry : configurationProcessors.entrySet()) {
- String hint = entry.getKey();
- if (!hint.equals(SettingsXmlConfigurationProcessor.HINT)) {
- ConfigurationProcessor configurationProcessor = entry.getValue();
- configurationProcessor.process(cliRequest);
- }
- }
- } else if (userSuppliedConfigurationProcessorCount > 1) {
- //
- // There are too many ConfigurationProcessors so we don't know which one to run so report the error.
- //
- StringBuilder sb = new StringBuilder(String.format(
- "\nThere can only be one user supplied ConfigurationProcessor, there are %s:\n\n",
- userSuppliedConfigurationProcessorCount));
- for (Entry entry : configurationProcessors.entrySet()) {
- String hint = entry.getKey();
- if (!hint.equals(SettingsXmlConfigurationProcessor.HINT)) {
- ConfigurationProcessor configurationProcessor = entry.getValue();
- sb.append(String.format(
- "%s\n", configurationProcessor.getClass().getName()));
- }
- }
- sb.append("\n");
- throw new Exception(sb.toString());
- }
- }
-
- void toolchains(CliRequest cliRequest) throws Exception {
- File userToolchainsFile;
-
- if (cliRequest.commandLine.hasOption(CLIManager.ALTERNATE_USER_TOOLCHAINS)) {
- userToolchainsFile = new File(cliRequest.commandLine.getOptionValue(CLIManager.ALTERNATE_USER_TOOLCHAINS));
- userToolchainsFile = resolveFile(userToolchainsFile, cliRequest.workingDirectory);
-
- if (!userToolchainsFile.isFile()) {
- throw new FileNotFoundException(
- "The specified user toolchains file does not exist: " + userToolchainsFile);
- }
- } else {
- userToolchainsFile = DEFAULT_USER_TOOLCHAINS_FILE;
- }
-
- File globalToolchainsFile;
-
- if (cliRequest.commandLine.hasOption(CLIManager.ALTERNATE_GLOBAL_TOOLCHAINS)) {
- globalToolchainsFile =
- new File(cliRequest.commandLine.getOptionValue(CLIManager.ALTERNATE_GLOBAL_TOOLCHAINS));
- globalToolchainsFile = resolveFile(globalToolchainsFile, cliRequest.workingDirectory);
-
- if (!globalToolchainsFile.isFile()) {
- throw new FileNotFoundException(
- "The specified global toolchains file does not exist: " + globalToolchainsFile);
- }
- } else {
- globalToolchainsFile = DEFAULT_GLOBAL_TOOLCHAINS_FILE;
- }
-
- cliRequest.request.setGlobalToolchainsFile(globalToolchainsFile);
- cliRequest.request.setUserToolchainsFile(userToolchainsFile);
-
- DefaultToolchainsBuildingRequest toolchainsRequest = new DefaultToolchainsBuildingRequest();
- if (globalToolchainsFile.isFile()) {
- toolchainsRequest.setGlobalToolchainsSource(new FileSource(globalToolchainsFile));
- }
- if (userToolchainsFile.isFile()) {
- toolchainsRequest.setUserToolchainsSource(new FileSource(userToolchainsFile));
- }
-
- eventSpyDispatcher.onEvent(toolchainsRequest);
-
- slf4jLogger.debug(
- "Reading global toolchains from {}",
- getLocation(toolchainsRequest.getGlobalToolchainsSource(), globalToolchainsFile));
- slf4jLogger.debug(
- "Reading user toolchains from {}",
- getLocation(toolchainsRequest.getUserToolchainsSource(), userToolchainsFile));
-
- ToolchainsBuildingResult toolchainsResult = toolchainsBuilder.build(toolchainsRequest);
-
- eventSpyDispatcher.onEvent(toolchainsResult);
-
- executionRequestPopulator.populateFromToolchains(cliRequest.request, toolchainsResult.getEffectiveToolchains());
-
- if (!toolchainsResult.getProblems().isEmpty() && slf4jLogger.isWarnEnabled()) {
- slf4jLogger.warn("");
- slf4jLogger.warn("Some problems were encountered while building the effective toolchains");
-
- for (Problem problem : toolchainsResult.getProblems()) {
- slf4jLogger.warn("{} @ {}", problem.getMessage(), problem.getLocation());
- }
-
- slf4jLogger.warn("");
- }
- }
-
- private Object getLocation(Source source, File defaultLocation) {
- if (source != null) {
- return source.getLocation();
- }
- return defaultLocation;
- }
-
- private void populateRequest(CliRequest cliRequest) {
- populateRequest(
- cliRequest,
- cliRequest.request,
- slf4jLogger,
- eventSpyDispatcher,
- modelProcessor,
- createTransferListener(cliRequest),
- buildEventListener,
- executionListener);
- }
-
- private static void populateRequest(
- CliRequest cliRequest,
- MavenExecutionRequest request,
- Logger slf4jLogger,
- EventSpyDispatcher eventSpyDispatcher,
- ModelProcessor modelProcessor,
- TransferListener transferListener,
- BuildEventListener buildEventListener,
- LoggingExecutionListener executionListener) {
- CommandLine commandLine = cliRequest.commandLine;
- String workingDirectory = cliRequest.workingDirectory;
- boolean showErrors = cliRequest.showErrors;
-
- String[] deprecatedOptions = {"up", "npu", "cpu", "npr"};
- for (String deprecatedOption : deprecatedOptions) {
- if (commandLine.hasOption(deprecatedOption)) {
- slf4jLogger.warn(
- "Command line option -{} is deprecated and will be removed in future Maven versions.",
- deprecatedOption);
- }
- }
-
- // ----------------------------------------------------------------------
- // Now that we have everything that we need we will fire up plexus and
- // bring the maven component to life for use.
- // ----------------------------------------------------------------------
-
- if (commandLine.hasOption(CLIManager.BATCH_MODE)) {
- request.setInteractiveMode(false);
- }
-
- boolean noSnapshotUpdates = false;
- if (commandLine.hasOption(CLIManager.SUPRESS_SNAPSHOT_UPDATES)) {
- noSnapshotUpdates = true;
- }
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- List goals = commandLine.getArgList();
-
- boolean recursive = true;
-
- // this is the default behavior.
- String reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_FAST;
-
- if (commandLine.hasOption(CLIManager.NON_RECURSIVE)) {
- recursive = false;
- }
-
- if (commandLine.hasOption(CLIManager.FAIL_FAST)) {
- reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_FAST;
- } else if (commandLine.hasOption(CLIManager.FAIL_AT_END)) {
- reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_AT_END;
- } else if (commandLine.hasOption(CLIManager.FAIL_NEVER)) {
- reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_NEVER;
- }
-
- if (commandLine.hasOption(CLIManager.OFFLINE)) {
- request.setOffline(true);
- }
-
- boolean updateSnapshots = false;
-
- if (commandLine.hasOption(CLIManager.UPDATE_SNAPSHOTS)) {
- updateSnapshots = true;
- }
-
- String globalChecksumPolicy = null;
-
- if (commandLine.hasOption(CLIManager.CHECKSUM_FAILURE_POLICY)) {
- globalChecksumPolicy = MavenExecutionRequest.CHECKSUM_POLICY_FAIL;
- } else if (commandLine.hasOption(CLIManager.CHECKSUM_WARNING_POLICY)) {
- globalChecksumPolicy = MavenExecutionRequest.CHECKSUM_POLICY_WARN;
- }
-
- File baseDirectory = new File(workingDirectory, "").getAbsoluteFile();
-
- // ----------------------------------------------------------------------
- // Profile Activation
- // ----------------------------------------------------------------------
-
- List activeProfiles = new ArrayList<>();
-
- List inactiveProfiles = new ArrayList<>();
-
- if (commandLine.hasOption(CLIManager.ACTIVATE_PROFILES)) {
- String[] profileOptionValues = commandLine.getOptionValues(CLIManager.ACTIVATE_PROFILES);
- if (profileOptionValues != null) {
- for (String profileOptionValue : profileOptionValues) {
- StringTokenizer profileTokens = new StringTokenizer(profileOptionValue, ",");
-
- while (profileTokens.hasMoreTokens()) {
- String profileAction = profileTokens.nextToken().trim();
-
- if (profileAction.startsWith("-") || profileAction.startsWith("!")) {
- inactiveProfiles.add(profileAction.substring(1));
- } else if (profileAction.startsWith("+")) {
- activeProfiles.add(profileAction.substring(1));
- } else {
- activeProfiles.add(profileAction);
- }
- }
- }
- }
- }
-
- ExecutionEventLogger executionEventLogger = new ExecutionEventLogger();
- executionListener.init(eventSpyDispatcher.chainListener(executionEventLogger), buildEventListener);
-
- String alternatePomFile = null;
- if (commandLine.hasOption(CLIManager.ALTERNATE_POM_FILE)) {
- alternatePomFile = commandLine.getOptionValue(CLIManager.ALTERNATE_POM_FILE);
- }
-
- request.setBaseDirectory(baseDirectory)
- .setGoals(goals)
- .setSystemProperties(cliRequest.systemProperties)
- .setUserProperties(cliRequest.userProperties)
- .setReactorFailureBehavior(reactorFailureBehaviour) // default: fail fast
- .setRecursive(recursive) // default: true
- .setShowErrors(showErrors) // default: false
- .addActiveProfiles(activeProfiles) // optional
- .addInactiveProfiles(inactiveProfiles) // optional
- .setExecutionListener(executionListener)
- .setTransferListener(transferListener) // default: batch mode which goes along with interactive
- .setUpdateSnapshots(updateSnapshots) // default: false
- .setNoSnapshotUpdates(noSnapshotUpdates) // default: false
- .setGlobalChecksumPolicy(globalChecksumPolicy) // default: warn
- .setMultiModuleProjectDirectory(cliRequest.getMultiModuleProjectDirectory());
-
- if (alternatePomFile != null) {
- File pom = resolveFile(new File(alternatePomFile), workingDirectory);
- if (pom.isDirectory()) {
- pom = new File(pom, "pom.xml");
- }
-
- request.setPom(pom);
- } else if (modelProcessor != null) {
- File pom = modelProcessor.locatePom(baseDirectory);
-
- if (pom.isFile()) {
- request.setPom(pom);
- }
- }
-
- if ((request.getPom() != null) && (request.getPom().getParentFile() != null)) {
- request.setBaseDirectory(request.getPom().getParentFile());
- }
-
- if (commandLine.hasOption(RESUME)) {
- new DefaultBuildResumptionDataRepository()
- .applyResumptionData(
- request, Paths.get(request.getBaseDirectory()).resolve("target"));
- }
-
- if (commandLine.hasOption(CLIManager.RESUME_FROM)) {
- request.setResumeFrom(commandLine.getOptionValue(CLIManager.RESUME_FROM));
- }
-
- if (commandLine.hasOption(CLIManager.PROJECT_LIST)) {
- String[] projectOptionValues = commandLine.getOptionValues(CLIManager.PROJECT_LIST);
-
- List inclProjects = new ArrayList<>();
- List exclProjects = new ArrayList<>();
-
- if (projectOptionValues != null) {
- for (String projectOptionValue : projectOptionValues) {
- StringTokenizer projectTokens = new StringTokenizer(projectOptionValue, ",");
-
- while (projectTokens.hasMoreTokens()) {
- String projectAction = projectTokens.nextToken().trim();
-
- if (projectAction.startsWith("-") || projectAction.startsWith("!")) {
- exclProjects.add(projectAction.substring(1));
- } else if (projectAction.startsWith("+")) {
- inclProjects.add(projectAction.substring(1));
- } else {
- inclProjects.add(projectAction);
- }
- }
- }
- }
-
- request.setSelectedProjects(inclProjects);
- request.setExcludedProjects(exclProjects);
- }
-
- if (commandLine.hasOption(CLIManager.ALSO_MAKE) && !commandLine.hasOption(CLIManager.ALSO_MAKE_DEPENDENTS)) {
- request.setMakeBehavior(MavenExecutionRequest.REACTOR_MAKE_UPSTREAM);
- } else if (!commandLine.hasOption(CLIManager.ALSO_MAKE)
- && commandLine.hasOption(CLIManager.ALSO_MAKE_DEPENDENTS)) {
- request.setMakeBehavior(MavenExecutionRequest.REACTOR_MAKE_DOWNSTREAM);
- } else if (commandLine.hasOption(CLIManager.ALSO_MAKE)
- && commandLine.hasOption(CLIManager.ALSO_MAKE_DEPENDENTS)) {
- request.setMakeBehavior(MavenExecutionRequest.REACTOR_MAKE_BOTH);
- }
-
- String localRepoProperty = request.getUserProperties().getProperty(MavenCli.LOCAL_REPO_PROPERTY);
-
- if (localRepoProperty == null) {
- localRepoProperty = request.getSystemProperties().getProperty(MavenCli.LOCAL_REPO_PROPERTY);
- }
-
- if (localRepoProperty != null) {
- request.setLocalRepositoryPath(localRepoProperty);
- }
-
- request.setCacheNotFound(true);
- request.setCacheTransferError(false);
-
- //
- // Builder, concurrency and parallelism
- //
- // We preserve the existing methods for builder selection which is to look for various inputs in the threading
- // configuration. We don't have an easy way to allow a pluggable builder to provide its own configuration
- // parameters but this is sufficient for now. Ultimately we want components like Builders to provide a way to
- // extend the command line to accept its own configuration parameters.
- //
- final String threadConfiguration =
- commandLine.hasOption(CLIManager.THREADS) ? commandLine.getOptionValue(CLIManager.THREADS) : null;
-
- if (threadConfiguration != null) {
- //
- // Default to the standard multithreaded builder
- //
- request.setBuilderId("multithreaded");
-
- if (threadConfiguration.contains("C")) {
- request.setDegreeOfConcurrency(calculateDegreeOfConcurrencyWithCoreMultiplier(threadConfiguration));
- } else {
- request.setDegreeOfConcurrency(Integer.parseInt(threadConfiguration));
- }
- }
-
- //
- // Allow the builder to be overridden by the user if requested. The builders are now pluggable.
- //
- if (commandLine.hasOption(CLIManager.BUILDER)) {
- request.setBuilderId(commandLine.getOptionValue(CLIManager.BUILDER));
- }
- }
-
- static int calculateDegreeOfConcurrencyWithCoreMultiplier(String threadConfiguration) {
- int procs = Runtime.getRuntime().availableProcessors();
- return (int) (Float.parseFloat(threadConfiguration.replace("C", "")) * procs);
- }
-
- static File resolveFile(File file, String workingDirectory) {
- if (file == null) {
- return null;
- } else if (file.isAbsolute()) {
- return file;
- } else if (file.getPath().startsWith(File.separator)) {
- // drive-relative Windows path
- return file.getAbsoluteFile();
- } else {
- return new File(workingDirectory, file.getPath()).getAbsoluteFile();
- }
- }
-
- // ----------------------------------------------------------------------
- // System properties handling
- // ----------------------------------------------------------------------
-
- static void populateProperties(CliRequest cliRequest, Properties systemProperties, Properties userProperties)
- throws InterpolationException {
- addEnvVars(systemProperties);
-
- // ----------------------------------------------------------------------
- // Options that are set on the command line become system properties
- // and therefore are set in the session properties. System properties
- // are most dominant.
- // ----------------------------------------------------------------------
-
- Properties cliProperties = new Properties();
- if (cliRequest.commandLine.hasOption(CLIManager.SET_SYSTEM_PROPERTY)) {
- String[] defStrs = cliRequest.commandLine.getOptionValues(CLIManager.SET_SYSTEM_PROPERTY);
-
- if (defStrs != null) {
- for (String defStr : defStrs) {
- setCliProperty(defStr, cliProperties);
- }
- }
- }
-
- SystemProperties.addSystemProperties(systemProperties);
-
- StringSearchInterpolator interpolator = createInterpolator(cliRequest, cliProperties, systemProperties);
- for (Map.Entry e : cliProperties.entrySet()) {
- String name = (String) e.getKey();
- String value = interpolator.interpolate((String) e.getValue());
- userProperties.setProperty(name, value);
- }
-
- // ----------------------------------------------------------------------
- // Properties containing info about the currently running version of Maven
- // These override any corresponding properties set on the command line
- // ----------------------------------------------------------------------
-
- Properties buildProperties = CLIReportingUtils.getBuildProperties();
-
- String mavenVersion = buildProperties.getProperty(CLIReportingUtils.BUILD_VERSION_PROPERTY);
- systemProperties.setProperty("maven.version", mavenVersion);
-
- String mavenBuildVersion = CLIReportingUtils.createMavenVersionString(buildProperties);
- systemProperties.setProperty("maven.build.version", mavenBuildVersion);
- }
-
- public static void addEnvVars(Properties props) {
- if (props != null) {
- boolean caseSensitive = Os.current() == Os.WINDOWS;
- for (Map.Entry entry : System.getenv().entrySet()) {
- String key = "env."
- + (caseSensitive ? entry.getKey() : entry.getKey().toUpperCase(Locale.ENGLISH));
- props.setProperty(key, entry.getValue());
- }
- }
- }
-
- private static void setCliProperty(String property, Properties properties) {
- String name;
-
- String value;
-
- int i = property.indexOf('=');
-
- if (i <= 0) {
- name = property.trim();
-
- value = "true";
- } else {
- name = property.substring(0, i).trim();
-
- value = property.substring(i + 1);
- }
-
- properties.setProperty(name, value);
-
- // ----------------------------------------------------------------------
- // I'm leaving the setting of system properties here as not to break
- // the SystemPropertyProfileActivator. This won't harm embedding. jvz.
- // ----------------------------------------------------------------------
-
- System.setProperty(name, value);
- }
-
- static class ExitException extends Exception {
- static final long serialVersionUID = 1L;
- int exitCode;
-
- ExitException(int exitCode) {
- this.exitCode = exitCode;
- }
- }
-
- //
- // Customizations available via the CLI
- //
-
- protected TransferListener createTransferListener(CliRequest cliRequest) {
- if (cliRequest.quiet || cliRequest.commandLine.hasOption(CLIManager.NO_TRANSFER_PROGRESS)) {
- return new QuietMavenTransferListener();
- } else if (cliRequest.request.isInteractiveMode() && !cliRequest.commandLine.hasOption(CLIManager.LOG_FILE)) {
- //
- // If we're logging to a file then we don't want the console transfer listener as it will spew
- // download progress all over the place
- //
- return getConsoleTransferListener();
- } else {
- return getBatchTransferListener();
- }
- }
-
- protected TransferListener getConsoleTransferListener() {
- return new DaemonMavenTransferListener(buildEventListener, new Slf4jMavenTransferListener());
- }
-
- protected TransferListener getBatchTransferListener() {
- return new Slf4jMavenTransferListener();
- }
-
- protected ModelProcessor createModelProcessor(PlexusContainer container) throws ComponentLookupException {
- return container.lookup(ModelProcessor.class);
- }
-}
diff --git a/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCache.java b/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCache.java
deleted file mode 100644
index 8d7d20eab..000000000
--- a/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCache.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.project;
-
-import java.util.Objects;
-
-import org.apache.maven.model.building.ModelCache;
-
-public class SnapshotModelCache implements ModelCache {
-
- private final ModelCache globalCache;
- private final ModelCache reactorCache;
-
- public SnapshotModelCache(ModelCache globalCache, ModelCache reactorCache) {
- this.globalCache = Objects.requireNonNull(globalCache);
- this.reactorCache = Objects.requireNonNull(reactorCache);
- }
-
- @Override
- public void put(String groupId, String artifactId, String version, String tag, Object data) {
- getDelegate(version).put(groupId, artifactId, version, tag, data);
- }
-
- @Override
- public Object get(String groupId, String artifactId, String version, String tag) {
- return getDelegate(version).get(groupId, artifactId, version, tag);
- }
-
- private ModelCache getDelegate(String version) {
- return version.contains("SNAPSHOT") || version.contains("${") ? reactorCache : globalCache;
- }
-}
diff --git a/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java b/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java
deleted file mode 100644
index abb49f504..000000000
--- a/daemon-m39/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.project;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.apache.maven.model.building.ModelCache;
-import org.apache.maven.repository.internal.DefaultModelCacheFactory;
-import org.apache.maven.repository.internal.ModelCacheFactory;
-import org.eclipse.aether.DefaultRepositoryCache;
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.sisu.Priority;
-
-import static org.mvndaemon.mvnd.common.Environment.MVND_NO_MODEL_CACHE;
-
-@Singleton
-@Named
-@Priority(10)
-public class SnapshotModelCacheFactory implements ModelCacheFactory {
-
- private final ModelCacheFactory factory;
- private final ModelCache globalCache;
-
- @Inject
- public SnapshotModelCacheFactory(DefaultModelCacheFactory factory) {
- this.factory = factory;
- DefaultRepositorySystemSession session = new DefaultRepositorySystemSession();
- session.setCache(new DefaultRepositoryCache());
- this.globalCache = factory.createCache(session);
- }
-
- @Override
- public ModelCache createCache(RepositorySystemSession session) {
- boolean noModelCache =
- Boolean.parseBoolean(MVND_NO_MODEL_CACHE.asOptional().orElse(MVND_NO_MODEL_CACHE.getDefault()));
- ModelCache reactorCache = factory.createCache(session);
- ModelCache globalCache = noModelCache ? reactorCache : this.globalCache;
- return new SnapshotModelCache(globalCache, reactorCache);
- }
-}
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java b/daemon-m39/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
deleted file mode 100644
index 0d8b924f2..000000000
--- a/daemon-m39/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.mvndaemon.mvnd.cache.invalidating;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.DefaultPluginDescriptorCache;
-import org.apache.maven.plugin.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.PluginDescriptorParsingException;
-import org.apache.maven.plugin.PluginResolutionException;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.sisu.Priority;
-import org.mvndaemon.mvnd.cache.Cache;
-import org.mvndaemon.mvnd.cache.CacheFactory;
-import org.mvndaemon.mvnd.cache.CacheRecord;
-
-@Singleton
-@Named
-@Priority(10)
-public class InvalidatingPluginDescriptorCache extends DefaultPluginDescriptorCache {
-
- protected static class Record implements CacheRecord {
-
- private final PluginDescriptor descriptor;
-
- public Record(PluginDescriptor descriptor) {
- this.descriptor = descriptor;
- }
-
- @Override
- public Stream getDependencyPaths() {
- return Optional.ofNullable(descriptor.getArtifacts()).orElse(Collections.emptyList()).stream()
- .map(artifact -> artifact.getFile().toPath());
- }
-
- @Override
- public void invalidate() {
- ClassRealm realm = descriptor.getClassRealm();
- if (realm == null) {
- return;
- }
- try {
- realm.getWorld().disposeRealm(realm.getId());
- } catch (NoSuchRealmException e) {
- // ignore
- }
- }
- }
-
- final Cache cache;
-
- @Inject
- public InvalidatingPluginDescriptorCache(CacheFactory cacheFactory) {
- this.cache = cacheFactory.newCache();
- }
-
- @Override
- public Key createKey(Plugin plugin, List repositories, RepositorySystemSession session) {
- return super.createKey(plugin, repositories, session);
- }
-
- @Override
- public PluginDescriptor get(Key key) {
- Record r = cache.get(key);
- return r != null ? clone(r.descriptor) : null;
- }
-
- @Override
- public PluginDescriptor get(Key key, PluginDescriptorSupplier supplier)
- throws PluginDescriptorParsingException, PluginResolutionException, InvalidPluginDescriptorException {
- try {
- Record r = cache.computeIfAbsent(key, k -> {
- try {
- return new Record(clone(supplier.load()));
- } catch (PluginDescriptorParsingException
- | PluginResolutionException
- | InvalidPluginDescriptorException e) {
- throw new RuntimeException(e);
- }
- });
- return clone(r.descriptor);
- } catch (RuntimeException e) {
- if (e.getCause() instanceof PluginDescriptorParsingException) {
- throw (PluginDescriptorParsingException) e.getCause();
- }
- if (e.getCause() instanceof PluginResolutionException) {
- throw (PluginResolutionException) e.getCause();
- }
- if (e.getCause() instanceof InvalidPluginDescriptorException) {
- throw (InvalidPluginDescriptorException) e.getCause();
- }
- throw e;
- }
- }
-
- @Override
- public void put(Key key, PluginDescriptor descriptor) {
- cache.put(key, new Record(clone(descriptor)));
- }
-
- @Override
- public void flush() {
- cache.clear();
- }
-}
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java b/daemon-m39/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
deleted file mode 100644
index 19c73f9b4..000000000
--- a/daemon-m39/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.mvndaemon.mvnd.plugin;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.maven.plugin.version.PluginVersionRequest;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.apache.maven.plugin.version.PluginVersionResolver;
-import org.apache.maven.plugin.version.PluginVersionResult;
-import org.apache.maven.plugin.version.internal.DefaultPluginVersionResolver;
-import org.eclipse.aether.SessionData;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.sisu.Priority;
-import org.eclipse.sisu.Typed;
-
-@Named
-@Singleton
-@Priority(10)
-@Typed(PluginVersionResolver.class)
-public class CachingPluginVersionResolver extends DefaultPluginVersionResolver {
-
- private static final Object CACHE_KEY = new Object();
-
- @Override
- public PluginVersionResult resolve(PluginVersionRequest request) throws PluginVersionResolutionException {
- Map cache =
- getCache(request.getRepositorySession().getData());
- String key = getKey(request);
- PluginVersionResult result = cache.get(key);
- if (result == null) {
- result = super.resolve(request);
- cache.putIfAbsent(key, result);
- }
- return result;
- }
-
- @SuppressWarnings("unchecked")
- private Map getCache(SessionData data) {
- Map cache = (Map) data.get(CACHE_KEY);
- while (cache == null) {
- cache = new ConcurrentHashMap<>(256);
- if (data.set(CACHE_KEY, null, cache)) {
- break;
- }
- cache = (Map) data.get(CACHE_KEY);
- }
- return cache;
- }
-
- private static String getKey(PluginVersionRequest request) {
- return Stream.concat(
- Stream.of(request.getGroupId(), request.getArtifactId()),
- request.getRepositories().stream().map(RemoteRepository::getId))
- .collect(Collectors.joining(":"));
- }
-}
diff --git a/daemon-m40/pom.xml b/daemon-m40/pom.xml
deleted file mode 100644
index 490871a2e..000000000
--- a/daemon-m40/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
- 4.0.0
-
- org.apache.maven.daemon
- mvnd
- 1.0-m9-SNAPSHOT
-
-
- mvnd-daemon-m40
-
- jar
- Maven Daemon - Daemon 4.0.x specifics
-
-
-
- org.apache.maven
- maven-core
- ${maven4.version}
-
-
- org.apache.maven
- maven-embedder
- ${maven4.version}
-
-
- org.apache.maven.daemon
- mvnd-daemon
-
-
-
-
-
-
- org.eclipse.sisu
- sisu-maven-plugin
-
-
-
-
-
diff --git a/daemon-m40/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java b/daemon-m40/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
deleted file mode 100644
index 805866e51..000000000
--- a/daemon-m40/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.mvndaemon.mvnd.cache.invalidating;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.DefaultPluginRealmCache;
-import org.apache.maven.plugin.PluginContainerException;
-import org.apache.maven.plugin.PluginResolutionException;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
-import org.eclipse.sisu.Priority;
-import org.mvndaemon.mvnd.cache.Cache;
-import org.mvndaemon.mvnd.cache.CacheFactory;
-
-@Singleton
-@Named
-@Priority(10)
-public class InvalidatingPluginRealmCache extends DefaultPluginRealmCache {
-
- protected static class Record implements org.mvndaemon.mvnd.cache.CacheRecord {
-
- final CacheRecord record;
-
- public Record(CacheRecord record) {
- this.record = record;
- }
-
- @Override
- public Stream getDependencyPaths() {
- return record.getArtifacts().stream()
- .map(artifact -> artifact.getFile().toPath());
- }
-
- @Override
- public void invalidate() {
- ClassRealm realm = record.getRealm();
- try {
- realm.getWorld().disposeRealm(realm.getId());
- } catch (NoSuchRealmException e) {
- // ignore
- }
- }
- }
-
- final Cache cache;
-
- @Inject
- public InvalidatingPluginRealmCache(CacheFactory cacheFactory) {
- cache = cacheFactory.newCache();
- }
-
- @Override
- public CacheRecord get(Key key) {
- Record r = cache.get(key);
- return r != null ? r.record : null;
- }
-
- @Override
- public CacheRecord get(Key key, PluginRealmSupplier supplier)
- throws PluginResolutionException, PluginContainerException {
- try {
- Record r = cache.computeIfAbsent(key, k -> {
- try {
- return new Record(supplier.load());
- } catch (PluginResolutionException | PluginContainerException e) {
- throw new RuntimeException(e);
- }
- });
- return r.record;
- } catch (RuntimeException e) {
- if (e.getCause() instanceof PluginResolutionException) {
- throw (PluginResolutionException) e.getCause();
- }
- if (e.getCause() instanceof PluginContainerException) {
- throw (PluginContainerException) e.getCause();
- }
- throw e;
- }
- }
-
- @Override
- public CacheRecord put(Key key, ClassRealm pluginRealm, List pluginArtifacts) {
- CacheRecord record = super.put(key, pluginRealm, pluginArtifacts);
- super.cache.remove(key);
- cache.put(key, new Record(record));
- return record;
- }
-
- @Override
- public void flush() {
- cache.clear();
- }
-
- @Override
- public void register(MavenProject project, Key key, CacheRecord record) {}
-}
diff --git a/daemon-m40/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java b/daemon-m40/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java
deleted file mode 100644
index e69da0a0b..000000000
--- a/daemon-m40/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.mvndaemon.mvnd.cache.invalidating;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
-import java.nio.file.PathMatcher;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.eventspy.AbstractEventSpy;
-import org.apache.maven.eventspy.EventSpy;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.project.MavenProject;
-import org.eclipse.sisu.Typed;
-import org.mvndaemon.mvnd.common.Environment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Named
-@Singleton
-@Typed(EventSpy.class)
-public class InvalidatingRealmCacheEventSpy extends AbstractEventSpy {
-
- private static final Logger LOG = LoggerFactory.getLogger(InvalidatingRealmCacheEventSpy.class);
-
- private final InvalidatingPluginRealmCache pluginCache;
- private final InvalidatingExtensionRealmCache extensionCache;
- private final InvalidatingProjectArtifactsCache projectArtifactsCache;
- private Path multiModuleProjectDirectory;
- private String pattern;
- private PathMatcher matcher;
-
- @Inject
- public InvalidatingRealmCacheEventSpy(
- InvalidatingPluginRealmCache cache,
- InvalidatingExtensionRealmCache extensionCache,
- InvalidatingProjectArtifactsCache projectArtifactsCache) {
- this.pluginCache = cache;
- this.extensionCache = extensionCache;
- this.projectArtifactsCache = projectArtifactsCache;
- }
-
- @Override
- public void onEvent(Object event) throws Exception {
- try {
- if (event instanceof MavenExecutionRequest) {
- /* Store the multiModuleProjectDirectory path */
- multiModuleProjectDirectory = ((MavenExecutionRequest) event)
- .getMultiModuleProjectDirectory()
- .toPath();
- pattern = Environment.MVND_PLUGIN_REALM_EVICT_PATTERN
- .asOptional()
- .orElse(Environment.MVND_PLUGIN_REALM_EVICT_PATTERN.getDefault());
- if (!pattern.isEmpty()) {
- String[] patterns = pattern.split(",");
- List matchers = new ArrayList<>();
- for (String pattern : patterns) {
- if (pattern.startsWith("mvn:")) {
- String[] parts = pattern.substring("mvn:".length()).split(":");
- String groupId, artifactId, version;
- if (parts.length >= 3) {
- version = parts[2];
- } else {
- version = "*";
- }
- if (parts.length >= 2) {
- groupId = parts[0];
- artifactId = parts[1];
- } else {
- groupId = "*";
- artifactId = parts[0];
- }
- pattern = "glob:**/" + ("*".equals(groupId) ? "" : groupId.replace('.', '/') + "/")
- + artifactId + "/" + ("*".equals(version) ? "**" : version + "/**");
- }
- matchers.add(getPathMatcher(pattern));
- }
- if (matchers.size() == 1) {
- matcher = matchers.iterator().next();
- } else {
- matcher = path -> matchers.stream().anyMatch(f -> f.matches(path));
- }
- }
- } else if (event instanceof MavenExecutionResult) {
- /* Evict the entries referring to jars under multiModuleProjectDirectory */
- pluginCache.cache.removeIf(this::shouldEvict);
- extensionCache.cache.removeIf(this::shouldEvict);
- MavenExecutionResult mer = (MavenExecutionResult) event;
- List projects = mer.getTopologicallySortedProjects();
- projectArtifactsCache.cache.removeIf(
- (k, r) -> shouldEvict(projects, (InvalidatingProjectArtifactsCache.CacheKey) k, r));
- }
- } catch (Exception e) {
- LOG.warn("Could not notify CliPluginRealmCache", e);
- }
- }
-
- private boolean shouldEvict(
- List projects,
- InvalidatingProjectArtifactsCache.CacheKey k,
- InvalidatingProjectArtifactsCache.Record v) {
- return projects.stream().anyMatch(p -> k.matches(p.getGroupId(), p.getArtifactId(), p.getVersion()));
- }
-
- private boolean shouldEvict(InvalidatingPluginRealmCache.Key k, InvalidatingPluginRealmCache.Record v) {
- try {
- for (URL url : v.record.getRealm().getURLs()) {
- if (url.getProtocol().equals("file")) {
- final Path path = Paths.get(url.toURI());
- if (path.startsWith(multiModuleProjectDirectory)) {
- LOG.debug(
- "Removing PluginRealmCache entry {} because it refers to an artifact in the build tree {}",
- k,
- path);
- return true;
- } else if (matcher != null && matcher.matches(path)) {
- LOG.debug(
- "Removing PluginRealmCache entry {} because its components {} matches the eviction pattern '{}'",
- k,
- path,
- pattern);
- return true;
- }
- }
- }
- return false;
- } catch (URISyntaxException e) {
- return true;
- }
- }
-
- private boolean shouldEvict(InvalidatingExtensionRealmCache.Key k, InvalidatingExtensionRealmCache.Record v) {
- try {
- for (URL url : v.record.getRealm().getURLs()) {
- if (url.getProtocol().equals("file")) {
- final Path path = Paths.get(url.toURI());
- if (path.startsWith(multiModuleProjectDirectory)) {
- LOG.debug(
- "Removing ExtensionRealmCache entry {} because it refers to an artifact in the build tree {}",
- k,
- path);
- return true;
- } else if (matcher != null && matcher.matches(path)) {
- LOG.debug(
- "Removing ExtensionRealmCache entry {} because its components {} matches the eviction pattern '{}'",
- k,
- path,
- pattern);
- return true;
- }
- }
- }
- return false;
- } catch (URISyntaxException e) {
- return true;
- }
- }
-
- private static PathMatcher getPathMatcher(String pattern) {
- if (!pattern.startsWith("glob:") && !pattern.startsWith("regex:")) {
- pattern = "glob:" + pattern;
- }
- return FileSystems.getDefault().getPathMatcher(pattern);
- }
-}
diff --git a/daemon/pom.xml b/daemon/pom.xml
index 4901475a6..6f3766b9b 100644
--- a/daemon/pom.xml
+++ b/daemon/pom.xml
@@ -22,7 +22,7 @@
org.apache.maven.daemon
mvnd
- 1.0-m9-SNAPSHOT
+ 2.0-SNAPSHOT
mvnd-daemon
@@ -32,7 +32,7 @@
-
+
@@ -54,6 +54,10 @@
org.apache.maven.daemon
mvnd-logging
+
+ org.apache.maven
+ maven-core
+
org.apache.maven
maven-embedder
diff --git a/daemon-m40/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
similarity index 100%
rename from daemon-m40/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
rename to daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
diff --git a/daemon-m40/src/main/java/org/apache/maven/project/SnapshotModelCache.java b/daemon/src/main/java/org/apache/maven/project/SnapshotModelCache.java
similarity index 100%
rename from daemon-m40/src/main/java/org/apache/maven/project/SnapshotModelCache.java
rename to daemon/src/main/java/org/apache/maven/project/SnapshotModelCache.java
diff --git a/daemon-m40/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java b/daemon/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java
similarity index 100%
rename from daemon-m40/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java
rename to daemon/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java
diff --git a/daemon-m40/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java b/daemon/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
similarity index 100%
rename from daemon-m40/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
rename to daemon/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
diff --git a/daemon-m40/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
similarity index 100%
rename from daemon-m40/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
similarity index 100%
rename from daemon-m39/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java
similarity index 100%
rename from daemon-m39/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionAnalyzer.java b/daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionAnalyzer.java
similarity index 100%
rename from daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionAnalyzer.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionAnalyzer.java
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionData.java b/daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionData.java
similarity index 100%
rename from daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionData.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionData.java
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionDataRepository.java b/daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionDataRepository.java
similarity index 100%
rename from daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionDataRepository.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionDataRepository.java
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionPersistenceException.java b/daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionPersistenceException.java
similarity index 100%
rename from daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionPersistenceException.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionPersistenceException.java
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionAnalyzer.java b/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionAnalyzer.java
similarity index 100%
rename from daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionAnalyzer.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionAnalyzer.java
diff --git a/daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionDataRepository.java b/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionDataRepository.java
similarity index 100%
rename from daemon-m39/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionDataRepository.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionDataRepository.java
diff --git a/daemon-m40/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
similarity index 100%
rename from daemon-m40/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
diff --git a/dist-m39/src/main/provisio/maven-distro.xml b/dist-m39/src/main/provisio/maven-distro.xml
deleted file mode 100644
index caa8d6edc..000000000
--- a/dist-m39/src/main/provisio/maven-distro.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- NOTICE.txt
- LICENSE.txt
- README.adoc
-
-
-
-
- mvnd
- mvnd.exe
-
-
- platform-${os.detected.name}-${os.detected.arch}
-
-
-
-
-
-
-
-
diff --git a/dist-m40/pom.xml b/dist-m40/pom.xml
deleted file mode 100644
index 5c1549284..000000000
--- a/dist-m40/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
- 4.0.0
-
- org.apache.maven.daemon
- mvnd
- 1.0-m9-SNAPSHOT
-
-
- mvnd-dist-m40
-
- pom
- Maven Daemon - Distribution for 4.0.x
-
-
- 11
- 11
-
-
-
-
- org.apache.maven.daemon
- mvnd-agent
-
-
- org.apache.maven.daemon
- mvnd-helper-agent
-
-
- org.apache.maven.daemon
- mvnd-client
-
-
- org.apache.maven.daemon
- mvnd-daemon
-
-
- org.apache.maven.daemon
- mvnd-daemon-m40
-
-
-
-
-
-
- ca.vanzyl.provisio.maven.plugins
- provisio-maven-plugin
-
-
- maven-distro
-
- provision
-
- package
-
- ${project.build.directory}/maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}
-
-
-
-
-
-
-
-
diff --git a/dist-m39/pom.xml b/dist/pom.xml
similarity index 86%
rename from dist-m39/pom.xml
rename to dist/pom.xml
index 8627f5aed..af840c93d 100644
--- a/dist-m39/pom.xml
+++ b/dist/pom.xml
@@ -22,13 +22,13 @@
org.apache.maven.daemon
mvnd
- 1.0-m9-SNAPSHOT
+ 2.0-SNAPSHOT
- mvnd-dist-m39
+ mvnd-dist
pom
- Maven Daemon - Distribution for 3.9.x
+ Maven Daemon - Distribution
11
@@ -52,10 +52,6 @@
org.apache.maven.daemon
mvnd-daemon
-
- org.apache.maven.daemon
- mvnd-daemon-m39
-
@@ -71,7 +67,7 @@
package
- ${project.build.directory}/maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}
+ ${project.build.directory}/maven-mvnd-${project.version}-${os.detected.name}-${os.detected.arch}
diff --git a/dist-m40/src/main/provisio/maven-distro.xml b/dist/src/main/provisio/maven-distro.xml
similarity index 90%
rename from dist-m40/src/main/provisio/maven-distro.xml
rename to dist/src/main/provisio/maven-distro.xml
index 0faf498f3..29e23b5fa 100644
--- a/dist-m40/src/main/provisio/maven-distro.xml
+++ b/dist/src/main/provisio/maven-distro.xml
@@ -18,7 +18,7 @@
-
+
@@ -43,9 +43,6 @@
-
-
-
@@ -90,10 +87,10 @@
-
-
diff --git a/helper/pom.xml b/helper/pom.xml
index 6722dea3e..bf47c5297 100644
--- a/helper/pom.xml
+++ b/helper/pom.xml
@@ -22,7 +22,7 @@
org.apache.maven.daemon
mvnd
- 1.0-m9-SNAPSHOT
+ 2.0-SNAPSHOT
mvnd-helper-agent
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 12f20a9c9..d07ea6f74 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -22,7 +22,7 @@
org.apache.maven.daemon
mvnd
- 1.0-m9-SNAPSHOT
+ 2.0-SNAPSHOT
mvnd-integration-tests
@@ -32,8 +32,7 @@
11
11
- ${project.basedir}/../dist-m39/target/maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}
- ${project.basedir}/../dist-m40/target/maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}
+ ${project.basedir}/../dist/target/maven-mvnd-${project.version}-${os.detected.name}-${os.detected.arch}
org/apache/maven/surefire/surefire-providers/${surefire.version}
org/apache/maven/surefire/surefire-junit-platform/${surefire.version}
org/junit/platform/junit-platform-launcher/${junit-platform-launcher.version}
@@ -58,19 +57,7 @@
org.apache.maven.daemon
- mvnd-dist-m39
- pom
- test
-
-
- org.slf4j
- slf4j-simple
-
-
-
-
- org.apache.maven.daemon
- mvnd-dist-m40
+ mvnd-dist
pom
test
@@ -130,25 +117,7 @@
test
- ${mvnd.m39.home}
- ${project.version}
- ${mrm.repository.url}
- ${os.detected.name}
- ${os.detected.arch}
- ${settings.localRepository}
- ${preinstall.artifacts}
-
-
-
-
- mvn-40
-
- test
-
- test
-
-
- ${mvnd.m40.home}
+ ${mvnd.home}
${project.version}
${mrm.repository.url}
${os.detected.name}
@@ -235,25 +204,7 @@
${project.version}
- ${mvnd.m39.home}
- ${mrm.repository.url}
- ${os.detected.name}
- ${os.detected.arch}
- ${settings.localRepository}
- ${preinstall.artifacts}
-
-
-
-
- native-40
-
- integration-test
- verify
-
-
-
- ${project.version}
- ${mvnd.m40.home}
+ ${mvnd.home}
${mrm.repository.url}
${os.detected.name}
${os.detected.arch}
diff --git a/logging/pom.xml b/logging/pom.xml
index acf3b3eac..d895072c4 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -22,7 +22,7 @@
org.apache.maven.daemon
mvnd
- 1.0-m9-SNAPSHOT
+ 2.0-SNAPSHOT
mvnd-logging
@@ -76,7 +76,7 @@
org.apache.maven
maven-slf4j-wrapper
- ${maven4.version}
+ ${maven.version}
sources
diff --git a/logging/src/main/java/org/mvndaemon/mvnd/logging/smart/LoggingExecutionListener.java b/logging/src/main/java/org/mvndaemon/mvnd/logging/smart/LoggingExecutionListener.java
index eccd2ba78..233796f91 100644
--- a/logging/src/main/java/org/mvndaemon/mvnd/logging/smart/LoggingExecutionListener.java
+++ b/logging/src/main/java/org/mvndaemon/mvnd/logging/smart/LoggingExecutionListener.java
@@ -29,11 +29,9 @@
import org.apache.maven.execution.ProjectExecutionListener;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.internal.ReactorBuildStatus;
-import org.eclipse.sisu.Typed;
@Singleton
@Named
-@Typed({LoggingExecutionListener.class, ExecutionListener.class, ProjectExecutionListener.class})
public class LoggingExecutionListener implements ExecutionListener, ProjectExecutionListener {
private ExecutionListener delegate;
diff --git a/native/pom.xml b/native/pom.xml
index f8f1626ab..09de6019e 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -20,7 +20,7 @@
org.apache.maven.daemon
mvnd
- 1.0-m9-SNAPSHOT
+ 2.0-SNAPSHOT
mvnd-native
diff --git a/pom.xml b/pom.xml
index e7cf0800f..0e6152860 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
org.apache.maven.daemon
mvnd
- 1.0-m9-SNAPSHOT
+ 2.0-SNAPSHOT
pom
Maven Daemon - Parent
@@ -52,10 +52,7 @@
client
logging
daemon
- daemon-m39
- daemon-m40
- dist-m39
- dist-m40
+ dist
integration-tests
@@ -68,10 +65,9 @@
UTF-8
- 8
- 8
- 8
- 2023-10-26T05:45:19Z
+ 17
+ 17
+ 2024-04-23T19:44:34Z
false
apache/maven-mvnd
github.com:${project.github.repository}
@@ -88,8 +84,6 @@
2.4.1
3.25.1
4.0.0-alpha-8
- 3.9.6
- ${maven.version}
1.9.18
1.7.36
@@ -157,6 +151,11 @@
maven-model
${maven.version}
+
+ org.apache.maven
+ maven-core
+ ${maven.version}
+
org.apache.maven
maven-embedder
@@ -241,13 +240,7 @@
org.apache.maven.daemon
- mvnd-dist-m39
- ${project.version}
- pom
-
-
- org.apache.maven.daemon
- mvnd-dist-m40
+ mvnd-dist
${project.version}
pom
@@ -256,16 +249,6 @@
mvnd-daemon
${project.version}
-
- org.apache.maven.daemon
- mvnd-daemon-m39
- ${project.version}
-
-
- org.apache.maven.daemon
- mvnd-daemon-m40
- ${project.version}
-
org.apache.maven.daemon
mvnd-helper-agent
@@ -457,7 +440,7 @@
maven-enforcer-plugin
- enforce-maven-3
+ enforce-bytecode-version
enforce
@@ -466,6 +449,18 @@
3.5.4
+
+ [17,)
+
+
+ ${maven.compiler.release}
+
+ test
+
+
+ org.jline:jline
+
+
true