Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing archiva-converter dependency

This commit is contained in:
Martin Stockhammer 2019-09-01 23:49:01 +02:00
parent 02d160e010
commit e2cb026d71
5 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archiva-cli/pom.xml
View File

@ -48,20 +48,6 @@
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
<artifactId>archiva-plexus-bridge</artifactId> <artifactId>archiva-plexus-bridge</artifactId>
</dependency> </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> <dependency>
<groupId>com.google.code.cli-parser</groupId> <groupId>com.google.code.cli-parser</groupId>
<artifactId>cli</artifactId> <artifactId>cli</artifactId>
@ -79,6 +65,10 @@
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-converter</artifactId>
</dependency>
<!-- Consumers to include --> <!-- 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 This will require some additional configuration now to point to an appropriate metadata repository storage, which is not in the CLI yet

1
archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
View File

@ -38,7 +38,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.MalformedURLException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;

13
archiva-modules/archiva-base/archiva-transaction/pom.xml
View File

@ -70,9 +70,18 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId> <artifactId>log4j-jcl</artifactId>
<scope>compile</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies>
<profiles>
<profile>
<id>jdk9+</id>
<activation>
<jdk>[1.9,)</jdk>
</activation>
<dependencies>
<!-- Needed for JDK >= 9 --> <!-- Needed for JDK >= 9 -->
<dependency> <dependency>
<groupId>javax.annotation</groupId> <groupId>javax.annotation</groupId>
@ -86,4 +95,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</profile>
</profiles>
</project> </project>

9
archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
View File

@ -76,10 +76,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
@ -130,6 +126,11 @@
<artifactId>redback-common-test-resources</artifactId> <artifactId>redback-common-test-resources</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>

10
pom.xml
View File

@ -270,11 +270,6 @@
<artifactId>archiva-consumer-api</artifactId> <artifactId>archiva-consumer-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-converter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
<artifactId>archiva-core-consumers</artifactId> <artifactId>archiva-core-consumers</artifactId>
@ -305,6 +300,11 @@
<artifactId>archiva-maven-indexer</artifactId> <artifactId>archiva-maven-indexer</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-converter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
<artifactId>archiva-test-utils</artifactId> <artifactId>archiva-test-utils</artifactId>