Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven4 for openSUSE:Factory checked in at 2026-05-09 13:00:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven4 (Old) and /work/SRC/openSUSE:Factory/.maven4.new.1966 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven4" Sat May 9 13:00:17 2026 rev:8 rq:1352172 version:4.0.0~rc5 Changes: -------- --- /work/SRC/openSUSE:Factory/maven4/maven4-bootstrap.changes 2026-02-13 16:13:34.917293307 +0100 +++ /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4-bootstrap.changes 2026-05-09 13:01:03.092134419 +0200 @@ -1,0 +2,7 @@ +Sat May 9 05:12:20 UTC 2026 - Fridrich Strba <[email protected]> + +- Added patch: + * maven4-resolver2017.patch + + Fix build with maven-resolver 2.0.17 + +------------------------------------------------------------------- maven4-testing.changes: same change maven4.changes: same change New: ---- maven4-resolver2017.patch ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.maven4.new.1966/maven4-bootstrap.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4-bootstrap.changes: * maven4-resolver2017.patch /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4-bootstrap.changes- + Fix build with maven-resolver 2.0.17 -- /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4-testing.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4-testing.changes: * maven4-resolver2017.patch /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4-testing.changes- + Fix build with maven-resolver 2.0.17 -- /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4.changes: * maven4-resolver2017.patch /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4.changes- + Fix build with maven-resolver 2.0.17 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven4-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.QtsdHp/_old 2026-05-09 13:01:05.252223055 +0200 +++ /var/tmp/diff_new_pack.QtsdHp/_new 2026-05-09 13:01:05.256223219 +0200 @@ -38,6 +38,7 @@ Patch3: 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch Patch4: 0001-Fix-a-ConcurrentModificationException-11429.patch Patch5: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch +Patch6: maven4-resolver2017.patch BuildRequires: ant BuildRequires: java-devel >= 17 BuildRequires: javapackages-local @@ -62,6 +63,7 @@ %patch -P 3 -p1 %patch -P 4 -p1 %patch -P 5 -p1 +%patch -P 6 -p1 %pom_remove_dep -r :junit-bom %pom_remove_dep -r :mockito-bom ++++++ maven4-testing.spec ++++++ --- /var/tmp/diff_new_pack.QtsdHp/_old 2026-05-09 13:01:05.316225681 +0200 +++ /var/tmp/diff_new_pack.QtsdHp/_new 2026-05-09 13:01:05.324226009 +0200 @@ -38,6 +38,7 @@ Patch3: 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch Patch4: 0001-Fix-a-ConcurrentModificationException-11429.patch Patch5: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch +Patch6: maven4-resolver2017.patch BuildRequires: ant BuildRequires: apiguardian BuildRequires: fdupes @@ -82,6 +83,7 @@ %patch -P 3 -p1 %patch -P 4 -p1 %patch -P 5 -p1 +%patch -P 6 -p1 %pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4 %pom_xpath_set pom:project/pom:properties/pom:resolverVersion 2 ++++++ maven4.spec ++++++ --- /var/tmp/diff_new_pack.QtsdHp/_old 2026-05-09 13:01:05.400229128 +0200 +++ /var/tmp/diff_new_pack.QtsdHp/_new 2026-05-09 13:01:05.400229128 +0200 @@ -40,6 +40,7 @@ Patch3: 0001-Maven-4.0.x-w-Resolver-2.0.14-SNAPSHOT-11530.patch Patch4: 0001-Fix-a-ConcurrentModificationException-11429.patch Patch5: 0002-Fix-field-accessibility-leak-in-EnhancedCompositeBea.patch +Patch6: maven4-resolver2017.patch BuildRequires: ant BuildRequires: aopalliance BuildRequires: apache-commons-cli @@ -191,6 +192,7 @@ %patch -P 3 -p1 %patch -P 4 -p1 %patch -P 5 -p1 +%patch -P 6 -p1 %pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4 %pom_xpath_set pom:project/pom:properties/pom:resolverVersion 2 ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.QtsdHp/_old 2026-05-09 13:01:05.560235693 +0200 +++ /var/tmp/diff_new_pack.QtsdHp/_new 2026-05-09 13:01:05.564235857 +0200 @@ -1,6 +1,6 @@ -mtime: 1770924705 -commit: 800e5c2465fd0f2310fff1e8445d52c5f5b08fb32fdc7b8288f8013d92cda487 -url: https://src.opensuse.org/java-packages/maven4.git -revision: 800e5c2465fd0f2310fff1e8445d52c5f5b08fb32fdc7b8288f8013d92cda487 +mtime: 1778303661 +commit: ca17a82eecbe8afdf2c061b56b1b043d2a9a3a800cc8b4f8090ba29aa2f55608 +url: https://src.opensuse.org/java-packages/maven4 +revision: ca17a82eecbe8afdf2c061b56b1b043d2a9a3a800cc8b4f8090ba29aa2f55608 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-05-09 07:14:21.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ maven4-resolver2017.patch ++++++ --- a/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java @@ -30,7 +30,7 @@ import org.apache.maven.artifact.repository.metadata.RepositoryMetadata; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; -import org.eclipse.aether.internal.impl.DefaultTrackingFileManager; +import org.eclipse.aether.internal.impl.LegacyTrackingFileManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -59,7 +59,7 @@ public void setUp() throws Exception { super.setUp(); updateCheckManager = new DefaultUpdateCheckManager( - new ConsoleLogger(Logger.LEVEL_DEBUG, "test"), new DefaultTrackingFileManager()); + new ConsoleLogger(Logger.LEVEL_DEBUG, "test"), new LegacyTrackingFileManager()); } @Test --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java @@ -37,6 +37,7 @@ import org.eclipse.aether.impl.LocalRepositoryProvider; import org.eclipse.aether.impl.MetadataGeneratorFactory; import org.eclipse.aether.impl.MetadataResolver; +import org.eclipse.aether.impl.NamedLockFactorySelector; import org.eclipse.aether.impl.OfflineController; import org.eclipse.aether.impl.RemoteRepositoryFilterManager; import org.eclipse.aether.impl.RemoteRepositoryManager; @@ -68,11 +69,11 @@ import org.eclipse.aether.internal.impl.DefaultRepositorySystem; import org.eclipse.aether.internal.impl.DefaultRepositorySystemLifecycle; import org.eclipse.aether.internal.impl.DefaultRepositorySystemValidator; -import org.eclipse.aether.internal.impl.DefaultTrackingFileManager; import org.eclipse.aether.internal.impl.DefaultTransporterProvider; import org.eclipse.aether.internal.impl.DefaultUpdateCheckManager; import org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer; import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory; +import org.eclipse.aether.internal.impl.LegacyTrackingFileManager; import org.eclipse.aether.internal.impl.LocalPathComposer; import org.eclipse.aether.internal.impl.LocalPathPrefixComposerFactory; import org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory; @@ -95,6 +96,7 @@ import org.eclipse.aether.internal.impl.filter.GroupIdRemoteRepositoryFilterSource; import org.eclipse.aether.internal.impl.filter.PrefixesLockingInhibitorFactory; import org.eclipse.aether.internal.impl.filter.PrefixesRemoteRepositoryFilterSource; +import org.eclipse.aether.internal.impl.named.DefaultNamedLockFactorySelector; import org.eclipse.aether.internal.impl.offline.OfflinePipelineRepositoryConnectorFactory; import org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory; import org.eclipse.aether.internal.impl.synccontext.named.NameMapper; @@ -189,7 +191,7 @@ static RepositoryKeyFunctionFactory newRepositoryKeyFunctionFactory() { @Singleton @Provides static TrackingFileManager newTrackingFileManager() { - return new DefaultTrackingFileManager(); + return new LegacyTrackingFileManager(); } @Singleton @@ -376,14 +378,20 @@ static LockingInhibitorFactory newPrefixesLockingInhibitorFactory() { return new PrefixesLockingInhibitorFactory(); } + @Singleton + @Provides + static NamedLockFactorySelector newNamedLockFactorySelector( + Map<String, NamedLockFactory> factories, RepositorySystemLifecycle lifecycle) { + return new DefaultNamedLockFactorySelector(factories, lifecycle); + } + @Singleton @Provides static NamedLockFactoryAdapterFactory newNamedLockFactoryAdapterFactory( - Map<String, NamedLockFactory> factories, + NamedLockFactorySelector namedLockFactorySelector, Map<String, NameMapper> nameMappers, - Map<String, LockingInhibitorFactory> lockingInhibitorFactories, - RepositorySystemLifecycle lifecycle) { - return new NamedLockFactoryAdapterFactoryImpl(factories, nameMappers, lockingInhibitorFactories, lifecycle); + Map<String, LockingInhibitorFactory> lockingInhibitorFactories) { + return new NamedLockFactoryAdapterFactoryImpl(namedLockFactorySelector, nameMappers, lockingInhibitorFactories); } @Singleton --- a/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java +++ b/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java @@ -70,6 +70,7 @@ import org.eclipse.aether.impl.LocalRepositoryProvider; import org.eclipse.aether.impl.MetadataGeneratorFactory; import org.eclipse.aether.impl.MetadataResolver; +import org.eclipse.aether.impl.NamedLockFactorySelector; import org.eclipse.aether.impl.OfflineController; import org.eclipse.aether.impl.RemoteRepositoryFilterManager; import org.eclipse.aether.impl.RemoteRepositoryManager; @@ -101,11 +102,11 @@ import org.eclipse.aether.internal.impl.DefaultRepositorySystem; import org.eclipse.aether.internal.impl.DefaultRepositorySystemLifecycle; import org.eclipse.aether.internal.impl.DefaultRepositorySystemValidator; -import org.eclipse.aether.internal.impl.DefaultTrackingFileManager; import org.eclipse.aether.internal.impl.DefaultTransporterProvider; import org.eclipse.aether.internal.impl.DefaultUpdateCheckManager; import org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer; import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory; +import org.eclipse.aether.internal.impl.LegacyTrackingFileManager; import org.eclipse.aether.internal.impl.LocalPathComposer; import org.eclipse.aether.internal.impl.LocalPathPrefixComposerFactory; import org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory; @@ -128,6 +129,7 @@ import org.eclipse.aether.internal.impl.filter.GroupIdRemoteRepositoryFilterSource; import org.eclipse.aether.internal.impl.filter.PrefixesLockingInhibitorFactory; import org.eclipse.aether.internal.impl.filter.PrefixesRemoteRepositoryFilterSource; +import org.eclipse.aether.internal.impl.named.DefaultNamedLockFactorySelector; import org.eclipse.aether.internal.impl.offline.OfflinePipelineRepositoryConnectorFactory; import org.eclipse.aether.internal.impl.resolution.TrustedChecksumsArtifactResolverPostProcessor; import org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory; @@ -245,7 +247,7 @@ public final TrackingFileManager getTrackingFileManager() { } protected TrackingFileManager createTrackingFileManager() { - return new DefaultTrackingFileManager(); + return new LegacyTrackingFileManager(); } private LocalPathComposer localPathComposer; @@ -419,6 +421,20 @@ protected Map<String, LockingInhibitorFactory> createLockingInhibitorFactories() return result; } + private NamedLockFactorySelector namedLockFactorySelector; + + public final NamedLockFactorySelector getNamedLockFactorySelector() { + checkClosed(); + if (namedLockFactorySelector == null) { + namedLockFactorySelector = createNamedLockFactorySelector(); + } + return namedLockFactorySelector; + } + + protected NamedLockFactorySelector createNamedLockFactorySelector() { + return new DefaultNamedLockFactorySelector(getNamedLockFactories(), getRepositorySystemLifecycle()); + } + private NamedLockFactoryAdapterFactory namedLockFactoryAdapterFactory; public final NamedLockFactoryAdapterFactory getNamedLockFactoryAdapterFactory() { @@ -431,10 +447,7 @@ public final NamedLockFactoryAdapterFactory getNamedLockFactoryAdapterFactory() protected NamedLockFactoryAdapterFactory createNamedLockFactoryAdapterFactory() { return new NamedLockFactoryAdapterFactoryImpl( - getNamedLockFactories(), - getNameMappers(), - getLockingInhibitorFactories(), - getRepositorySystemLifecycle()); + getNamedLockFactorySelector(), getNameMappers(), getLockingInhibitorFactories()); } private SyncContextFactory syncContextFactory;
