Skip to content

Commit

Permalink
AMQP-531: Log4j2 AmqpAppender
Browse files Browse the repository at this point in the history
JIRA: https://jira.spring.io/browse/AMQP-531

Initial Commit.

Add Properties Test

Polishing

Move the log4j2 Appender back to spring-rabbit - my concern about
log4j and log4j2 on the classpath were unfounded.

* Polishing according PR comments
  • Loading branch information
garyrussell authored and artembilan committed Feb 3, 2016
1 parent 0c7294f commit 1150fe4
Show file tree
Hide file tree
Showing 9 changed files with 643 additions and 4 deletions.
8 changes: 6 additions & 2 deletions build.gradle
Expand Up @@ -79,12 +79,14 @@ subprojects { subproject ->

ext {
cglibVersion = '3.1'
commonsCliVersion = '1.2'
commonsIoVersion = '2.4'
hamcrestVersion = '1.3'
jacksonVersion = '1.9.13'
jackson2Version = '2.3.2'
junitVersion = '4.11'
log4jVersion = '1.2.17'
log4j2Version = '2.4.1'
logbackVersion = '1.1.2'
mockitoVersion = '1.9.5'
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '3.6.0'
Expand Down Expand Up @@ -214,8 +216,6 @@ project('spring-rabbit') {

compile "org.springframework.retry:spring-retry:$springRetryVersion"

testCompile "commons-cli:commons-cli:1.2"

compile ("log4j:log4j:$log4jVersion") { dep ->
optional dep
exclude group: 'javax.jms', module: 'jms'
Expand All @@ -225,6 +225,10 @@ project('spring-rabbit') {

compile ("ch.qos.logback:logback-classic:$logbackVersion", optional)

compile ("org.apache.logging.log4j:log4j-core:$log4j2Version", optional)

testCompile "commons-cli:commons-cli:$commonsCliVersion"

}

}
Expand Down
1 change: 0 additions & 1 deletion settings.gradle
Expand Up @@ -3,4 +3,3 @@ rootProject.name = 'spring-amqp-dist'
include 'spring-amqp'
include 'spring-rabbit'
include 'spring-rabbit-test'

3 changes: 3 additions & 0 deletions spring-amqp/README.adoc
@@ -0,0 +1,3 @@
= spring-amqp

This project provides the base abstractions for Spring-AMQP suporting the AMQP 0.9.1 Specification.
3 changes: 3 additions & 0 deletions spring-rabbit-test/README.adoc
@@ -0,0 +1,3 @@
= spring-rabbit-test

This project provides testing support classes to help with testing `spring-rabbit` applications.
6 changes: 5 additions & 1 deletion spring-rabbit/README.md → spring-rabbit/README.adoc
@@ -1,4 +1,8 @@
Many of the "integration" tests here require a running RabbitMQ server - they
= spring-rabbit

This project provides the RabbitMQ implementation for the abstractions in `spring-amqp`.

Many of the integration tests here require a running RabbitMQ server - they
will be skipped if the broker is not detected.

If RabbitMQ is not installed on your system, refer to the instructions for your
Expand Down

0 comments on commit 1150fe4

Please sign in to comment.