From 0309ee37b5d36c2868a146c81fcfa9da2b54b5e1 Mon Sep 17 00:00:00 2001
From: ydvorzhetskiy <dvorzhetskij@mail.ru>
Date: Wed, 6 Jul 2022 22:52:45 +0600
Subject: [PATCH] 2022-02 - 34

---
 2022-02/spring-31/pom.xml                                 | 5 +++--
 2022-02/spring-34/.gitignore                              | 3 +++
 {2021-11/spring-31 => 2022-02/spring-34}/pom.xml          | 2 +-
 .../spring-31 => 2022-02/spring-34}/rest-template/pom.xml | 8 ++++++--
 .../rest-template/src/main/java/ru/otus/spring/Main.java  | 0
 .../src/main/java/ru/otus/spring/config/CacheConfig.java  | 0
 .../src/main/java/ru/otus/spring/dto/Country.java         | 0
 .../main/java/ru/otus/spring/service/CountryService.java  | 0
 .../java/ru/otus/spring/service/CountryServiceRest.java   | 0
 .../rest-template/src/main/resources/application.yml      | 0
 .../spring-31 => 2022-02/spring-34}/soap-client/pom.xml   | 2 +-
 .../soap-client/src/main/java/hello/Application.java      | 0
 .../soap-client/src/main/java/hello/CountryClient.java    | 0
 .../src/main/java/hello/CountryConfiguration.java         | 0
 .../soap-client/src/main/resources/application.yml        | 0
 .../soap-client/src/main/resources/countries.wsdl         | 0
 .../spring-31 => 2022-02/spring-34}/soap-server/pom.xml   | 2 +-
 .../soap-server/src/main/java/hello/Application.java      | 0
 .../soap-server/src/main/java/hello/CountryEndpoint.java  | 0
 .../src/main/java/hello/CountryRepository.java            | 0
 .../soap-server/src/main/java/hello/WebServiceConfig.java | 0
 .../soap-server/src/main/resources/application.yml        | 0
 .../soap-server/src/main/resources/countries.xsd          | 0
 .../src/test/java/hello/ApplicationIntegrationTests.java  | 0
 24 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 2022-02/spring-34/.gitignore
 rename {2021-11/spring-31 => 2022-02/spring-34}/pom.xml (93%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/rest-template/pom.xml (92%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/rest-template/src/main/java/ru/otus/spring/Main.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/rest-template/src/main/java/ru/otus/spring/config/CacheConfig.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/rest-template/src/main/java/ru/otus/spring/dto/Country.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/rest-template/src/main/java/ru/otus/spring/service/CountryService.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/rest-template/src/main/java/ru/otus/spring/service/CountryServiceRest.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/rest-template/src/main/resources/application.yml (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-client/pom.xml (98%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-client/src/main/java/hello/Application.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-client/src/main/java/hello/CountryClient.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-client/src/main/java/hello/CountryConfiguration.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-client/src/main/resources/application.yml (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-client/src/main/resources/countries.wsdl (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-server/pom.xml (98%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-server/src/main/java/hello/Application.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-server/src/main/java/hello/CountryEndpoint.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-server/src/main/java/hello/CountryRepository.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-server/src/main/java/hello/WebServiceConfig.java (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-server/src/main/resources/application.yml (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-server/src/main/resources/countries.xsd (100%)
 rename {2021-11/spring-31 => 2022-02/spring-34}/soap-server/src/test/java/hello/ApplicationIntegrationTests.java (100%)

diff --git a/2022-02/spring-31/pom.xml b/2022-02/spring-31/pom.xml
index 25b6c378..e40636f5 100644
--- a/2022-02/spring-31/pom.xml
+++ b/2022-02/spring-31/pom.xml
@@ -11,7 +11,8 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>spring-31-exercise</module>
-        <module>spring-31-solution</module>
+        <module>rest-template</module>
+        <module>soap-client</module>
+        <module>soap-server</module>
     </modules>
 </project>
diff --git a/2022-02/spring-34/.gitignore b/2022-02/spring-34/.gitignore
new file mode 100644
index 00000000..ea6cc40a
--- /dev/null
+++ b/2022-02/spring-34/.gitignore
@@ -0,0 +1,3 @@
+*.iml
+.idea/
+target/
diff --git a/2021-11/spring-31/pom.xml b/2022-02/spring-34/pom.xml
similarity index 93%
rename from 2021-11/spring-31/pom.xml
rename to 2022-02/spring-34/pom.xml
index e40636f5..d9c0ec97 100644
--- a/2021-11/spring-31/pom.xml
+++ b/2022-02/spring-34/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ru.otus</groupId>
-    <artifactId>spring-31</artifactId>
+    <artifactId>spring-34</artifactId>
     <version>1.0</version>
 
     <packaging>pom</packaging>
diff --git a/2021-11/spring-31/rest-template/pom.xml b/2022-02/spring-34/rest-template/pom.xml
similarity index 92%
rename from 2021-11/spring-31/rest-template/pom.xml
rename to 2022-02/spring-34/rest-template/pom.xml
index 10ada048..2d724192 100644
--- a/2021-11/spring-31/rest-template/pom.xml
+++ b/2022-02/spring-34/rest-template/pom.xml
@@ -6,15 +6,19 @@
 
     <groupId>ru.otus</groupId>
     <artifactId>rest-template</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.6.RELEASE</version>
+        <version>2.7.1</version>
         <relativePath/>
     </parent>
 
+    <properties>
+        <java.version>11</java.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/Main.java b/2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/Main.java
similarity index 100%
rename from 2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/Main.java
rename to 2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/Main.java
diff --git a/2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/config/CacheConfig.java b/2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/config/CacheConfig.java
similarity index 100%
rename from 2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/config/CacheConfig.java
rename to 2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/config/CacheConfig.java
diff --git a/2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/dto/Country.java b/2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/dto/Country.java
similarity index 100%
rename from 2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/dto/Country.java
rename to 2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/dto/Country.java
diff --git a/2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/service/CountryService.java b/2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/service/CountryService.java
similarity index 100%
rename from 2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/service/CountryService.java
rename to 2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/service/CountryService.java
diff --git a/2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/service/CountryServiceRest.java b/2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/service/CountryServiceRest.java
similarity index 100%
rename from 2021-11/spring-31/rest-template/src/main/java/ru/otus/spring/service/CountryServiceRest.java
rename to 2022-02/spring-34/rest-template/src/main/java/ru/otus/spring/service/CountryServiceRest.java
diff --git a/2021-11/spring-31/rest-template/src/main/resources/application.yml b/2022-02/spring-34/rest-template/src/main/resources/application.yml
similarity index 100%
rename from 2021-11/spring-31/rest-template/src/main/resources/application.yml
rename to 2022-02/spring-34/rest-template/src/main/resources/application.yml
diff --git a/2021-11/spring-31/soap-client/pom.xml b/2022-02/spring-34/soap-client/pom.xml
similarity index 98%
rename from 2021-11/spring-31/soap-client/pom.xml
rename to 2022-02/spring-34/soap-client/pom.xml
index 99def6dd..35f11113 100644
--- a/2021-11/spring-31/soap-client/pom.xml
+++ b/2022-02/spring-34/soap-client/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.6.RELEASE</version>
+        <version>2.7.1</version>
         <relativePath/>
     </parent>
 
diff --git a/2021-11/spring-31/soap-client/src/main/java/hello/Application.java b/2022-02/spring-34/soap-client/src/main/java/hello/Application.java
similarity index 100%
rename from 2021-11/spring-31/soap-client/src/main/java/hello/Application.java
rename to 2022-02/spring-34/soap-client/src/main/java/hello/Application.java
diff --git a/2021-11/spring-31/soap-client/src/main/java/hello/CountryClient.java b/2022-02/spring-34/soap-client/src/main/java/hello/CountryClient.java
similarity index 100%
rename from 2021-11/spring-31/soap-client/src/main/java/hello/CountryClient.java
rename to 2022-02/spring-34/soap-client/src/main/java/hello/CountryClient.java
diff --git a/2021-11/spring-31/soap-client/src/main/java/hello/CountryConfiguration.java b/2022-02/spring-34/soap-client/src/main/java/hello/CountryConfiguration.java
similarity index 100%
rename from 2021-11/spring-31/soap-client/src/main/java/hello/CountryConfiguration.java
rename to 2022-02/spring-34/soap-client/src/main/java/hello/CountryConfiguration.java
diff --git a/2021-11/spring-31/soap-client/src/main/resources/application.yml b/2022-02/spring-34/soap-client/src/main/resources/application.yml
similarity index 100%
rename from 2021-11/spring-31/soap-client/src/main/resources/application.yml
rename to 2022-02/spring-34/soap-client/src/main/resources/application.yml
diff --git a/2021-11/spring-31/soap-client/src/main/resources/countries.wsdl b/2022-02/spring-34/soap-client/src/main/resources/countries.wsdl
similarity index 100%
rename from 2021-11/spring-31/soap-client/src/main/resources/countries.wsdl
rename to 2022-02/spring-34/soap-client/src/main/resources/countries.wsdl
diff --git a/2021-11/spring-31/soap-server/pom.xml b/2022-02/spring-34/soap-server/pom.xml
similarity index 98%
rename from 2021-11/spring-31/soap-server/pom.xml
rename to 2022-02/spring-34/soap-server/pom.xml
index 724a8234..9b96437c 100644
--- a/2021-11/spring-31/soap-server/pom.xml
+++ b/2022-02/spring-34/soap-server/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.6.RELEASE</version>
+        <version>2.7.1</version>
         <relativePath/>
     </parent>
 
diff --git a/2021-11/spring-31/soap-server/src/main/java/hello/Application.java b/2022-02/spring-34/soap-server/src/main/java/hello/Application.java
similarity index 100%
rename from 2021-11/spring-31/soap-server/src/main/java/hello/Application.java
rename to 2022-02/spring-34/soap-server/src/main/java/hello/Application.java
diff --git a/2021-11/spring-31/soap-server/src/main/java/hello/CountryEndpoint.java b/2022-02/spring-34/soap-server/src/main/java/hello/CountryEndpoint.java
similarity index 100%
rename from 2021-11/spring-31/soap-server/src/main/java/hello/CountryEndpoint.java
rename to 2022-02/spring-34/soap-server/src/main/java/hello/CountryEndpoint.java
diff --git a/2021-11/spring-31/soap-server/src/main/java/hello/CountryRepository.java b/2022-02/spring-34/soap-server/src/main/java/hello/CountryRepository.java
similarity index 100%
rename from 2021-11/spring-31/soap-server/src/main/java/hello/CountryRepository.java
rename to 2022-02/spring-34/soap-server/src/main/java/hello/CountryRepository.java
diff --git a/2021-11/spring-31/soap-server/src/main/java/hello/WebServiceConfig.java b/2022-02/spring-34/soap-server/src/main/java/hello/WebServiceConfig.java
similarity index 100%
rename from 2021-11/spring-31/soap-server/src/main/java/hello/WebServiceConfig.java
rename to 2022-02/spring-34/soap-server/src/main/java/hello/WebServiceConfig.java
diff --git a/2021-11/spring-31/soap-server/src/main/resources/application.yml b/2022-02/spring-34/soap-server/src/main/resources/application.yml
similarity index 100%
rename from 2021-11/spring-31/soap-server/src/main/resources/application.yml
rename to 2022-02/spring-34/soap-server/src/main/resources/application.yml
diff --git a/2021-11/spring-31/soap-server/src/main/resources/countries.xsd b/2022-02/spring-34/soap-server/src/main/resources/countries.xsd
similarity index 100%
rename from 2021-11/spring-31/soap-server/src/main/resources/countries.xsd
rename to 2022-02/spring-34/soap-server/src/main/resources/countries.xsd
diff --git a/2021-11/spring-31/soap-server/src/test/java/hello/ApplicationIntegrationTests.java b/2022-02/spring-34/soap-server/src/test/java/hello/ApplicationIntegrationTests.java
similarity index 100%
rename from 2021-11/spring-31/soap-server/src/test/java/hello/ApplicationIntegrationTests.java
rename to 2022-02/spring-34/soap-server/src/test/java/hello/ApplicationIntegrationTests.java