diff options
author | Martin Stockhammer <martin_s@apache.org> | 2018-03-30 20:11:57 +0200 |
---|---|---|
committer | Martin Stockhammer <martin_s@apache.org> | 2018-03-30 20:11:57 +0200 |
commit | f1012523759e82b871d1d2ef038899d1e3237a9a (patch) | |
tree | a56b491149b8310d28fd77daea1f7f876782b164 /archiva-cli/src/main | |
parent | f7facffea70618c497584943f0864dad808a79af (diff) | |
download | archiva-f1012523759e82b871d1d2ef038899d1e3237a9a.tar.gz archiva-f1012523759e82b871d1d2ef038899d1e3237a9a.zip |
Reorganizing imports
Diffstat (limited to 'archiva-cli/src/main')
-rw-r--r-- | archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java | 2 | ||||
-rw-r--r-- | archiva-cli/src/main/resources/META-INF/spring-context.xml | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java index b2ca3782f..d8078a981 100644 --- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java +++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java @@ -28,7 +28,6 @@ import org.apache.archiva.consumers.RepositoryContentConsumer; import org.apache.archiva.converter.RepositoryConversionException; import org.apache.archiva.converter.legacy.LegacyRepositoryConverter; import org.apache.archiva.repository.BasicManagedRepository; -import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.scanner.RepositoryScanStatistics; import org.apache.archiva.repository.scanner.RepositoryScanner; import org.apache.archiva.repository.scanner.RepositoryScannerException; @@ -48,7 +47,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Properties; diff --git a/archiva-cli/src/main/resources/META-INF/spring-context.xml b/archiva-cli/src/main/resources/META-INF/spring-context.xml index b40e3851a..c19c37071 100644 --- a/archiva-cli/src/main/resources/META-INF/spring-context.xml +++ b/archiva-cli/src/main/resources/META-INF/spring-context.xml @@ -21,12 +21,10 @@ <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" - xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" + http://www.springframework.org/schema/context/spring-context-3.0.xsd" default-lazy-init="true"> <!-- Note: must include util namespace above to accommodate MSHADE-175 --> |