From b66c24785c522bc675f438cc7b91961c5624909e Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 1 Apr 2019 17:06:06 -0400 Subject: [PATCH] Upgrade to S-A 2.1.5, S-F 5.1.6 --- .DS_Store | Bin 0 -> 6148 bytes helloworld/pom.xml | 6 +- helloworld/pom.xml-e | 183 ++++++++++++++++ log4j2/pom.xml | 2 +- log4j2/pom.xml-e | 88 ++++++++ pom.xml | 2 +- pom.xml-e | 67 ++++++ spring-rabbit-confirms-returns/pom.xml | 2 +- spring-rabbit-confirms-returns/pom.xml-e | 50 +++++ spring-rabbit-global-errorhandler/pom.xml | 2 +- spring-rabbit-global-errorhandler/pom.xml-e | 56 +++++ spring-rabbit-json/pom.xml | 2 +- spring-rabbit-json/pom.xml-e | 64 ++++++ stocks/.DS_Store | Bin 0 -> 6148 bytes stocks/pom.xml | 6 +- stocks/pom.xml-e | 218 ++++++++++++++++++++ 16 files changed, 737 insertions(+), 11 deletions(-) create mode 100644 .DS_Store create mode 100644 helloworld/pom.xml-e create mode 100644 log4j2/pom.xml-e create mode 100644 pom.xml-e create mode 100644 spring-rabbit-confirms-returns/pom.xml-e create mode 100644 spring-rabbit-global-errorhandler/pom.xml-e create mode 100644 spring-rabbit-json/pom.xml-e create mode 100644 stocks/.DS_Store create mode 100644 stocks/pom.xml-e diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0dbb505575193b43f53991c6cec3e497ae18de66 GIT binary patch literal 6148 zcmeHKISv9b4733uBpOP}e1RWC2wuPk5YU0N#X`Ro@8W5Uj{>yNK>->|&LoZ}QKne0 zMMRgE!$M>xA``fwTy5x^?VI;(kP!vKamG>FL%Toin&#BYejPCGSXwztBl}0bZP2Iy z6`%rCfC^B7k1LQRb~63=$vlt>P=Q}pz`hR!Zden$K>u`L@D>0#Lf8#+?GNs z1tJ2|paO%c*!+$k8m90R=^V`1fZ?n#kXY>xe! V*abQrai;_MGhn*VsKB=sxC8z>6|MjP literal 0 HcmV?d00001 diff --git a/helloworld/pom.xml b/helloworld/pom.xml index 3fa9c7f..7691750 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.samples.spring spring-rabbit-helloworld - 2.1.3.RELEASE + 2.1.5.RELEASE jar Spring AMQP Hello World https://www.spring.io @@ -16,8 +16,8 @@ true - 5.1.3.RELEASE - 2.1.3.RELEASE + 5.1.6.RELEASE + 2.1.5.RELEASE UTF-8 1.8 false diff --git a/helloworld/pom.xml-e b/helloworld/pom.xml-e new file mode 100644 index 0000000..aae99c8 --- /dev/null +++ b/helloworld/pom.xml-e @@ -0,0 +1,183 @@ + + + 4.0.0 + org.springframework.samples.spring + spring-rabbit-helloworld + 2.1.5.RELEASE + jar + Spring AMQP Hello World + https://www.spring.io + + + + + true + 5.1.3.RELEASE + 2.1.5.RELEASE + UTF-8 + 1.8 + false + + + + + + org.springframework.amqp + spring-amqp + ${spring.amqp.version} + + + org.springframework + spring-core + + + + + org.springframework.amqp + spring-rabbit + ${spring.amqp.version} + + + org.springframework + spring-core + + + org.springframework + spring-messaging + + + org.springframework + spring-tx + + + org.springframework + spring-context + + + + + + org.springframework + spring-core + ${spring.framework.version} + + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.framework.version} + + + org.springframework + spring-messaging + ${spring.framework.version} + + + org.springframework + spring-tx + ${spring.framework.version} + + + org.springframework + spring-test + ${spring.framework.version} + test + + + cglib + cglib-nodep + 2.2 + runtime + + + + + junit + junit + 4.12 + test + + + + org.slf4j + slf4j-api + 1.7.22 + + + org.slf4j + jcl-over-slf4j + 1.7.22 + runtime + + + org.slf4j + slf4j-log4j12 + 1.7.22 + runtime + + + log4j + log4j + 1.2.14 + runtime + + + + + + + + + com.springsource.bundlor + com.springsource.bundlor.maven + 1.0.0.M1B + + + maven-assembly-plugin + false + + + project + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.9 + + + + **/*Tests.java + + + **/Abstract*.java + + + + + + + diff --git a/log4j2/pom.xml b/log4j2/pom.xml index 503b8b7..d9f0c5f 100644 --- a/log4j2/pom.xml +++ b/log4j2/pom.xml @@ -5,7 +5,7 @@ org.springframework.amqp.samples log4j2 - 2.1.3.RELEASE + 2.1.5.RELEASE jar log4j2 diff --git a/log4j2/pom.xml-e b/log4j2/pom.xml-e new file mode 100644 index 0000000..d9f0c5f --- /dev/null +++ b/log4j2/pom.xml-e @@ -0,0 +1,88 @@ + + + 4.0.0 + + org.springframework.amqp.samples + log4j2 + 2.1.5.RELEASE + jar + + log4j2 + Spring Boot with Spring AMQP Log4J2 Appender + + + org.springframework.boot + spring-boot-starter-parent + 1.5.3.RELEASE + + + + + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-amqp + + + org.springframework.boot + spring-boot-starter-logging + + + + + + org.springframework.boot + spring-boot-starter-log4j2 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot + + true + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + diff --git a/pom.xml b/pom.xml index 1eaaed0..99f0c52 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.amqp spring-amqp-samples Spring AMQP Samples - 2.1.3.RELEASE + 2.1.5.RELEASE pom helloworld diff --git a/pom.xml-e b/pom.xml-e new file mode 100644 index 0000000..99f0c52 --- /dev/null +++ b/pom.xml-e @@ -0,0 +1,67 @@ + + + 4.0.0 + org.springframework.amqp + spring-amqp-samples + Spring AMQP Samples + 2.1.5.RELEASE + pom + + helloworld + stocks + log4j2 + spring-rabbit-confirms-returns + spring-rabbit-json + spring-rabbit-global-errorhandler + + + UTF-8 + + + + staging + + /${java.io.tmpdir}/spring-amqp/dist + + + + spring-site-staging + file:///${java.io.tmpdir}/spring-amqp/docs/${project.version} + + + spring-milestone-staging + file:///${java.io.tmpdir}/spring-amqp/milestone + + + spring-snapshot-staging + file:///${java.io.tmpdir}/spring-amqp/snapshot + + + + + + https://github.com/SpringSource/spring-amqp-samples + scm:git:git://github.com/SpringSource/spring-amqp-samples.git + scm:git:git://github.com/SpringSource/spring-amqp-samples.git + + + + + + org.springframework.build.aws + org.springframework.build.aws.maven + 3.0.0.RELEASE + + + + + + repository.springframework.maven.snapshots + Spring Framework Repository Including Snapshots + https://repo.spring.io/libs-snapshot + + true + + + + diff --git a/spring-rabbit-confirms-returns/pom.xml b/spring-rabbit-confirms-returns/pom.xml index 8d97818..6f65b91 100644 --- a/spring-rabbit-confirms-returns/pom.xml +++ b/spring-rabbit-confirms-returns/pom.xml @@ -5,7 +5,7 @@ org.springframework.amqp.samples spring-rabbit-confirms-returns - 2.1.3.RELEASE + 2.1.5.RELEASE jar spring-rabbit-confirms-returns diff --git a/spring-rabbit-confirms-returns/pom.xml-e b/spring-rabbit-confirms-returns/pom.xml-e new file mode 100644 index 0000000..6f65b91 --- /dev/null +++ b/spring-rabbit-confirms-returns/pom.xml-e @@ -0,0 +1,50 @@ + + + 4.0.0 + + org.springframework.amqp.samples + spring-rabbit-confirms-returns + 2.1.5.RELEASE + jar + + spring-rabbit-confirms-returns + Demonstrates Configuration for Confirms and Returns + + + org.springframework.boot + spring-boot-starter-parent + 2.0.6.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-amqp + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/spring-rabbit-global-errorhandler/pom.xml b/spring-rabbit-global-errorhandler/pom.xml index 99e9a3a..d6b1438 100644 --- a/spring-rabbit-global-errorhandler/pom.xml +++ b/spring-rabbit-global-errorhandler/pom.xml @@ -5,7 +5,7 @@ com.example spring-rabbit-global-errorhandler - 2.1.3.RELEASE + 2.1.5.RELEASE jar spring-rabbit-global-errorhandler diff --git a/spring-rabbit-global-errorhandler/pom.xml-e b/spring-rabbit-global-errorhandler/pom.xml-e new file mode 100644 index 0000000..d6b1438 --- /dev/null +++ b/spring-rabbit-global-errorhandler/pom.xml-e @@ -0,0 +1,56 @@ + + + 4.0.0 + + com.example + spring-rabbit-global-errorhandler + 2.1.5.RELEASE + jar + + spring-rabbit-global-errorhandler + Shows how to configure a custom error handler applied to listener beans + + + org.springframework.boot + spring-boot-starter-parent + 2.0.6.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-amqp + + + + com.fasterxml.jackson.core + jackson-databind + 2.9.8 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/spring-rabbit-json/pom.xml b/spring-rabbit-json/pom.xml index 1c309fc..2b92d32 100644 --- a/spring-rabbit-json/pom.xml +++ b/spring-rabbit-json/pom.xml @@ -5,7 +5,7 @@ com.example spring-rabbit-json - 2.1.3.RELEASE + 2.1.5.RELEASE jar spring-rabbit-json diff --git a/spring-rabbit-json/pom.xml-e b/spring-rabbit-json/pom.xml-e new file mode 100644 index 0000000..2b92d32 --- /dev/null +++ b/spring-rabbit-json/pom.xml-e @@ -0,0 +1,64 @@ + + + 4.0.0 + + com.example + spring-rabbit-json + 2.1.5.RELEASE + jar + + spring-rabbit-json + Receiving JSON from non-Spring Applications + + + org.springframework.boot + spring-boot-starter-parent + 2.0.6.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-amqp + + + + com.fasterxml.jackson.core + jackson-databind + 2.9.8 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + repository.springframework.maven.snapshots + Spring Framework Repository Including Snapshots + https://repo.spring.io/libs-snapshot + + true + + + + diff --git a/stocks/.DS_Store b/stocks/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..638b0d7026a296895fb31efe27e5047a6d991ff3 GIT binary patch literal 6148 zcmeHKJ8l9o5S<|it(0a9^us9E~@hB50G26hv>N@w3PC zZ21*CJ0hapdG{vLibw-Dl#2~hvwic4%`&1uIL_G1u>0B`K90x3B>U%paThYkMo#ki zoo^d7DnJFO02QDDRN&zXWQlEFAAT|qqykjn*%h$wLxCIC#4*r69T>a?0L~G1!`yob zV6gzOCXRuKz%;19plY@l8g#@<=GDY8FzBM$d}!XR*`cW4j`NGBi`GDnRDcTHEASG_ z*6RNX{!9OVPvVLSP=SA?fX@5(zQdEUwoV>rwYI?5aLc*E%`kTg1~11zFUMF|IbM2F bPDkA7K>iGvE;K6e*9zPK5X%*r literal 0 HcmV?d00001 diff --git a/stocks/pom.xml b/stocks/pom.xml index b133ef7..89bf279 100644 --- a/stocks/pom.xml +++ b/stocks/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.samples.spring spring-rabbit-stocks - 2.1.3.RELEASE + 2.1.5.RELEASE war Spring Rabbit Stocks https://www.spring.io @@ -15,8 +15,8 @@ true - 5.1.3.RELEASE - 2.1.3.RELEASE + 5.1.6.RELEASE + 2.1.5.RELEASE UTF-8 1.8 false diff --git a/stocks/pom.xml-e b/stocks/pom.xml-e new file mode 100644 index 0000000..89bf279 --- /dev/null +++ b/stocks/pom.xml-e @@ -0,0 +1,218 @@ + + + 4.0.0 + org.springframework.samples.spring + spring-rabbit-stocks + 2.1.5.RELEASE + war + Spring Rabbit Stocks + https://www.spring.io + + + + + true + 5.1.6.RELEASE + 2.1.5.RELEASE + UTF-8 + 1.8 + false + + + + + + org.springframework.amqp + spring-amqp + ${spring.amqp.version} + + + org.springframework + spring-core + + + + + org.springframework.amqp + spring-rabbit + ${spring.amqp.version} + + + org.springframework + spring-core + + + org.springframework + spring-messaging + + + org.springframework + spring-tx + + + org.springframework + spring-context + + + org.springframework + spring-web + + + + + + org.springframework + spring-test + ${spring.framework.version} + test + + + org.springframework + spring-context-support + ${spring.framework.version} + runtime + + + org.springframework + spring-aop + ${spring.framework.version} + + + org.springframework + spring-oxm + ${spring.framework.version} + + + org.springframework + spring-messaging + ${spring.framework.version} + + + org.springframework + spring-tx + ${spring.framework.version} + + + org.springframework + spring-webmvc + ${spring.framework.version} + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.servlet + jstl + 1.1.2 + runtime + + + standard + taglibs + 1.1.2 + jar + runtime + + + cglib + cglib-nodep + 2.2 + + + org.aspectj + aspectjrt + 1.5.4 + + + org.aspectj + aspectjweaver + 1.5.4 + + + + com.fasterxml.jackson.core + jackson-databind + 2.9.8 + runtime + + + + junit + junit + 4.8.1 + test + + + + log4j + log4j + 1.2.14 + runtime + + + + com.jgoodies + forms + 1.2.1 + + + + + + + + + com.springsource.bundlor + com.springsource.bundlor.maven + 1.0.0.M1B + + + maven-assembly-plugin + false + + + project + + + + + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.26 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.9 + + + + **/*Tests.java + + + **/Abstract*.java + + + + + + +