Permalink
Browse files

AMQP-628: Master to 2.0, SF 5.0

JIRA: https://jira.spring.io/browse/AMQP-628

Remove log4j Appender (deprecated in 1.6.2).

Rename/Remove Schemas

Simple polishing according PR comments
  • Loading branch information...
garyrussell authored and artembilan committed Jul 28, 2016
1 parent 208775d commit 2ee8c34a8cea2c7f6706943d8092e7d9996ba4fa
Showing with 237 additions and 7,861 deletions.
  1. +1 −0 .gitignore
  2. +3 −4 build.gradle
  3. +1 −1 gradle.properties
  4. +0 −674 spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/AmqpAppender.java
  5. +0 −4 spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/package-info.java
  6. +2 −8 spring-rabbit/src/main/resources/META-INF/spring.schemas
  7. +0 −771 spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.0.xsd
  8. +0 −1,038 spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.1.xsd
  9. +0 −1,102 spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.2.xsd
  10. +0 −1,122 spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.3.xsd
  11. +0 −1,263 spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.4.xsd
  12. +0 −1,371 spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.5.xsd
  13. 0 .../resources/org/springframework/amqp/rabbit/config/{spring-rabbit-1.6.xsd → spring-rabbit-2.0.xsd}
  14. +0 −220 spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AmqpAppenderIntegrationTests.java
  15. +0 −36 spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AnnotationConfigContextLoader.java
  16. +1 −5 ...it/src/test/java/org/springframework/amqp/rabbit/{log4j → logback}/AmqpAppenderConfiguration.java
  17. +0 −2 ...ng-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/AmqpAppenderIntegrationTests.java
  18. +1 −1 spring-rabbit/src/test/java/org/springframework/amqp/rabbit/{log4j → logback}/TestListener.java
  19. +224 −0 src/reference/asciidoc/appendix.adoc
  20. +0 −19 src/reference/asciidoc/logging.adoc
  21. +4 −220 src/reference/asciidoc/whats-new.adoc
View
@@ -9,6 +9,7 @@
.gradle
.project
.settings
.checkstyle
bin
build
.DS_Store
View
@@ -78,9 +78,8 @@ subprojects { subproject ->
}
}
// ensure JDK 6 compatibility
sourceCompatibility=1.6
targetCompatibility=1.6
sourceCompatibility=1.8
targetCompatibility=1.8
ext {
cglibVersion = '3.1'
@@ -97,7 +96,7 @@ subprojects { subproject ->
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '3.6.3'
rabbitmqHttpClientVersion = '1.0.0.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.7.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.M1'
springRetryVersion = '1.1.3.RELEASE'
}
View
@@ -1,2 +1,2 @@
version=1.6.2.BUILD-SNAPSHOT
version=2.0.0.BUILD-SNAPSHOT
org.gradle.daemon=true
Oops, something went wrong.

0 comments on commit 2ee8c34

Please sign in to comment.