Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit 423349e

Browse files
LeeParrishMSFTdependabot[bot]gabog
authored
Additional Security Updates (#1409)
* 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>
1 parent 2f0b04c commit 423349e

File tree

13 files changed

+19
-20
lines changed

13 files changed

+19
-20
lines changed

‎libraries/bot-ai-luis-v3/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.microsoft.bot</groupId>
88
<artifactId>bot-java</artifactId>
9-
<version>4.14.1</version>
9+
<version>4.14.2</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎libraries/bot-ai-qna/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.microsoft.bot</groupId>
88
<artifactId>bot-java</artifactId>
9-
<version>4.14.1</version>
9+
<version>4.14.2</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎libraries/bot-ai-qna/src/test/java/com/microsoft/bot/ai/qna/QnAMakerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ public void qnaMakerUserAgent() {
803803
results[0].getAnswer());
804804

805805
// Verify that we added the bot.builder package details.
806-
Assert.assertTrue(request.getHeader("User-Agent").contains("BotBuilder/4.0.0"));
806+
Assert.assertTrue(request.getHeader("User-Agent").contains("BotBuilder/4."));
807807
} catch (Exception ex) {
808808
fail();
809809
} finally {

‎libraries/bot-applicationinsights/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.microsoft.bot</groupId>
88
<artifactId>bot-java</artifactId>
9-
<version>4.14.1</version>
9+
<version>4.14.2</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎libraries/bot-azure/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.microsoft.bot</groupId>
88
<artifactId>bot-java</artifactId>
9-
<version>4.14.1</version>
9+
<version>4.14.2</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎libraries/bot-builder/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.microsoft.bot</groupId>
88
<artifactId>bot-java</artifactId>
9-
<version>4.14.1</version>
9+
<version>4.14.2</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎libraries/bot-connector/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.microsoft.bot</groupId>
88
<artifactId>bot-java</artifactId>
9-
<version>4.14.1</version>
9+
<version>4.14.2</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎libraries/bot-connector/src/main/java/com/microsoft/bot/connector/ConnectorConfiguration.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@
1313
/**
1414
* Loads configuration properties for bot-connector.
1515
*
16-
* Properties are located in an optional connector.properties file in the
17-
* classpath.
16+
* The version of the package will be in the project.properties file.
1817
*/
1918
public class ConnectorConfiguration {
2019
/**
2120
* Load and pass properties to a function.
22-
*
21+
*
2322
* @param func The function to process the loaded properties.
2423
*/
2524
public void process(Consumer<Properties> func) {
2625
final Properties properties = new Properties();
2726
try (InputStream propStream =
28-
UserAgent.class.getClassLoader().getResourceAsStream("connector.properties")) {
27+
UserAgent.class.getClassLoader().getResourceAsStream("project.properties")) {
2928

3029
properties.load(propStream);
3130
if (!properties.containsKey("version")) {

‎libraries/bot-dialogs/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.microsoft.bot</groupId>
88
<artifactId>bot-java</artifactId>
9-
<version>4.14.1</version>
9+
<version>4.14.2</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎libraries/bot-integration-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.microsoft.bot</groupId>
88
<artifactId>bot-java</artifactId>
9-
<version>4.14.1</version>
9+
<version>4.14.2</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎libraries/bot-integration-spring/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.microsoft.bot</groupId>
77
<artifactId>bot-java</artifactId>
8-
<version>4.14.1</version>
8+
<version>4.14.2</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>org.springframework</groupId>
6969
<artifactId>spring-core</artifactId>
70-
<version>5.3.1</version>
70+
<version>5.3.14</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.springframework</groupId>
@@ -77,7 +77,7 @@
7777
<dependency>
7878
<groupId>org.springframework.boot</groupId>
7979
<artifactId>spring-boot</artifactId>
80-
<version>2.4.0</version>
80+
<version>2.6.2</version>
8181
<scope>compile</scope>
8282
</dependency>
8383

‎libraries/bot-schema/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.microsoft.bot</groupId>
88
<artifactId>bot-java</artifactId>
9-
<version>4.14.1</version>
9+
<version>4.14.2</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.microsoft.bot</groupId>
77
<artifactId>bot-java</artifactId>
8-
<version>4.14.1</version>
8+
<version>4.14.2</version>
99
<packaging>pom</packaging>
1010

1111
<name>Microsoft BotBuilder Java SDK Parent</name>
@@ -337,7 +337,7 @@
337337
<dependency>
338338
<groupId>org.apache.logging.log4j</groupId>
339339
<artifactId>log4j-api</artifactId>
340-
<version>2.15.0</version>
340+
<version>2.17.1</version>
341341
<scope>test</scope>
342342
</dependency>
343343
<dependency>
@@ -349,7 +349,7 @@
349349
<dependency>
350350
<groupId>org.apache.logging.log4j</groupId>
351351
<artifactId>log4j-core</artifactId>
352-
<version>2.15.0</version>
352+
<version>2.17.1</version>
353353
<scope>test</scope>
354354
</dependency>
355355

0 commit comments

Comments
 (0)