From 66fba9387a37934f8765b1c07ca06cbc6b210161 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 21 May 2019 09:20:47 +0100
Subject: [PATCH 1/5] Upgrade to Jackson 2.9.9

Closes gh-16910
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 135074910c..77a219107a 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -80,7 +80,7 @@
 		<httpcore.version>4.4.11</httpcore.version>
 		<infinispan.version>9.4.13.Final</infinispan.version>
 		<influxdb-java.version>2.14</influxdb-java.version>
-		<jackson.version>2.9.8</jackson.version>
+		<jackson.version>2.9.9</jackson.version>
 		<janino.version>3.0.12</janino.version>
 		<javax-activation.version>1.2.0</javax-activation.version>
 		<javax-annotation.version>1.3.2</javax-annotation.version>

From 1af5fc7d62ae5790439368c45ff9dd575293ef3d Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 21 May 2019 09:20:48 +0100
Subject: [PATCH 2/5] Upgrade to Javax Cache 1.1.1

Closes gh-16911
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 77a219107a..453fa6f363 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -84,7 +84,7 @@
 		<janino.version>3.0.12</janino.version>
 		<javax-activation.version>1.2.0</javax-activation.version>
 		<javax-annotation.version>1.3.2</javax-annotation.version>
-		<javax-cache.version>1.1.0</javax-cache.version>
+		<javax-cache.version>1.1.1</javax-cache.version>
 		<javax-jaxws.version>2.3.1</javax-jaxws.version>
 		<javax-jaxb.version>2.3.1</javax-jaxb.version>
 		<javax-jms.version>2.0.1</javax-jms.version>

From 2ce650901fb212053ce2447b35c601e2a55c3793 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 21 May 2019 09:20:50 +0100
Subject: [PATCH 3/5] Upgrade to Tomcat 9.0.20

Closes gh-16912
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 453fa6f363..2e7b882412 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -187,7 +187,7 @@
 		<thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
 		<thymeleaf-extras-java8time.version>3.0.4.RELEASE</thymeleaf-extras-java8time.version>
-		<tomcat.version>9.0.19</tomcat.version>
+		<tomcat.version>9.0.20</tomcat.version>
 		<unboundid-ldapsdk.version>4.0.10</unboundid-ldapsdk.version>
 		<undertow.version>2.0.20.Final</undertow.version>
 		<webjars-hal-browser.version>3325375</webjars-hal-browser.version>

From c8a02ed90a9a77030eb178e9f5ec5692df19b733 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 21 May 2019 09:20:51 +0100
Subject: [PATCH 4/5] Upgrade to Pooled Jms 1.0.5

Closes gh-16913
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 2e7b882412..c974253165 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -142,7 +142,7 @@
 		<netty.version>4.1.36.Final</netty.version>
 		<netty-tcnative.version>2.0.25.Final</netty-tcnative.version>
 		<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
-		<pooled-jms.version>1.0.4</pooled-jms.version>
+		<pooled-jms.version>1.0.5</pooled-jms.version>
 		<postgresql.version>42.2.5</postgresql.version>
 		<prometheus-pushgateway.version>0.5.0</prometheus-pushgateway.version>
 		<quartz.version>2.3.1</quartz.version>

From 29de005ca2f3ba6beef9ba3a2328c8e55658084a Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 21 May 2019 09:28:35 +0100
Subject: [PATCH 5/5] Prohibit upgrade to Couchbase java-client 2.7.5

See gh-16909
---
 .bomr/bomr.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.bomr/bomr.yaml b/.bomr/bomr.yaml
index 027b71eb7f..9da11ac8b8 100644
--- a/.bomr/bomr.yaml
+++ b/.bomr/bomr.yaml
@@ -12,6 +12,8 @@ bomr:
         versions:
           # Jar contains dependencies' classes resulting in duplicates
           - '[2.7.3]'
+          # Artifacts published as .bundle files rather than .jar files
+          - '[2.7.5]'
       - project: dom4j
         versions:
           # Old versions that use yyyymmdd format