diff options
author | Martin Stockhammer <martin_s@apache.org> | 2019-09-01 23:49:01 +0200 |
---|---|---|
committer | Martin Stockhammer <martin_s@apache.org> | 2019-09-01 23:49:01 +0200 |
commit | e2cb026d710066160757e92438d5335ef2c20b1d (patch) | |
tree | 39192bc2efaca4e1a653f111a17dd5fa29506c64 /archiva-cli | |
parent | 02d160e0109367d42f9150f51a4f925e23a53e63 (diff) | |
download | archiva-e2cb026d710066160757e92438d5335ef2c20b1d.tar.gz archiva-e2cb026d710066160757e92438d5335ef2c20b1d.zip |
Fixing archiva-converter dependency
Diffstat (limited to 'archiva-cli')
-rw-r--r-- | archiva-cli/pom.xml | 18 | ||||
-rw-r--r-- | archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java | 1 |
2 files changed, 4 insertions, 15 deletions
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index da7b77994..42f445c85 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -49,20 +49,6 @@ <artifactId>archiva-plexus-bridge</artifactId> </dependency> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-converter</artifactId> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.google.code.cli-parser</groupId> <artifactId>cli</artifactId> <version>7</version> @@ -79,6 +65,10 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> </dependency> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-converter</artifactId> + </dependency> <!-- Consumers to include --> <!-- This will require some additional configuration now to point to an appropriate metadata repository storage, which is not in the CLI yet 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 89e01a443..f9da7eefe 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 @@ -38,7 +38,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import java.io.IOException; import java.io.InputStream; -import java.net.MalformedURLException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; |