From 951290a31eaaf7137e077bb4527b444ec518ed46 Mon Sep 17 00:00:00 2001 From: Lee Parrish <30470292+LeeParrishMSFT@users.noreply.github.com> Date: Fri, 10 Dec 2021 12:46:28 -0600 Subject: [PATCH 1/5] Update mjsal4j library (#1377) # Conflicts: # libraries/bot-connector/pom.xml --- libraries/bot-connector/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/bot-connector/pom.xml b/libraries/bot-connector/pom.xml index be2218b31..503769727 100644 --- a/libraries/bot-connector/pom.xml +++ b/libraries/bot-connector/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.15.0-SNAPSHOT ../../pom.xml @@ -98,7 +98,7 @@ com.microsoft.azure msal4j - 1.8.1 + 1.11.0 From 33ec22bd1befb0a61d276ca864abf15e70f5f055 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 13:22:48 -0600 Subject: [PATCH 2/5] Bump log4j-api from 2.11.0 to 2.15.0 (#1374) Bumps log4j-api from 2.11.0 to 2.15.0. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0028d488c..d8e23c2e7 100644 --- a/pom.xml +++ b/pom.xml @@ -337,7 +337,7 @@ org.apache.logging.log4j log4j-api - 2.11.0 + 2.15.0 test From 8a301ab593879da1f115939102c45c01a294b35b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 13:19:23 -0600 Subject: [PATCH 3/5] Bump log4j-core from 2.13.2 to 2.15.0 (#1375) Bumps log4j-core from 2.13.2 to 2.15.0. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tracyboehrer --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d8e23c2e7..10fd27320 100644 --- a/pom.xml +++ b/pom.xml @@ -349,7 +349,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.15.0 test From 6ee7f6b98ef970a63da1a703e5fc1073b4bbe195 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Fri, 10 Dec 2021 14:32:21 -0600 Subject: [PATCH 4/5] Update to 4.14.1 --- libraries/bot-ai-luis-v3/pom.xml | 2 +- libraries/bot-ai-qna/pom.xml | 2 +- libraries/bot-applicationinsights/pom.xml | 2 +- libraries/bot-azure/pom.xml | 2 +- libraries/bot-builder/pom.xml | 2 +- libraries/bot-dialogs/pom.xml | 2 +- libraries/bot-integration-core/pom.xml | 2 +- libraries/bot-integration-spring/pom.xml | 2 +- libraries/bot-schema/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/bot-ai-luis-v3/pom.xml b/libraries/bot-ai-luis-v3/pom.xml index 769059210..8a5b52ef4 100644 --- a/libraries/bot-ai-luis-v3/pom.xml +++ b/libraries/bot-ai-luis-v3/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 ../../pom.xml diff --git a/libraries/bot-ai-qna/pom.xml b/libraries/bot-ai-qna/pom.xml index 44063ca38..8516b3529 100644 --- a/libraries/bot-ai-qna/pom.xml +++ b/libraries/bot-ai-qna/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 ../../pom.xml diff --git a/libraries/bot-applicationinsights/pom.xml b/libraries/bot-applicationinsights/pom.xml index 5babd11cc..3007b3961 100644 --- a/libraries/bot-applicationinsights/pom.xml +++ b/libraries/bot-applicationinsights/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 ../../pom.xml diff --git a/libraries/bot-azure/pom.xml b/libraries/bot-azure/pom.xml index 30d4032d9..5bbd24460 100644 --- a/libraries/bot-azure/pom.xml +++ b/libraries/bot-azure/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 ../../pom.xml diff --git a/libraries/bot-builder/pom.xml b/libraries/bot-builder/pom.xml index 1e877a2ea..e16ab99f9 100644 --- a/libraries/bot-builder/pom.xml +++ b/libraries/bot-builder/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 ../../pom.xml diff --git a/libraries/bot-dialogs/pom.xml b/libraries/bot-dialogs/pom.xml index e4bc0baf4..8783fbf18 100644 --- a/libraries/bot-dialogs/pom.xml +++ b/libraries/bot-dialogs/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 ../../pom.xml diff --git a/libraries/bot-integration-core/pom.xml b/libraries/bot-integration-core/pom.xml index 330231d47..b3be1ecb0 100644 --- a/libraries/bot-integration-core/pom.xml +++ b/libraries/bot-integration-core/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 ../../pom.xml diff --git a/libraries/bot-integration-spring/pom.xml b/libraries/bot-integration-spring/pom.xml index 15992aeb2..1112a703d 100644 --- a/libraries/bot-integration-spring/pom.xml +++ b/libraries/bot-integration-spring/pom.xml @@ -5,7 +5,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 ../../pom.xml diff --git a/libraries/bot-schema/pom.xml b/libraries/bot-schema/pom.xml index 338dcf05d..76e1410b5 100644 --- a/libraries/bot-schema/pom.xml +++ b/libraries/bot-schema/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 ../../pom.xml diff --git a/pom.xml b/pom.xml index 0028d488c..8fb74a5e8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.microsoft.bot bot-java - 4.14.0 + 4.14.1 pom Microsoft BotBuilder Java SDK Parent From 737a8fd4350a138044b4bc429cf6b0bf0e5df3a3 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Fri, 10 Dec 2021 14:34:11 -0600 Subject: [PATCH 5/5] Updated Connector version --- libraries/bot-connector/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/bot-connector/pom.xml b/libraries/bot-connector/pom.xml index 503769727..6e8bba366 100644 --- a/libraries/bot-connector/pom.xml +++ b/libraries/bot-connector/pom.xml @@ -6,7 +6,7 @@ com.microsoft.bot bot-java - 4.15.0-SNAPSHOT + 4.14.1 ../../pom.xml