Revert "Updated Teams microsoft#51 manifest to match Dotnet (microsof…

…t#3371)" (microsoft#3372) This reverts commit af5521a.
mkcomer · Jul 8, 2021 · 1017471 · 1017471
1 parent af5521a
commit 1017471
Show file tree

Hide file tree

Showing 50 changed files with 125 additions and 175 deletions.
diff --git a/generators/java/generators/app/templates/core/project/pom.xml b/generators/java/generators/app/templates/core/project/pom.xml
@@ -81,18 +81,18 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-dialogs</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-ai-luis-v3</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
       </dependency>
   </dependencies>
 

diff --git a/generators/java/generators/app/templates/echo/project/pom.xml b/generators/java/generators/app/templates/echo/project/pom.xml
@@ -66,7 +66,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/generators/java/generators/app/templates/empty/project/pom.xml b/generators/java/generators/app/templates/empty/project/pom.xml
@@ -66,7 +66,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/generators/java/package.json b/generators/java/package.json
@@ -1,6 +1,6 @@
 {
     "name": "generator-botbuilder-java",
-    "version": "4.14.0",
+    "version": "4.13.1",
     "description": "A yeoman generator for creating Java bots built with Bot Framework v4",
     "homepage": "https://github.com/Microsoft/BotBuilder-Samples/tree/master/generators/generator-botbuilder",
     "author": {

diff --git a/generators/python/app/templates/core/{{cookiecutter.bot_name}}/requirements.txt b/generators/python/app/templates/core/{{cookiecutter.bot_name}}/requirements.txt
@@ -1,4 +1,4 @@
-botbuilder-integration-aiohttp>=4.14.0
-botbuilder-dialogs>=4.14.0
-botbuilder-ai>=4.14.0
+botbuilder-integration-aiohttp>=4.13.0
+botbuilder-dialogs>=4.13.0
+botbuilder-ai>=4.13.0
 datatypes-date-time>=1.0.0.a2
diff --git a/generators/python/app/templates/echo/{{cookiecutter.bot_name}}/requirements.txt b/generators/python/app/templates/echo/{{cookiecutter.bot_name}}/requirements.txt
@@ -1 +1 @@
-botbuilder-integration-aiohttp>=4.14.0
+botbuilder-integration-aiohttp>=4.13.0
diff --git a/generators/python/app/templates/empty/{{cookiecutter.bot_name}}/requirements.txt b/generators/python/app/templates/empty/{{cookiecutter.bot_name}}/requirements.txt
@@ -1 +1 @@
-botbuilder-integration-aiohttp>=4.14.0
+botbuilder-integration-aiohttp>=4.13.0
diff --git a/samples/java_springboot/02.echo-bot/pom.xml b/samples/java_springboot/02.echo-bot/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.echo.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,7 +92,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/03.welcome-user/pom.xml b/samples/java_springboot/03.welcome-user/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.welcomeuser.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,7 +92,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/05.multi-turn-prompt/pom.xml b/samples/java_springboot/05.multi-turn-prompt/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.multiturnprompt.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,13 +92,13 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-dialogs</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/06.using-cards/pom.xml b/samples/java_springboot/06.using-cards/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.usingcards.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,13 +92,13 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-dialogs</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/07.using-adaptive-cards/pom.xml b/samples/java_springboot/07.using-adaptive-cards/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.usingadaptivecards.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,19 +92,19 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-dialogs</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-builder</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>  </dependencies>
 

diff --git a/samples/java_springboot/08.suggested-actions/pom.xml b/samples/java_springboot/08.suggested-actions/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.suggestedactions.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,7 +92,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/11.qnamaker/pom.xml b/samples/java_springboot/11.qnamaker/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.qnamaker.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -77,7 +77,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-ai-qna</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
       </dependency>
 
       <dependency>
@@ -98,7 +98,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/13.core-bot/pom.xml b/samples/java_springboot/13.core-bot/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.core.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,18 +92,18 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-dialogs</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-ai-luis-v3</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
       </dependency>
   </dependencies>
 

diff --git a/samples/java_springboot/14.nlp-with-dispatch/pom.xml b/samples/java_springboot/14.nlp-with-dispatch/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.nlpwithdispatch.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,18 +92,18 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-ai-luis-v3</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-ai-qna</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
       </dependency>
     </dependencies>
 

diff --git a/samples/java_springboot/15.handling-attachments/pom.xml b/samples/java_springboot/15.handling-attachments/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.attachments.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -97,7 +97,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/16.proactive-messages/pom.xml b/samples/java_springboot/16.proactive-messages/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.proactive.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,7 +92,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/17.multilingual-bot/pom.xml b/samples/java_springboot/17.multilingual-bot/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.multilingual.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,7 +92,7 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/18.bot-authentication/pom.xml b/samples/java_springboot/18.bot-authentication/pom.xml
@@ -44,7 +44,7 @@
         <start-class>com.microsoft.bot.sample.authentication.Application</start-class>
     </properties>
 
-    <repositories>
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,13 +92,13 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-dialogs</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>

diff --git a/samples/java_springboot/19.custom-dialogs/pom.xml b/samples/java_springboot/19.custom-dialogs/pom.xml
@@ -43,8 +43,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <start-class>com.microsoft.bot.sample.customdialogs.Application</start-class>
     </properties>
-
-    <repositories>
+    
+    <repositories>    
       <repository>
         <id>oss-sonatype</id>
         <name>oss-sonatype</name>
@@ -92,13 +92,13 @@
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-integration-spring</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>com.microsoft.bot</groupId>
         <artifactId>bot-dialogs</artifactId>
-        <version>4.14.0</version>
+        <version>4.13.0</version>
         <scope>compile</scope>
       </dependency>
   </dependencies>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		botbuilder-integration-aiohttp>=4.14.0
		botbuilder-integration-aiohttp>=4.13.0