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 2020/02/02 16:32:43 UTC
[archiva] branch master updated (c7e070a -> dd7fd7a)
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 c7e070a Removing Nullable annotation and fix dependency errors
new 925601a Removing comments and moving versions to dep management section
new dd7fd7a Removing wagon 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-repository-admin-default/pom.xml | 119 +++------------------
.../admin/DefaultArchivaAdministration.java | 47 +-------
pom.xml | 5 +
3 files changed, 20 insertions(+), 151 deletions(-)
[archiva] 02/02: Removing wagon 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 dd7fd7ad53bf8ca3ec02b20aa7ecd8778c86e9f9
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Feb 2 17:23:20 2020 +0100
Removing wagon dependency
---
.../archiva-repository-admin-default/pom.xml | 23 -----------
.../admin/DefaultArchivaAdministration.java | 47 +---------------------
2 files changed, 1 insertion(+), 69 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index a4b583e..a13d875 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -150,33 +150,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-shared</artifactId>
- </dependency>
<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
<!-- Used by spring configuration -->
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
index 87216b4..dec2caa 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
@@ -29,13 +29,9 @@ import org.apache.archiva.configuration.WebappConfiguration;
import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.maven.wagon.providers.http.HttpWagon;
import org.springframework.stereotype.Service;
import org.springframework.util.ResourceUtils;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -51,26 +47,6 @@ public class DefaultArchivaAdministration
implements ArchivaAdministration
{
- private PoolingHttpClientConnectionManager poolingClientConnectionManager;
-
- @PostConstruct
- public void initialize()
- throws RepositoryAdminException
- {
- // setup wagon on start with initial values
- NetworkConfiguration networkConfiguration = getNetworkConfiguration();
- setupWagon( networkConfiguration );
- }
-
- @PreDestroy
- public void shutdown()
- {
- if ( this.poolingClientConnectionManager != null )
- {
- this.poolingClientConnectionManager.shutdown();
- }
- }
-
@Override
public List<LegacyArtifactPath> getLegacyArtifactPaths()
@@ -430,31 +406,10 @@ public class DefaultArchivaAdministration
configuration.setNetworkConfiguration( getModelMapper().map( networkConfiguration,
org.apache.archiva.configuration.NetworkConfiguration.class ) );
}
- setupWagon( networkConfiguration );
+ // setupWagon( networkConfiguration );
saveConfiguration( configuration );
}
- protected void setupWagon( NetworkConfiguration networkConfiguration )
- {
- if ( networkConfiguration == null )
- {
- // back to default values
- HttpWagon.setPersistentPool( true );
- poolingClientConnectionManager = new PoolingHttpClientConnectionManager();
- poolingClientConnectionManager.setDefaultMaxPerRoute( 30 );
- poolingClientConnectionManager.setMaxTotal( 30 );
- HttpWagon.setPoolingHttpClientConnectionManager( poolingClientConnectionManager );
-
- }
- else
- {
- HttpWagon.setPersistentPool( networkConfiguration.isUsePooling() );
- poolingClientConnectionManager = new PoolingHttpClientConnectionManager();
- poolingClientConnectionManager.setDefaultMaxPerRoute( networkConfiguration.getMaxTotalPerHost() );
- poolingClientConnectionManager.setMaxTotal( networkConfiguration.getMaxTotal() );
- HttpWagon.setPoolingHttpClientConnectionManager( poolingClientConnectionManager );
- }
- }
//-------------------------
//
[archiva] 01/02: Removing comments and moving versions to dep
management section
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 925601a263ec5a6add9c1e765a6d53f5e4d7bb1e
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Feb 2 16:42:10 2020 +0100
Removing comments and moving versions to dep management section
---
.../archiva-repository-admin-default/pom.xml | 96 ++++------------------
pom.xml | 5 ++
2 files changed, 19 insertions(+), 82 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 7a2e4e3..a4b583e 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -70,8 +70,12 @@
<artifactId>archiva-common</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.components.cache</groupId>
- <artifactId>archiva-components-spring-cache-api</artifactId>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -98,6 +102,10 @@
<artifactId>redback-rbac-role-manager</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry-api</artifactId>
</dependency>
@@ -105,6 +113,10 @@
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components-spring-quartz</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-taskqueue</artifactId>
+ </dependency>
<dependency>
@@ -130,13 +142,6 @@
<artifactId>spring-context</artifactId>
</dependency>
-
- <!--
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -145,33 +150,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- -->
- <!--
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-plexus-bridge</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>metadata-repository-api</artifactId>
- </dependency>
- <!--
-
- -->
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>metadata-model</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.components</groupId>
- <artifactId>archiva-components-spring-taskqueue</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -249,13 +227,11 @@
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-jpa</artifactId>
- <version>${redback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common-jpa</artifactId>
- <version>${redback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -266,93 +242,49 @@
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-test-utils</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-authentication-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
- <!--
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <scope>test</scope>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-memory</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-memory</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-cached</artifactId>
<scope>test</scope>
</dependency>
-
- <!--
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common-test-resources</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-mock</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <scope>test</scope>
- </dependency>
- -->
-
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index a4417d7..74b83b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1119,6 +1119,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-common-jpa</artifactId>
+ <version>${redback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-jpa</artifactId>
<version>${redback.version}</version>
<exclusions>