Граф коммитов

882 Коммитов

Автор SHA1 Сообщение Дата
microsoft-github-policy-service[bot] 416b237454
Microsoft mandatory file (#1515)
Co-authored-by: microsoft-github-policy-service[bot] <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com>
2023-06-02 14:35:34 -05:00
harinandan-reddy 6156546e20
Make the milliseconds in date format optional (#1502) (#1503)
Co-authored-by: Harinandan Chintamreddy <hchintamreddy@axiamatic.com>
2023-01-12 10:34:46 -06:00
tracyboehrer f3f8a40735
Updated retirement notice (#1501)
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
2022-12-13 11:51:43 -06:00
BruceHaley 05c743836a
Fix failing tests in BotBuilder-Java-4.0-daily-yaml (#1500)
* Add maven-javadoc-plugin skip (605)

* Add maven-javadoc-plugin skip (217)

* Add maven-javadoc-plugin skip (158)

* Undo 2 skips, keep the one at 605

* Add Publish surefire-reports to artifacts

* Tweak publish surefire

* Try timeout 1 ms instead of 0

* Add .delay(500) to qnaMakerTraceActivity()

* Try timeout 10 ms instead of 1

* Disable QnAMakerTests

* Disable 2 OAuthPromptTimesOut_ tests

* Disable another OAuthPromptTimesOut_ test

* Add back 1 QnAMakerTests test

* Cleanup

* Try no longer skipping javadoc

* Add back the .send delay

* Run QnAMakerTests with debug logging

* Pring method names

* Add  PrintMethodName()

* Trying console writes

* Clean up PrintMethodName

* Switch back to System.out.println

* Clean up PrintMethodName 2

* Uncomment assertEquals("BaseCamp:

* Turn debug off

* PrintMethodName tweak

* Back to <include>**/*Test*.java

* Re-enable OAuthPromptTimesOut_ tests

* Delete log file

* Try adding a delay to PromptTimeoutEndsDialogTest

* Add another delay to PromptTimeoutEndsDialogTest

* Add PrintMethodName(); to TranscriptStoreTests

* Add delay to testDateLogUpdateActivities

* Add another delay to testDateLogUpdateActivities

* Add another sleep to testDateLogUpdateActivities

* Add publish surefire-reports for bot-azure

* Adjust delays in testDateLogUpdateActivities

* Remove publish artifacts

* Remove sleep, readjust delays to testDateLogUpdateActivities

* Revert to commit c7ea9ff
2022-12-06 08:06:15 -06:00
tracyboehrer 98b1767be3
Marked packages and ActivityHandler as deprecated to cause build warnings (#1498)
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
2022-10-27 10:07:13 -05:00
tracyboehrer 1d560387c2
Updated dependencies (#1497)
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
2022-10-27 08:50:02 -05:00
tracyboehrer aa964a3272
Updated yeoman (#1496)
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
2022-10-26 11:48:45 -05:00
tracyboehrer a168f2bae1
Corrected previous merge snafu (#1495)
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
2022-10-26 09:19:33 -05:00
dependabot[bot] 288f49f9dc
Bump snakeyaml from 1.27 to 1.32 in /libraries/bot-dialogs (#1494)
Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.27 to 1.32.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-1.32..snakeyaml-1.27)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2022-10-26 08:44:38 -05:00
Nicolas Deverge aced29206c
Fix for vulnerability https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKHTTP3-2958044 (#1483)
* The link is broken, due to uppercase letter.

* Upgrading okhttp to 4.9.2 in order to fix vulnerability https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKHTTP3-2958044

Co-authored-by: Nicolas Deverge <nicolas@teammood.com>
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2022-10-26 08:44:05 -05:00
esfomeado 55b62eb9b8
Updated dependencies (#1491)
* Ignore fields to avoid duplicated values

* Updated dependencies

* Revert

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2022-10-26 08:37:36 -05:00
dependabot[bot] 29cb98e87d
Bump jackson-databind from 2.13.3 to 2.13.4.1 (#1492)
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.3 to 2.13.4.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2022-10-25 16:24:57 -05:00
tracyboehrer 7ec7ba25d7
Added retirement announcement to README (#1493)
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
2022-10-19 13:57:13 -05:00
dependabot[bot] fd8ceb672f
Bump spring-core in /libraries/bot-integration-spring (#1470)
Bumps [spring-core](https://github.com/spring-projects/spring-framework) from 5.3.19 to 5.3.20.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.19...v5.3.20)

---
updated-dependencies:
- dependency-name: org.springframework:spring-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-25 14:20:16 -05:00
tracyboehrer d776095498
Updated azure dependencies (#1484)
* Updated azure dependencies

* Updated Jackson dependencies

* Update POM jackson dependencies

Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
2022-07-25 11:42:08 -05:00
tracyboehrer 0e7f20dd6b
Fixed AdaptiveCardInvokeValue deserializing (#1481)
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
2022-07-21 10:02:35 -05:00
dependabot[bot] 4029851c81
Bump spring-boot-starter-web in /libraries/bot-integration-spring (#1460)
Bumps [spring-boot-starter-web](https://github.com/spring-projects/spring-boot) from 2.4.11 to 2.5.12.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.4.11...v2.5.12)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-web
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lee Parrish <30470292+LeeParrishMSFT@users.noreply.github.com>
2022-04-29 16:13:07 -05:00
dependabot[bot] 27c16ed213
Bump spring-beans in /libraries/bot-integration-spring (#1459)
Bumps [spring-beans](https://github.com/spring-projects/spring-framework) from 5.3.9 to 5.3.18.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.9...v5.3.18)

---
updated-dependencies:
- dependency-name: org.springframework:spring-beans
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-29 14:48:34 -05:00
dependabot[bot] 8a3aedfd86
Bump jackson-databind from 2.12.1 to 2.12.6.1 (#1465)
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.12.1 to 2.12.6.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-29 13:37:00 -05:00
dependabot[bot] 541408d5d7
Bump spring-core in /libraries/bot-integration-spring (#1464)
Bumps [spring-core](https://github.com/spring-projects/spring-framework) from 5.3.14 to 5.3.19.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.14...v5.3.19)

---
updated-dependencies:
- dependency-name: org.springframework:spring-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-29 12:04:14 -05:00
wifwucite a574d86c97
Update Dialog.java (#1429)
* Update Dialog.java

Fixes issue 1428.

* Update Dialog.java

Fix formatting which is causing a CheckStyle error in build validation.

Co-authored-by: Lee Parrish <30470292+LeeParrishMSFT@users.noreply.github.com>
2022-01-20 15:31:25 -06:00
dependabot[bot] 440a19196c
Bump log4j-api in /generators/generators/app/templates/echo/project (#1414)
Bumps log4j-api from 2.15.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lee Parrish <30470292+LeeParrishMSFT@users.noreply.github.com>
2022-01-07 12:14:18 -06:00
dependabot[bot] f9e12165ec
Bump log4j-core in /generators/generators/app/templates/echo/project (#1415)
Bumps log4j-core from 2.15.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-07 11:57:12 -06:00
Cecilia Avila 6be4a27186
[#1364] Move Java generators from Samples to "generators" - Echo bot (#1390)
* Add generators echo bot

* Add target folder

* Apply update from samples PR#3627

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
Co-authored-by: Lee Parrish <30470292+LeeParrishMSFT@users.noreply.github.com>
2022-01-05 12:27:07 -06:00
dependabot[bot] cae418caca
Bump log4j-api in /generators/generators/app/templates/core/project (#1411)
Bumps log4j-api from 2.15.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-05 11:58:53 -06:00
dependabot[bot] 6d33514a85
Bump log4j-api in /generators/generators/app/templates/empty/project (#1412)
Bumps log4j-api from 2.15.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-05 11:58:31 -06:00
dependabot[bot] 4fe64b19e1
Bump log4j-core in /generators/generators/app/templates/empty/project (#1413)
Bumps log4j-core from 2.15.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-05 11:58:20 -06:00
dependabot[bot] 34ba5624b8
Bump log4j-core in /generators/generators/app/templates/core/project (#1410)
Bumps log4j-core from 2.15.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-05 11:58:10 -06:00
Cecilia Avila db0ba0cc2d
[#1364] Move Java generators from Samples to "generators" - Empty bot (#1391)
* Add generators empty bot

* Apply update from samples PR#3627

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2022-01-05 11:50:44 -06:00
Cecilia Avila 380b3b4da6
[#1364] Move Java generators from Samples to "generators" - Core bot (#1392)
* Add generators core bot

* Apply update from samples PR#3627

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2022-01-05 11:13:12 -06:00
Lee Parrish f78b616047
Update spring-core and spring-boot packages. (#1408)
Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com>
2022-01-04 14:42:40 -06:00
Lee Parrish 10f0ead4dc
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>
2022-01-04 11:29:28 -06:00
dependabot[bot] 9ae97eb2f4
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>
2022-01-04 11:08:24 -06:00
dependabot[bot] 0f211ac5fd
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>
2022-01-04 11:08:04 -06:00
dependabot[bot] d420e2f109
Bump log4j-api from 2.16.0 to 2.17.0 (#1399)
Bumps log4j-api from 2.16.0 to 2.17.0.

---
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>
2021-12-20 08:15:54 -06:00
dependabot[bot] 096127d80f
Bump log4j-core from 2.16.0 to 2.17.0 (#1400)
Bumps log4j-core from 2.16.0 to 2.17.0.

---
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>
2021-12-20 08:15:34 -06:00
dependabot[bot] 3fb0a49199
Bump log4j-api from 2.15.0 to 2.16.0 (#1393)
Bumps log4j-api from 2.15.0 to 2.16.0.

---
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>
2021-12-14 15:46:57 -06:00
dependabot[bot] cbfcdb7617
Bump log4j-core from 2.15.0 to 2.16.0 (#1394)
Bumps log4j-core from 2.15.0 to 2.16.0.

---
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>
2021-12-14 15:46:47 -06:00
Yujia Yan 6367769151
fix flaky json test (#1367) 2021-12-10 13:34:16 -06:00
dependabot[bot] eb84c9e194
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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-10 13:22:48 -06:00
dependabot[bot] 98c3884307
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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2021-12-10 13:19:23 -06:00
Lee Parrish 9b6f41c613
Update mjsal4j library (#1377) 2021-12-10 12:46:28 -06:00
Gabo Gilabert c048de28cc
Added code owners file (#1354) 2021-11-16 06:13:17 -08:00
BruceHaley d170c23a02
Update azure dependencies to the October releases. (#1343) 2021-10-29 09:34:46 -05:00
BruceHaley b75ebf20c0
Fix dir workspace (#1334) 2021-10-06 15:13:07 -05:00
BruceHaley 540100a9bf
Bruce/jsonsmartvulnerabilityfix9 24 (#1325)
* Upgrade spring-boot-starter-test for json-smart vulnerability.

* Bump version for json-smart
2021-09-29 14:11:35 -05:00
SUPUN KAVINDA 940c8826ad
Fix java doc issue (#1319)
* fixed java doc issue in BotController class

* fixed java doc issue in BotController class
2021-09-13 08:56:13 -05:00
BruceHaley 46a75ba65c
Fix pipeline BotBuilder-Java-4.0-daily-yaml and some Javadoc errors (#1315)
* Fix Activity.java for build

* Drop @throws from Serialization.java

* Fixes to  "Error while generating Javadoc"

* More generating Javadoc error fixes.

* Fix CopyFiles@2 in .yml

* Fix CopyFiles@2 #2

* Add Resolve package version variable

* Fix powershell steps

* powershell tweaks

* Mo re powershell fixes

* Set build id, other tweaks
2021-09-09 16:39:14 -05:00
Lee Parrish d45fcdb0db
Update Activity and unit tests (#1311)
* Update Activity and unit tests

* Update TestAdapter to match C#

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2021-08-17 12:45:59 -05:00
Lee Parrish 5530313584
Extend maxTimeout (#1309)
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
2021-08-16 15:29:17 -05:00