You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/09/01 21:49:09 UTC
[archiva] branch master updated (41af9ab -> e2cb026)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 41af9ab Removing unused dependency
new 02d160e Removing unused archetype-common dependency
new e2cb026 Fixing archiva-converter dependency
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 | 13 ++++----
pom.xml | 10 +++----
5 files changed, 37 insertions(+), 40 deletions(-)
[archiva] 01/02: Removing unused archetype-common dependency
Posted by ma...@apache.org.
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 02d160e0109367d42f9150f51a4f925e23a53e63
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 1 23:07:54 2019 +0200
Removing unused archetype-common dependency
---
archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
index edaa6f1..fcfd358 100644
--- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
@@ -46,10 +46,6 @@
<artifactId>archiva-repository-admin-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-common</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy</artifactId>
</dependency>
[archiva] 02/02: Fixing archiva-converter dependency
Posted by ma...@apache.org.
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 <ma...@apache.org>
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>