fix #211 #212 #213 #214 #215 #216 #217

liuyueyi · Feb 28, 2022 · 1a9fe74 · 1a9fe74
1 parent fd3bae1
commit 1a9fe74
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/spring-boot/107-jooq-aop/pom.xml b/spring-boot/107-jooq-aop/pom.xml
@@ -69,7 +69,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>1.4.200</version>
+                        <version>2.1.210</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -120,4 +120,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/spring-boot/108-jooq-curd/pom.xml b/spring-boot/108-jooq-curd/pom.xml
@@ -64,7 +64,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>1.4.200</version>
+                        <version>2.1.210</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -139,4 +139,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/spring-boot/207-web-response/pom.xml b/spring-boot/207-web-response/pom.xml
@@ -20,8 +20,8 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/spring-boot/208-web-mapping/pom.xml b/spring-boot/208-web-mapping/pom.xml
@@ -20,8 +20,8 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/spring-boot/209-web-error/pom.xml b/spring-boot/209-web-error/pom.xml
@@ -21,9 +21,9 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
         </dependency>
     </dependencies>
 
 
-</project>
+</project>
diff --git a/spring/200-mvc-annotation/pom.xml b/spring/200-mvc-annotation/pom.xml
@@ -13,7 +13,7 @@
     <packaging>war</packaging>
 
     <properties>
-        <spring.version>5.1.5.RELEASE</spring.version>
+        <spring.version>5.1.14.RELEASE</spring.version>
     </properties>
 
     <dependencies>
@@ -71,4 +71,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/spring/500-json/pom.xml b/spring/500-json/pom.xml
@@ -61,12 +61,20 @@
             <version>6.8.8</version>
             <scope>compile</scope>
         </dependency>
+<<<<<<< Updated upstream
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>28.1-jre</version>
             <scope>compile</scope>
+=======
+        <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.0.1-jre</version>
+>>>>>>> Stashed changes
         </dependency>
     </dependencies>
 </project>