diff options
14 files changed, 130 insertions, 32 deletions
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 50176bd77..f8ccd16de 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -33,13 +33,6 @@ </properties> <dependencies> - <!-- TODO: remove this hard dependency by using an event mechanism --> - <!-- - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>audit</artifactId> - </dependency> - --> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-configuration</artifactId> @@ -128,6 +121,11 @@ <!-- test dependencies --> <!-- This dependency is needed by openjpa --> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>javax.transaction</groupId> <artifactId>javax.transaction-api</artifactId> <scope>test</scope> 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 019b07917..eaa26bb5b 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 @@ -166,6 +166,11 @@ <!-- Test scope --> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http-shared</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml index 8fcc724e0..bcf7dec04 100644 --- a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml @@ -151,6 +151,11 @@ <!-- TEST Scope --> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva</groupId> <artifactId>repository-statistics</artifactId> <scope>test</scope> @@ -195,13 +200,6 @@ <groupId>org.apache.archiva.maven</groupId> <artifactId>archiva-maven-repository</artifactId> </dependency> - <!-- - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin-default</artifactId> - <scope>test</scope> - </dependency> - --> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-test-utils</artifactId> diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml index c98a7e524..bae0d27d2 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml @@ -79,6 +79,11 @@ <!-- Test scope --> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.components</groupId> <artifactId>archiva-components-spring-quartz</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml index b24adb4ae..059e6dd80 100644 --- a/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml @@ -79,6 +79,11 @@ <!-- Test dependencies --> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-keys-jpa</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 4c9252b90..8420a0483 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -233,6 +233,11 @@ <!-- TEST Scope --> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 7d9ab0387..17d580b51 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -35,6 +35,10 @@ <dependencies> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>metadata-repository-api</artifactId> </dependency> <dependency> @@ -52,6 +56,26 @@ <!-- TEST Scope --> <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-repository</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-layer</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-storage-fs</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-filelock</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 3c125a237..7d37d5b86 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -112,6 +112,11 @@ <!-- Test Scoped --> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index e69e74fdc..095486f2e 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -247,7 +247,11 @@ <artifactId>javax.annotation-api</artifactId> </dependency> - + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>javax.transaction-api</artifactId> diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index d13367243..bf8809a67 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -153,6 +153,11 @@ <!-- TEST Scope --> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> <scope>test</scope> diff --git a/archiva-modules/metadata/metadata-model/pom.xml b/archiva-modules/metadata/metadata-model/pom.xml index b4894b34e..2363a1915 100644 --- a/archiva-modules/metadata/metadata-model/pom.xml +++ b/archiva-modules/metadata/metadata-model/pom.xml @@ -37,10 +37,6 @@ <artifactId>archiva-checksum</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml index 72d321526..192652919 100644 --- a/archiva-modules/metadata/metadata-repository-api/pom.xml +++ b/archiva-modules/metadata/metadata-repository-api/pom.xml @@ -32,17 +32,22 @@ </properties> <dependencies> + <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-common</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-api</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-storage-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-model</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -50,21 +55,50 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-layer</artifactId> + <artifactId>archiva-policies</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin-api</artifactId> + <artifactId>archiva-xml-tools</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-checksum</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.components.cache</groupId> + <artifactId>archiva-components-spring-cache-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + + <!-- Test scope --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-test-utils</artifactId> - <version>${project.version}</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> </dependency> <dependency> <groupId>org.assertj</groupId> diff --git a/archiva-modules/metadata/metadata-statistics-api/pom.xml b/archiva-modules/metadata/metadata-statistics-api/pom.xml index 5c9b0a13d..d9a1ee96c 100644 --- a/archiva-modules/metadata/metadata-statistics-api/pom.xml +++ b/archiva-modules/metadata/metadata-statistics-api/pom.xml @@ -37,6 +37,10 @@ <artifactId>metadata-repository-api</artifactId> </dependency> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>metadata-model</artifactId> + </dependency> + <dependency> <groupId>org.apache.archiva.maven</groupId> <artifactId>archiva-maven-metadata</artifactId> </dependency> diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index 4b8559646..9a9d3eb55 100644 --- a/archiva-modules/plugins/problem-reports/pom.xml +++ b/archiva-modules/plugins/problem-reports/pom.xml @@ -75,6 +75,16 @@ </dependency> <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-repository</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-layer</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>test</scope> |