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/02 19:52:18 UTC
[archiva] branch master updated (d331032 -> c7fb08d)
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 d331032 Updating apache commons library versions
new 316874d Removing sonatype aether dependency
new 9bae616 Changing version of wagon and maven-converter
new c7fb08d Removing felix dependency
The 3 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-maven/archiva-maven-converter/pom.xml | 13 --------
archiva-modules/archiva-web/archiva-webapp/pom.xml | 17 ----------
archiva-modules/plugins/metadata-store-jcr/pom.xml | 2 ++
pom.xml | 39 +++-------------------
4 files changed, 6 insertions(+), 65 deletions(-)
[archiva] 02/03: Changing version of wagon and maven-converter
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 9bae61661a03ba859661e23626ed344994cb35c8
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Mon Sep 2 21:23:47 2019 +0200
Changing version of wagon and maven-converter
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 61ea6c6..5f9488e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,9 @@
<maven3x.version>3.5.4</maven3x.version>
<maven.resolver.version>1.1.1</maven.resolver.version>
<maven.indexer.version>6.0.1-SNAPSHOT</maven.indexer.version>
+ <maven-model-converter.version>2.3</maven-model-converter.version>
+ <wagon.version>3.3.3</wagon.version>
- <maven-model-converter.version>2.1</maven-model-converter.version>
- <wagon.version>3.0.0</wagon.version>
<redback.version>3.0.0-SNAPSHOT</redback.version>
<redback.cache.version>2.2</redback.cache.version>
<redback.quartz.version>2.1</redback.quartz.version>
@@ -68,7 +68,7 @@
<redback.spring-utils.version>2.1</redback.spring-utils.version>
<redback.taskqueue.version>2.1</redback.taskqueue.version>
- <jsoup.version>1.7.2</jsoup.version>
+ <jsoup.version>1.12.1</jsoup.version>
<rome.version>0.9</rome.version>
<cronutils.version>9.0.1</cronutils.version>
[archiva] 03/03: Removing felix 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 c7fb08d2cb8b8fac9e36707e03369c5e83def7a6
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Mon Sep 2 21:51:13 2019 +0200
Removing felix dependency
---
archiva-modules/plugins/metadata-store-jcr/pom.xml | 2 ++
pom.xml | 8 --------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index b49b454..b16f447 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -72,10 +72,12 @@
</exclusion>
</exclusions>
</dependency>
+<!--
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 5f9488e..dd1c38d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,6 @@
<jcr-oak.version>1.14.0</jcr-oak.version>
<jackrabbit.version>2.15.4</jackrabbit.version>
- <felix.scr.version>1.12.0</felix.scr.version>
<metrics-core.version>3.1.0</metrics-core.version>
<cxf.version>3.0.3</cxf.version>
@@ -1508,13 +1507,6 @@
<version>${javax.jcr.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>${felix.scr.version}</version>
- </dependency>
-
-
<!-- Transitive versions to manage -->
<dependency>
<groupId>org.springframework</groupId>
[archiva] 01/03: Removing sonatype aether 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 316874dc90b309475f9c35aab671cfb35e1a46a8
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Mon Sep 2 18:13:55 2019 +0200
Removing sonatype aether dependency
---
.../archiva-maven/archiva-maven-converter/pom.xml | 13 -----------
archiva-modules/archiva-web/archiva-webapp/pom.xml | 17 ---------------
pom.xml | 25 +---------------------
3 files changed, 1 insertion(+), 54 deletions(-)
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
index 1330941..b52d47b 100644
--- a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
@@ -51,19 +51,6 @@
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-util</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-checksum</artifactId>
</dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 38aa011..0fa1b14 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -281,23 +281,6 @@
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-file</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<exclusions>
diff --git a/pom.xml b/pom.xml
index 916b1d7..61ea6c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,10 +57,9 @@
<maven3x.version>3.5.4</maven3x.version>
<maven.resolver.version>1.1.1</maven.resolver.version>
- <sonatype.aether.version>1.13.1</sonatype.aether.version>
+ <maven.indexer.version>6.0.1-SNAPSHOT</maven.indexer.version>
<maven-model-converter.version>2.1</maven-model-converter.version>
- <maven.indexer.version>6.0.1-SNAPSHOT</maven.indexer.version>
<wagon.version>3.0.0</wagon.version>
<redback.version>3.0.0-SNAPSHOT</redback.version>
<redback.cache.version>2.2</redback.cache.version>
@@ -939,28 +938,6 @@
<version>${maven.resolver.version}</version>
</dependency>
- <!-- Sonatype aether -->
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>${sonatype.aether.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-impl</artifactId>
- <version>${sonatype.aether.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>${sonatype.aether.version}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-file</artifactId>
- <version>${sonatype.aether.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>expression-evaluator</artifactId>