Additional Security Updates (#1409)

LeeParrishMSFT · dependabot[bot] · gabog · web-flow · commit 423349ef34f5 · 2022-01-05T10:56:06.000-06:00
* Bump log4j-core from 2.17.0 to 2.17.1 (#1406) Bumps log4j-core from 2.17.0 to 2.17.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump log4j-api from 2.17.0 to 2.17.1 (#1405) Bumps log4j-api from 2.17.0 to 2.17.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update to pick up correct SDK version (#1404) * Update to pick up correct SDK version * Fix unit test in QnAMaker and spelling in comment. Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com> * Update version to 4.14.2 Bump log4j-core from 2.17.0 to 2.17.1 (#1406) Bumps log4j-core from 2.17.0 to 2.17.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update spring-core and spring-boot packages. (#1408) Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com>
diff --git a/libraries/bot-ai-luis-v3/pom.xml b/libraries/bot-ai-luis-v3/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libraries/bot-ai-qna/pom.xml b/libraries/bot-ai-qna/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerTests.java b/libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerTests.java
@@ -803,7 +803,7 @@ public void qnaMakerUserAgent() {
                 results[0].getAnswer());
 
             // Verify that we added the bot.builder package details.
-            Assert.assertTrue(request.getHeader("User-Agent").contains("BotBuilder/4.0.0"));
+            Assert.assertTrue(request.getHeader("User-Agent").contains("BotBuilder/4."));
         } catch (Exception ex) {
             fail();
         } finally {
diff --git a/libraries/bot-applicationinsights/pom.xml b/libraries/bot-applicationinsights/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libraries/bot-azure/pom.xml b/libraries/bot-azure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libraries/bot-builder/pom.xml b/libraries/bot-builder/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libraries/bot-connector/pom.xml b/libraries/bot-connector/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libraries/bot-connector/src/main/java/com/microsoft/bot/connector/ConnectorConfiguration.java b/libraries/bot-connector/src/main/java/com/microsoft/bot/connector/ConnectorConfiguration.java
@@ -13,19 +13,18 @@
 /**
  * Loads configuration properties for bot-connector.
  *
- * Properties are located in an optional connector.properties file in the
- * classpath.
+ * The version of the package will be in the project.properties file.
  */
 public class ConnectorConfiguration {
     /**
      * Load and pass properties to a function.
-     * 
+     *
      * @param func The function to process the loaded properties.
      */
     public void process(Consumer<Properties> func) {
         final Properties properties = new Properties();
         try (InputStream propStream =
-            UserAgent.class.getClassLoader().getResourceAsStream("connector.properties")) {
+            UserAgent.class.getClassLoader().getResourceAsStream("project.properties")) {
 
             properties.load(propStream);
             if (!properties.containsKey("version")) {
diff --git a/libraries/bot-dialogs/pom.xml b/libraries/bot-dialogs/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libraries/bot-integration-core/pom.xml b/libraries/bot-integration-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libraries/bot-integration-spring/pom.xml b/libraries/bot-integration-spring/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>5.3.1</version>
+      <version>5.3.14</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot</artifactId>
-      <version>2.4.0</version>
+      <version>2.6.2</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/libraries/bot-schema/pom.xml b/libraries/bot-schema/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.bot</groupId>
     <artifactId>bot-java</artifactId>
-    <version>4.14.1</version>
+    <version>4.14.2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.microsoft.bot</groupId>
   <artifactId>bot-java</artifactId>
-  <version>4.14.1</version>
+  <version>4.14.2</version>
   <packaging>pom</packaging>
 
   <name>Microsoft BotBuilder Java SDK Parent</name>
@@ -337,7 +337,7 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>
-        <version>2.15.0</version>
+        <version>2.17.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -349,7 +349,7 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
-        <version>2.15.0</version>
+        <version>2.17.1</version>
         <scope>test</scope>
       </dependency>
 
