diff options
Diffstat (limited to 'archiva-modules/plugins')
6 files changed, 57 insertions, 7 deletions
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index bf1cafbb3..2747ef877 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -47,6 +47,12 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-proxy-common</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.sonatype.sisu</groupId> @@ -62,7 +68,7 @@ </dependency> <dependency> <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> + <artifactId>commons-logging</artifactId> <scope>test</scope> </dependency> <dependency> @@ -133,6 +139,10 @@ <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml index 026551815..93fcfcbab 100644 --- a/archiva-modules/plugins/metadata-store-file/pom.xml +++ b/archiva-modules/plugins/metadata-store-file/pom.xml @@ -62,8 +62,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 5e0950e0f..ac07043de 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -67,6 +67,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/archiva-modules/plugins/npanday-support/pom.xml b/archiva-modules/plugins/npanday-support/pom.xml index c7e46ec70..3492c0ed8 100644 --- a/archiva-modules/plugins/npanday-support/pom.xml +++ b/archiva-modules/plugins/npanday-support/pom.xml @@ -32,6 +32,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>maven2-repository</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml index eee8231ed..4c32130a3 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -36,6 +36,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>maven2-repository</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>org.slf4j</groupId> @@ -56,14 +66,20 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index e1b188e43..8a8adb65f 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -46,6 +46,16 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>maven2-repository</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -66,8 +76,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> <scope>test</scope> </dependency> <dependency> |