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

Master version bump #757

Merged
merged 2 commits into from
Aug 6, 2020
Merged

Master version bump #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05caaf2
Master version bump
tracyboehrer Aug 6, 2020
8d00bdd
Master version bump to Preview6 (second try)
tracyboehrer Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions libraries/bot-ai-luis-v3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -58,10 +58,6 @@
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-builder</artifactId>
</dependency>
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-configuration</artifactId>
</dependency>
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-applicationinsights</artifactId>
Expand Down
6 changes: 1 addition & 5 deletions libraries/bot-ai-qna/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -59,10 +59,6 @@
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-builder</artifactId>
</dependency>
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-configuration</artifactId>
</dependency>
</dependencies>

<profiles>
Expand Down
2 changes: 1 addition & 1 deletion libraries/bot-applicationinsights/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion libraries/bot-azure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion libraries/bot-builder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
90 changes: 0 additions & 90 deletions libraries/bot-configuration/pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion libraries/bot-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion libraries/bot-dialogs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion libraries/bot-integration-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion libraries/bot-integration-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion libraries/bot-schema/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 1 addition & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.microsoft.bot</groupId>
<artifactId>bot-java</artifactId>
<version>4.6.0-preview4</version>
<version>4.6.0-preview6</version>
<packaging>pom</packaging>

<name>Microsoft BotBuilder Java SDK Parent</name>
Expand Down Expand Up @@ -333,11 +333,6 @@
<artifactId>bot-dialogs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-configuration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-ai-luis-v3</artifactId>
Expand Down Expand Up @@ -373,7 +368,6 @@
<module>libraries/bot-builder</module>
<module>libraries/bot-integration-core</module>
<module>libraries/bot-dialogs</module>
<module>libraries/bot-configuration</module>
<module>libraries/bot-ai-luis-v3</module>
<module>libraries/bot-ai-qna</module>
<module>libraries/bot-applicationinsights</module>
Expand Down
2 changes: 1 addition & 1 deletion samples/02.echo-bot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/03.welcome-user/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/08.suggested-actions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/16.proactive-messages/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/45.state-management/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/47.inspection/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/50.teams-messaging-extensions-search/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/51.teams-messaging-extensions-action/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/52.teams-messaging-extensions-search-auth-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/53.teams-messaging-extensions-action-preview/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/54.teams-task-module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/55.teams-link-unfurling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/56.teams-file-upload/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/57.teams-conversation-bot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion samples/58.teams-start-new-thread-in-channel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-spring</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/servlet-echo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<dependency>
<groupId>com.microsoft.bot</groupId>
<artifactId>bot-integration-core</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.6.0-preview6</version>
</dependency>
</dependencies>

Expand Down