This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
commit e2cb026d710066160757e92438d5335ef2c20b1d Author: Martin Stockhammer <[email protected]> AuthorDate: Sun Sep 1 23:49:01 2019 +0200 Fixing archiva-converter dependency --- archiva-cli/pom.xml | 18 +++-------- .../java/org/apache/archiva/cli/ArchivaCli.java | 1 - .../archiva-base/archiva-transaction/pom.xml | 35 ++++++++++++++-------- .../archiva-maven/archiva-maven-proxy/pom.xml | 9 +++--- pom.xml | 10 +++---- 5 files changed, 37 insertions(+), 36 deletions(-) diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index da7b779..42f445c 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 89e01a4..f9da7ee 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; diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index b63aecc..1d45041 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -70,20 +70,31 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <scope>compile</scope> - </dependency> - - <!-- Needed for JDK >= 9 --> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>test</scope> - </dependency> </dependencies> + + <profiles> + <profile> + <id>jdk9+</id> + <activation> + <jdk>[1.9,)</jdk> + </activation> + <dependencies> + <!-- Needed for JDK >= 9 --> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> </project> diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml index fcfd358..b4221de 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml @@ -77,10 +77,6 @@ </exclusions> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> <scope>test</scope> @@ -130,6 +126,11 @@ <artifactId>redback-common-test-resources</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index 010be99..dfb22dc 100644 --- a/pom.xml +++ b/pom.xml @@ -272,11 +272,6 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-converter</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> <artifactId>archiva-core-consumers</artifactId> <version>${project.version}</version> </dependency> @@ -306,6 +301,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-converter</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-test-utils</artifactId> <version>${project.version}</version>
