Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SantoshKumar89/botbuilder-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: microsoft/botbuilder-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 26 files changed
  • 11 contributors

Commits on Apr 29, 2022

  1. Bump spring-core in /libraries/bot-integration-spring (microsoft#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](spring-projects/spring-framework@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>
    @dependabot
    dependabot[bot] authored Apr 29, 2022
    Configuration menu
    Copy the full SHA
    541408d View commit details
    Browse the repository at this point in the history

  2. Bump jackson-databind from 2.12.1 to 2.12.6.1 (microsoft#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>
    @dependabot
    dependabot[bot] authored Apr 29, 2022
    Configuration menu
    Copy the full SHA
    8a3aedf View commit details
    Browse the repository at this point in the history

  3. Bump spring-beans in /libraries/bot-integration-spring (microsoft#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](spring-projects/spring-framework@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>
    @dependabot
    dependabot[bot] authored Apr 29, 2022
    Configuration menu
    Copy the full SHA
    27c16ed View commit details
    Browse the repository at this point in the history

  4. Bump spring-boot-starter-web in /libraries/bot-integration-spring (mi… 

    …crosoft#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](spring-projects/spring-boot@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>
    @dependabot @LeeParrishMSFT
    dependabot[bot] and LeeParrishMSFT authored Apr 29, 2022
    Configuration menu
    Copy the full SHA
    4029851 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. Fixed AdaptiveCardInvokeValue deserializing (microsoft#1481) 

    Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
    @tracyboehrer
    tracyboehrer and Tracy Boehrer authored Jul 21, 2022
    Configuration menu
    Copy the full SHA
    0e7f20d View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2022

  1. Updated azure dependencies (microsoft#1484) 

    * Updated azure dependencies

* Updated Jackson dependencies

* Update POM jackson dependencies

Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
    @tracyboehrer
    tracyboehrer and Tracy Boehrer authored Jul 25, 2022
    Configuration menu
    Copy the full SHA
    d776095 View commit details
    Browse the repository at this point in the history

  2. Bump spring-core in /libraries/bot-integration-spring (microsoft#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](spring-projects/spring-framework@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>
    @dependabot
    dependabot[bot] authored Jul 25, 2022
    Configuration menu
    Copy the full SHA
    fd8ceb6 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. Added retirement announcement to README (microsoft#1493) 

    Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
    @tracyboehrer
    tracyboehrer and Tracy Boehrer authored Oct 19, 2022
    Configuration menu
    Copy the full SHA
    7ec7ba2 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2022

  1. Bump jackson-databind from 2.13.3 to 2.13.4.1 (microsoft#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>
    @dependabot @tracyboehrer
    dependabot[bot] and tracyboehrer authored Oct 25, 2022
    Configuration menu
    Copy the full SHA
    29cb98e View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2022

  1. Updated dependencies (microsoft#1491) 

    * Ignore fields to avoid duplicated values

* Updated dependencies

* Revert

Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
    @esfomeado @tracyboehrer
    esfomeado and tracyboehrer authored Oct 26, 2022
    Configuration menu
    Copy the full SHA
    55b62eb View commit details
    Browse the repository at this point in the history

  2. Fix for vulnerability https://security.snyk.io/vuln/SNYK-JAVA-COMSQUA… 

    …REUPOKHTTP3-2958044 (microsoft#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>
    @ndeverge @tracyboehrer
    3 people authored Oct 26, 2022
    Configuration menu
    Copy the full SHA
    aced292 View commit details
    Browse the repository at this point in the history

  3. Bump snakeyaml from 1.27 to 1.32 in /libraries/bot-dialogs (microsoft… 

    …#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>
    @dependabot @tracyboehrer
    dependabot[bot] and tracyboehrer authored Oct 26, 2022
    Configuration menu
    Copy the full SHA
    288f49f View commit details
    Browse the repository at this point in the history

  4. Corrected previous merge snafu (microsoft#1495) 

    Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
    @tracyboehrer
    tracyboehrer and Tracy Boehrer authored Oct 26, 2022
    Configuration menu
    Copy the full SHA
    a168f2b View commit details
    Browse the repository at this point in the history

  5. Updated yeoman (microsoft#1496) 

    Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
    @tracyboehrer
    tracyboehrer and Tracy Boehrer authored Oct 26, 2022
    Configuration menu
    Copy the full SHA
    aa964a3 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2022

  1. Updated dependencies (microsoft#1497) 

    Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
    @tracyboehrer
    tracyboehrer and Tracy Boehrer authored Oct 27, 2022
    Configuration menu
    Copy the full SHA
    1d56038 View commit details
    Browse the repository at this point in the history

  2. Marked packages and ActivityHandler as deprecated to cause build warn… 

    …ings (microsoft#1498)

Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
    @tracyboehrer
    tracyboehrer and Tracy Boehrer authored Oct 27, 2022
    Configuration menu
    Copy the full SHA
    98b1767 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. Fix failing tests in BotBuilder-Java-4.0-daily-yaml (microsoft#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
    BruceHaley authored Dec 6, 2022
    Configuration menu
    Copy the full SHA
    05c7438 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. Updated retirement notice (microsoft#1501) 

    Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
    @tracyboehrer
    tracyboehrer and Tracy Boehrer authored Dec 13, 2022
    Configuration menu
    Copy the full SHA
    f3f8a40 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

  1. Make the milliseconds in date format optional (microsoft#1502) (micro… 

    …soft#1503)

Co-authored-by: Harinandan Chintamreddy <hchintamreddy@axiamatic.com>
    @harinandan-reddy @hchintamreddy
    harinandan-reddy and hchintamreddy authored Jan 12, 2023
    Configuration menu
    Copy the full SHA
    6156546 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Microsoft mandatory file (microsoft#1515) 

    Co-authored-by: microsoft-github-policy-service[bot] <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com>
    @microsoft-github-policy-service
    microsoft-github-policy-service[bot] authored Jun 2, 2023
    Configuration menu
    Copy the full SHA
    416b237 View commit details
    Browse the repository at this point in the history
Loading