This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch remove-daemon-named-lock-override in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit cd1e9c81ed52d1577c3a7fca4e016d9af8b84604 Author: Guillaume Nodet <[email protected]> AuthorDate: Tue Mar 17 06:07:45 2026 +0100 Remove DaemonNamedLockFactoryAdapterFactoryImpl This class existed to override Maven Resolver's default named lock factory and name mapper to file-lock + file-gav. Since resolver 2.0.0, these are already the defaults, making this override a no-op. Removing it eliminates the dependency on resolver internal classes (org.eclipse.aether.internal.impl.synccontext.named.*), which broke when the constructor signature changed in resolver 2.0.14. This unblocks upgrading maven-resolver-impl (PR #1538). Co-Authored-By: Claude Opus 4.6 <[email protected]> --- .../DaemonNamedLockFactoryAdapterFactoryImpl.java | 50 ---------------------- 1 file changed, 50 deletions(-) diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/syncontext/DaemonNamedLockFactoryAdapterFactoryImpl.java b/daemon/src/main/java/org/mvndaemon/mvnd/syncontext/DaemonNamedLockFactoryAdapterFactoryImpl.java deleted file mode 100644 index 0f65e97c..00000000 --- a/daemon/src/main/java/org/mvndaemon/mvnd/syncontext/DaemonNamedLockFactoryAdapterFactoryImpl.java +++ /dev/null @@ -1,50 +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.syncontext; - -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - -import java.util.Map; - -import org.eclipse.aether.impl.RepositorySystemLifecycle; -import org.eclipse.aether.internal.impl.synccontext.named.NameMapper; -import org.eclipse.aether.internal.impl.synccontext.named.NameMappers; -import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapterFactoryImpl; -import org.eclipse.aether.named.NamedLockFactory; -import org.eclipse.aether.named.providers.FileLockNamedLockFactory; -import org.eclipse.sisu.Priority; - -/** - * Mvnd named lock factory implementation: it differs from - * {@link org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapterFactoryImpl} only by default values. - */ -@Singleton -@Named -@Priority(10) -public final class DaemonNamedLockFactoryAdapterFactoryImpl extends NamedLockFactoryAdapterFactoryImpl { - @Inject - public DaemonNamedLockFactoryAdapterFactoryImpl( - final Map<String, NamedLockFactory> factories, - final Map<String, NameMapper> nameMappers, - final RepositorySystemLifecycle lifecycle) { - super(factories, FileLockNamedLockFactory.NAME, nameMappers, NameMappers.FILE_GAV_NAME, lifecycle); - } -}
