diff options
| author | Brett Porter <brett@apache.org> | 2009-03-14 02:33:57 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2009-03-14 02:33:57 +0000 |
| commit | 537ff689e7e39ce7ca4d9f0b94abcece5ee7c569 (patch) | |
| tree | d905efd2f35bab56d08c436288943c77820b63e2 /archiva-modules/archiva-web/archiva-xmlrpc | |
| parent | b24700028788de56ab0367f1c2379f0b695e4c0f (diff) | |
| download | archiva-537ff689e7e39ce7ca4d9f0b94abcece5ee7c569.tar.gz archiva-537ff689e7e39ce7ca4d9f0b94abcece5ee7c569.zip | |
[MRM-1140] centralise logging through slf4j
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@753590 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-xmlrpc')
3 files changed, 28 insertions, 29 deletions
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index 07c668a99..2b6357ed0 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -33,6 +33,24 @@ <dependency> <groupId>com.atlassian.xmlrpc</groupId> <artifactId>atlassian-xmlrpc-binder</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl104-over-slf4j</artifactId> + <!-- Exec plugin doesn't use runtime scope - odd --> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <!-- Exec plugin doesn't use runtime scope - odd --> + <scope>compile</scope> </dependency> </dependencies> <build> @@ -54,35 +72,6 @@ </arguments> </configuration> </plugin> - <!-- override parent config, commons-logging cannot be excluded from atlassian-xml-rpc-binder - NoClassDef error occurs --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-alpha-3</version> - <executions> - <execution> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <bannedDependencies> - <excludes> - <exclude>org.codehaus.plexus:plexus-container-default</exclude> - <exclude>velocity:velocity-dep</exclude> - <exclude>classworlds:classworlds</exclude> - <exclude>javax.transaction:jta</exclude> - <exclude>javax.sql:jdbc-stdext</exclude> - <exclude>ant:ant-optional</exclude> - <!-- exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude --> - <exclude>xom:xom</exclude> - </excludes> - </bannedDependencies> - </rules> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index bdc0a947a..e246ed386 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -64,5 +64,10 @@ <artifactId>redback-rbac-memory</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index 0d7e136b1..ddc213e57 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -45,5 +45,10 @@ <artifactId>plexus-spring</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project>
\ No newline at end of file |