Merge branch 'master' into trboehre/teamstask

tracyboehrer · tracyboehrer · commit e6fa8508cd6e · 2020-08-06T10:31:16.000-05:00
# Conflicts:
#	samples/54.teams-task-module/pom.xml
diff --git a/Generator/generator-botbuilder-java/package-lock.json b/Generator/generator-botbuilder-java/package-lock.json
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.6.0-preview4</version>
+    <version>4.6.0-preview6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -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>
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.6.0-preview4</version>
+    <version>4.6.0-preview6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -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>
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.6.0-preview4</version>
+    <version>4.6.0-preview6</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.6.0-preview4</version>
+    <version>4.6.0-preview6</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.6.0-preview4</version>
+    <version>4.6.0-preview6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/libraries/bot-configuration/pom.xml b/libraries/bot-configuration/pom.xml
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.6.0-preview4</version>
+    <version>4.6.0-preview6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
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.6.0-preview4</version>
+    <version>4.6.0-preview6</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.6.0-preview4</version>
+    <version>4.6.0-preview6</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.6.0-preview4</version>
+    <version>4.6.0-preview6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
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.6.0-preview4</version>
+    <version>4.6.0-preview6</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.6.0-preview4</version>
+  <version>4.6.0-preview6</version>
   <packaging>pom</packaging>
 
   <name>Microsoft BotBuilder Java SDK Parent</name>
@@ -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>
@@ -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>
diff --git a/samples/02.echo-bot/pom.xml b/samples/02.echo-bot/pom.xml
@@ -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>
diff --git a/samples/03.welcome-user/pom.xml b/samples/03.welcome-user/pom.xml
@@ -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>
diff --git a/samples/08.suggested-actions/pom.xml b/samples/08.suggested-actions/pom.xml
@@ -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>
diff --git a/samples/16.proactive-messages/pom.xml b/samples/16.proactive-messages/pom.xml
@@ -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>
diff --git a/samples/45.state-management/pom.xml b/samples/45.state-management/pom.xml
@@ -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>
diff --git a/samples/47.inspection/pom.xml b/samples/47.inspection/pom.xml
@@ -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>
diff --git a/samples/50.teams-messaging-extensions-search/pom.xml b/samples/50.teams-messaging-extensions-search/pom.xml
@@ -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>
diff --git a/samples/51.teams-messaging-extensions-action/pom.xml b/samples/51.teams-messaging-extensions-action/pom.xml
@@ -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>
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/pom.xml b/samples/52.teams-messaging-extensions-search-auth-config/pom.xml
@@ -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>
diff --git a/samples/53.teams-messaging-extensions-action-preview/pom.xml b/samples/53.teams-messaging-extensions-action-preview/pom.xml
@@ -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>
diff --git a/samples/54.teams-task-module/pom.xml b/samples/54.teams-task-module/pom.xml
@@ -77,7 +77,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.6.0-preview4</version>
+        <version>4.6.0-preview6</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
diff --git a/samples/55.teams-link-unfurling/pom.xml b/samples/55.teams-link-unfurling/pom.xml
@@ -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>
diff --git a/samples/56.teams-file-upload/pom.xml b/samples/56.teams-file-upload/pom.xml
@@ -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>
diff --git a/samples/56.teams-file-upload/src/main/java/com/microsoft/bot/sample/teamsfileupload/TeamsFileUploadBot.java b/samples/56.teams-file-upload/src/main/java/com/microsoft/bot/sample/teamsfileupload/TeamsFileUploadBot.java
diff --git a/samples/57.teams-conversation-bot/pom.xml b/samples/57.teams-conversation-bot/pom.xml
diff --git a/samples/58.teams-start-new-thread-in-channel/pom.xml b/samples/58.teams-start-new-thread-in-channel/pom.xml
diff --git a/samples/servlet-echo/pom.xml b/samples/servlet-echo/pom.xml
