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-redback-core.git
commit 00493abab709d8fea940c66c8a1c076ed86f5df0 Author: Martin Stockhammer <[email protected]> AuthorDate: Thu Jan 9 20:39:39 2020 +0100 Cleanup of rest dependencies - part 1 --- pom.xml | 5 +- .../redback-common-integrations/pom.xml | 50 ++++++++-- .../redback-rest/redback-rest-services/pom.xml | 108 +++++++++++++++++---- 3 files changed, 137 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index baa1cdd..d440092 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,8 @@ <!-- The git repository, where the site content is placed --> <siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content.git</siteRepositoryUrl> + <javax.servlet.version>4.0.1</javax.servlet.version> + </properties> <repositories> @@ -542,6 +544,7 @@ <artifactId>javax.ws.rs-api</artifactId> <version>2.0</version> </dependency> + <!-- <dependency> <groupId>org.codehaus.jackson</groupId> @@ -668,7 +671,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${javax.servlet.version}</version> <scope>provided</scope> </dependency> diff --git a/redback-integrations/redback-common-integrations/pom.xml b/redback-integrations/redback-common-integrations/pom.xml index 1b74845..11df83e 100644 --- a/redback-integrations/redback-common-integrations/pom.xml +++ b/redback-integrations/redback-common-integrations/pom.xml @@ -52,10 +52,12 @@ <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-authentication-users</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-authentication-ldap</artifactId> + <scope>runtime</scope> </dependency> <!-- Keys Management / Authentication --> <dependency> @@ -65,11 +67,13 @@ <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-authentication-keys</artifactId> + <scope>runtime</scope> </dependency> <!-- RBAC Management / Authorization --> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-authorization-rbac</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> @@ -78,33 +82,63 @@ <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-cached</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-users-ldap</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-users-configurable</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-data-management</artifactId> + <artifactId>redback-integrations-security</artifactId> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-integrations-security</artifactId> + <artifactId>redback-authentication-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-users-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-rbac-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-authorization-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </dependency> <!-- ================================================================ --> <!-- OTHER Dependencies --> + <!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> </dependency> + --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> @@ -133,7 +167,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -148,10 +182,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> @@ -159,8 +189,14 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> + <!-- === Test Dependencies ======================= --> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml index 0b271b8..ff65c14 100644 --- a/redback-integrations/redback-rest/redback-rest-services/pom.xml +++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml @@ -36,30 +36,39 @@ </properties> <dependencies> + <dependency> <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-rest-api</artifactId> - <version>${project.version}</version> + <artifactId>redback-common-ldap</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-authentication-api</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-keys-api</artifactId> </dependency> - <dependency> <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-common-integrations</artifactId> + <artifactId>redback-integrations-security</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-policy</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-rbac-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-authorization-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-configuration</artifactId> </dependency> - <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-users-api</artifactId> @@ -77,24 +86,81 @@ <artifactId>redback-keys-jpa</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-rbac-role-manager</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-xml-provider</artifactId> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-system</artifactId> </dependency> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> + <groupId>org.apache.archiva.components.cache</groupId> + <artifactId>archiva-components-spring-cache-api</artifactId> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + </dependency> + + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-rest-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-common-integrations</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-xml-provider</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> @@ -112,6 +178,12 @@ </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-jpa</artifactId> <scope>test</scope>
