From b41bb943cf577247ea54a0eb3eff44b0aa09fe25 Mon Sep 17 00:00:00 2001
From: Yuriy Dvorzhetskiy <dvorzhetskij@mail.ru>
Date: Sat, 15 Feb 2020 00:57:17 +0600
Subject: [PATCH] Java 11 + new spring boot version

---
 2019-11/spring-17/spring-17-boot-and-react/pom.xml | 7 ++++++-
 2019-11/spring-17/spring-17-boot-and-vue/pom.xml   | 8 ++++++--
 2019-11/spring-17/spring-17-boot/pom.xml           | 7 ++++++-
 2019-11/spring-17/spring-17-jquery/pom.xml         | 7 ++++++-
 2019-11/spring-18/pom.xml                          | 9 +++++++--
 2019-11/spring-20/spring-20-exercise/pom.xml       | 7 ++++++-
 2019-11/spring-20/spring-20-solution/pom.xml       | 7 ++++++-
 7 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/2019-11/spring-17/spring-17-boot-and-react/pom.xml b/2019-11/spring-17/spring-17-boot-and-react/pom.xml
index ceebc25d..6256e3f1 100644
--- a/2019-11/spring-17/spring-17-boot-and-react/pom.xml
+++ b/2019-11/spring-17/spring-17-boot-and-react/pom.xml
@@ -11,9 +11,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.3.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
     </parent>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/2019-11/spring-17/spring-17-boot-and-vue/pom.xml b/2019-11/spring-17/spring-17-boot-and-vue/pom.xml
index 65a2d227..55d10017 100644
--- a/2019-11/spring-17/spring-17-boot-and-vue/pom.xml
+++ b/2019-11/spring-17/spring-17-boot-and-vue/pom.xml
@@ -11,9 +11,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.2.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
     </parent>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -33,7 +38,6 @@
             <version>2.5.16</version>
         </dependency>
 
-
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
diff --git a/2019-11/spring-17/spring-17-boot/pom.xml b/2019-11/spring-17/spring-17-boot/pom.xml
index 30f55046..7070a08b 100644
--- a/2019-11/spring-17/spring-17-boot/pom.xml
+++ b/2019-11/spring-17/spring-17-boot/pom.xml
@@ -11,9 +11,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.3.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
     </parent>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/2019-11/spring-17/spring-17-jquery/pom.xml b/2019-11/spring-17/spring-17-jquery/pom.xml
index 9c58b2d5..cb4de97d 100644
--- a/2019-11/spring-17/spring-17-jquery/pom.xml
+++ b/2019-11/spring-17/spring-17-jquery/pom.xml
@@ -11,9 +11,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.2.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
     </parent>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/2019-11/spring-18/pom.xml b/2019-11/spring-18/pom.xml
index a8c68d2b..d4fa3309 100644
--- a/2019-11/spring-18/pom.xml
+++ b/2019-11/spring-18/pom.xml
@@ -5,15 +5,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ru.otus</groupId>
-    <artifactId>spring-framework-16</artifactId>
+    <artifactId>spring-18</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.3.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
     </parent>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
diff --git a/2019-11/spring-20/spring-20-exercise/pom.xml b/2019-11/spring-20/spring-20-exercise/pom.xml
index 1245e9e8..e0ce100a 100644
--- a/2019-11/spring-20/spring-20-exercise/pom.xml
+++ b/2019-11/spring-20/spring-20-exercise/pom.xml
@@ -11,9 +11,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.2.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
     </parent>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <!-- Зависимости WebFlux -->
         <dependency>
diff --git a/2019-11/spring-20/spring-20-solution/pom.xml b/2019-11/spring-20/spring-20-solution/pom.xml
index aa79b8b3..e584c885 100644
--- a/2019-11/spring-20/spring-20-solution/pom.xml
+++ b/2019-11/spring-20/spring-20-solution/pom.xml
@@ -11,9 +11,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.2.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
     </parent>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <!-- Зависимости WebFlux -->
         <dependency>