From 5456b9fee0c6cf7ce585e344e3cc150ed0981bad Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Thu, 18 Jun 2020 23:01:26 +0200 Subject: Removing sisu bridge from maven projects --- .../org/apache/archiva/webdav/ArchivaDavResourceFactory.java | 2 -- .../apache/archiva/webdav/ArchivaDavResourceFactoryTest.java | 10 ++-------- .../archiva/webdav/UnauthenticatedDavResourceFactory.java | 5 +---- 3 files changed, 3 insertions(+), 14 deletions(-) (limited to 'archiva-modules/archiva-web/archiva-webdav') diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index 3c10dcdd6..f3e8737e8 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -27,7 +27,6 @@ import org.apache.archiva.checksum.ChecksumUtil; import org.apache.archiva.checksum.StreamingChecksum; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.filelock.FileLockManager; -import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.archiva.common.utils.PathUtil; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.configuration.ArchivaConfiguration; @@ -189,7 +188,6 @@ public class ArchivaDavResourceFactory @Inject public ArchivaDavResourceFactory( ApplicationContext applicationContext, ArchivaConfiguration archivaConfiguration ) - throws PlexusSisuBridgeException { this.archivaConfiguration = archivaConfiguration; this.applicationContext = applicationContext; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java index a1e30da1f..450a3b92e 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java @@ -28,8 +28,6 @@ import org.apache.archiva.admin.repository.DefaultRepositoryCommonValidator; import org.apache.archiva.admin.repository.group.DefaultRepositoryGroupAdmin; import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; import org.apache.archiva.common.filelock.FileLockManager; -import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; -import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.FileTypes; @@ -128,9 +126,6 @@ public class ArchivaDavResourceFactoryTest @Inject ApplicationContext applicationContext; - @Inject - PlexusSisuBridge plexusSisuBridge; - @Inject DefaultManagedRepositoryAdmin defaultManagedRepositoryAdmin; @@ -239,7 +234,7 @@ public class ArchivaDavResourceFactoryTest repoRequest = repoRequestControl.createMock( MavenRepositoryRequestInfo.class ); resourceFactory = - new OverridingArchivaDavResourceFactory( applicationContext, plexusSisuBridge, archivaConfiguration ); + new OverridingArchivaDavResourceFactory( applicationContext, archivaConfiguration ); resourceFactory.setArchivaConfiguration( archivaConfiguration ); proxyRegistry.getAllHandler().get(RepositoryType.MAVEN).clear(); proxyRegistry.getAllHandler().get(RepositoryType.MAVEN).add(new OverridingRepositoryProxyHandler(this)); @@ -728,9 +723,8 @@ public class ArchivaDavResourceFactoryTest extends ArchivaDavResourceFactory { - OverridingArchivaDavResourceFactory( ApplicationContext applicationContext, PlexusSisuBridge plexusSisuBridge, + OverridingArchivaDavResourceFactory( ApplicationContext applicationContext, ArchivaConfiguration archivaConfiguration ) - throws PlexusSisuBridgeException { super( applicationContext, archivaConfiguration ); } diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavResourceFactory.java index 0390913a8..5aadd4653 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavResourceFactory.java @@ -19,8 +19,6 @@ package org.apache.archiva.webdav; * under the License. */ -import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; -import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavServletRequest; @@ -39,9 +37,8 @@ public class UnauthenticatedDavResourceFactory { @Inject - public UnauthenticatedDavResourceFactory( ApplicationContext applicationContext, PlexusSisuBridge plexusSisuBridge, + public UnauthenticatedDavResourceFactory( ApplicationContext applicationContext, ArchivaConfiguration archivaConfiguration ) - throws PlexusSisuBridgeException { super( applicationContext, archivaConfiguration ); } -- cgit v1.2.3