Skip to content

Commit 10ed963

Browse files
eugenpeugenp
committed
small upgrades and cleanup work
1 parent b3ab604 commit 10ed963

9 files changed

Lines changed: 142 additions & 450 deletions

File tree

‎m7-lesson1-start/pom.xml‎

Lines changed: 15 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>1.5.1.RELEASE</version>
16+
<version>1.5.2.RELEASE</version>
1717
<relativePath /> <!-- lookup parent from repository -->
1818
</parent>
1919

@@ -108,65 +108,31 @@
108108
</build>
109109

110110
<properties>
111+
111112
<!-- non-dependencies -->
112113
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
113-
<java.version>1.8</java.version>
114-
115-
<!-- Spring related -->
116-
<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
117-
118-
<commons-collections.version>3.2.2</commons-collections.version>
119-
<hibernate.version>5.2.1.Final</hibernate.version>
120-
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
121-
<httpclient.version>4.5.2</httpclient.version>
122-
<javassist.version>3.20.0-GA</javassist.version>
123-
<mysql.version>5.1.39</mysql.version>
124-
125-
<!-- web -->
126-
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
127-
128-
<!-- marshalling -->
129-
<jackson.version>2.8.6</jackson.version>
130-
<jaxb-api.version>2.2.12</jaxb-api.version>
131-
132-
<!-- commons and utils -->
133-
<commons-lang3.version>3.4</commons-lang3.version>
134-
<guava.version>19.0</guava.version>
135-
136-
114+
<java.version>1.8</java.version>
137115

138116
<!-- persistence -->
139-
<querydsl.version>4.1.3</querydsl.version>
140-
<spring-data-jpa.version>1.10.2.RELEASE</spring-data-jpa.version>
141-
<h2.version>1.4.192</h2.version>
142-
<hsqldb.version>2.3.4</hsqldb.version>
143-
144117
<validation-api.version>1.1.0.Final</validation-api.version>
145-
146-
<!-- ops related -->
147-
<tomcat.version>8.5.4</tomcat.version>
148-
149-
<!-- logging -->
150-
<org.slf4j.version>1.7.21</org.slf4j.version>
151-
<logback.version>1.1.7</logback.version>
152-
153-
<!-- testing -->
154-
<org.hamcrest.version>1.3</org.hamcrest.version>
155-
<junit.version>4.12</junit.version>
156-
<mockito.version>1.10.19</mockito.version>
157-
158-
<httpcore.version>4.4.5</httpcore.version>
159-
<httpclient.version>4.5.2</httpclient.version>
160-
118+
<hsqldb.version>2.3.4</hsqldb.version>
119+
120+
121+
<!-- commons and utils -->
122+
<guava.version>19.0</guava.version>
123+
<commons-lang3.version>3.4</commons-lang3.version>
124+
161125
<rest-assured.version>2.9.0</rest-assured.version>
162-
126+
127+
<!-- marshalling -->
128+
<jaxb-api.version>2.2.12</jaxb-api.version>
129+
163130
<!-- maven plugins -->
164131
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
165132
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
166133
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
167134
<cargo-maven2-plugin.version>1.5.0</cargo-maven2-plugin.version>
168-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
169-
135+
170136
</properties>
171137

172138
<modules>

‎m7-lesson1/pom.xml‎

Lines changed: 15 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>1.5.1.RELEASE</version>
16+
<version>1.5.2.RELEASE</version>
1717
<relativePath /> <!-- lookup parent from repository -->
1818
</parent>
1919

@@ -108,65 +108,31 @@
108108
</build>
109109

110110
<properties>
111+
111112
<!-- non-dependencies -->
112113
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
113-
<java.version>1.8</java.version>
114-
115-
<!-- Spring related -->
116-
<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
117-
118-
<commons-collections.version>3.2.2</commons-collections.version>
119-
<hibernate.version>5.2.1.Final</hibernate.version>
120-
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
121-
<httpclient.version>4.5.2</httpclient.version>
122-
<javassist.version>3.20.0-GA</javassist.version>
123-
<mysql.version>5.1.39</mysql.version>
124-
125-
<!-- web -->
126-
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
127-
128-
<!-- marshalling -->
129-
<jackson.version>2.8.6</jackson.version>
130-
<jaxb-api.version>2.2.12</jaxb-api.version>
131-
132-
<!-- commons and utils -->
133-
<commons-lang3.version>3.4</commons-lang3.version>
134-
<guava.version>19.0</guava.version>
135-
136-
114+
<java.version>1.8</java.version>
137115

138116
<!-- persistence -->
139-
<querydsl.version>4.1.3</querydsl.version>
140-
<spring-data-jpa.version>1.10.2.RELEASE</spring-data-jpa.version>
141-
<h2.version>1.4.192</h2.version>
142-
<hsqldb.version>2.3.4</hsqldb.version>
143-
144117
<validation-api.version>1.1.0.Final</validation-api.version>
145-
146-
<!-- ops related -->
147-
<tomcat.version>8.5.4</tomcat.version>
148-
149-
<!-- logging -->
150-
<org.slf4j.version>1.7.21</org.slf4j.version>
151-
<logback.version>1.1.7</logback.version>
152-
153-
<!-- testing -->
154-
<org.hamcrest.version>1.3</org.hamcrest.version>
155-
<junit.version>4.12</junit.version>
156-
<mockito.version>1.10.19</mockito.version>
157-
158-
<httpcore.version>4.4.5</httpcore.version>
159-
<httpclient.version>4.5.2</httpclient.version>
160-
118+
<hsqldb.version>2.3.4</hsqldb.version>
119+
120+
121+
<!-- commons and utils -->
122+
<guava.version>19.0</guava.version>
123+
<commons-lang3.version>3.4</commons-lang3.version>
124+
161125
<rest-assured.version>2.9.0</rest-assured.version>
162-
126+
127+
<!-- marshalling -->
128+
<jaxb-api.version>2.2.12</jaxb-api.version>
129+
163130
<!-- maven plugins -->
164131
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
165132
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
166133
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
167134
<cargo-maven2-plugin.version>1.5.0</cargo-maven2-plugin.version>
168-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
169-
135+
170136
</properties>
171137

172138
<modules>

‎m7-lesson2/pom.xml‎

Lines changed: 15 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>1.5.1.RELEASE</version>
16+
<version>1.5.2.RELEASE</version>
1717
<relativePath /> <!-- lookup parent from repository -->
1818
</parent>
1919

@@ -108,65 +108,31 @@
108108
</build>
109109

110110
<properties>
111+
111112
<!-- non-dependencies -->
112113
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
113-
<java.version>1.8</java.version>
114-
115-
<!-- Spring related -->
116-
<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
117-
118-
<commons-collections.version>3.2.2</commons-collections.version>
119-
<hibernate.version>5.2.1.Final</hibernate.version>
120-
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
121-
<httpclient.version>4.5.2</httpclient.version>
122-
<javassist.version>3.20.0-GA</javassist.version>
123-
<mysql.version>5.1.39</mysql.version>
124-
125-
<!-- web -->
126-
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
127-
128-
<!-- marshalling -->
129-
<jackson.version>2.8.6</jackson.version>
130-
<jaxb-api.version>2.2.12</jaxb-api.version>
131-
132-
<!-- commons and utils -->
133-
<commons-lang3.version>3.4</commons-lang3.version>
134-
<guava.version>19.0</guava.version>
135-
136-
114+
<java.version>1.8</java.version>
137115

138116
<!-- persistence -->
139-
<querydsl.version>4.1.3</querydsl.version>
140-
<spring-data-jpa.version>1.10.2.RELEASE</spring-data-jpa.version>
141-
<h2.version>1.4.192</h2.version>
142-
<hsqldb.version>2.3.4</hsqldb.version>
143-
144117
<validation-api.version>1.1.0.Final</validation-api.version>
145-
146-
<!-- ops related -->
147-
<tomcat.version>8.5.4</tomcat.version>
148-
149-
<!-- logging -->
150-
<org.slf4j.version>1.7.21</org.slf4j.version>
151-
<logback.version>1.1.7</logback.version>
152-
153-
<!-- testing -->
154-
<org.hamcrest.version>1.3</org.hamcrest.version>
155-
<junit.version>4.12</junit.version>
156-
<mockito.version>1.10.19</mockito.version>
157-
158-
<httpcore.version>4.4.5</httpcore.version>
159-
<httpclient.version>4.5.2</httpclient.version>
160-
118+
<hsqldb.version>2.3.4</hsqldb.version>
119+
120+
121+
<!-- commons and utils -->
122+
<guava.version>19.0</guava.version>
123+
<commons-lang3.version>3.4</commons-lang3.version>
124+
161125
<rest-assured.version>2.9.0</rest-assured.version>
162-
126+
127+
<!-- marshalling -->
128+
<jaxb-api.version>2.2.12</jaxb-api.version>
129+
163130
<!-- maven plugins -->
164131
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
165132
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
166133
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
167134
<cargo-maven2-plugin.version>1.5.0</cargo-maven2-plugin.version>
168-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
169-
135+
170136
</properties>
171137

172138
<modules>

‎m7-lesson3-start/pom.xml‎

Lines changed: 16 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>1.5.1.RELEASE</version>
16+
<version>1.5.2.RELEASE</version>
1717
<relativePath /> <!-- lookup parent from repository -->
1818
</parent>
1919

@@ -108,67 +108,33 @@
108108
</build>
109109

110110
<properties>
111+
111112
<!-- non-dependencies -->
112113
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
113-
<java.version>1.8</java.version>
114-
115-
<!-- Spring related -->
116-
<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
117-
118-
<commons-collections.version>3.2.2</commons-collections.version>
119-
<hibernate.version>5.2.1.Final</hibernate.version>
120-
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
121-
<httpclient.version>4.5.2</httpclient.version>
122-
<javassist.version>3.20.0-GA</javassist.version>
123-
<mysql.version>5.1.39</mysql.version>
124-
125-
<!-- web -->
126-
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
127-
128-
<!-- marshalling -->
129-
<jackson.version>2.8.6</jackson.version>
130-
<jaxb-api.version>2.2.12</jaxb-api.version>
131-
132-
<!-- commons and utils -->
133-
<commons-lang3.version>3.4</commons-lang3.version>
134-
<guava.version>19.0</guava.version>
135-
136-
114+
<java.version>1.8</java.version>
137115

138116
<!-- persistence -->
139-
<querydsl.version>4.1.3</querydsl.version>
140-
<spring-data-jpa.version>1.10.2.RELEASE</spring-data-jpa.version>
141-
<h2.version>1.4.192</h2.version>
142-
<hsqldb.version>2.3.4</hsqldb.version>
143-
144117
<validation-api.version>1.1.0.Final</validation-api.version>
145-
146-
<!-- ops related -->
147-
<tomcat.version>8.5.4</tomcat.version>
148-
149-
<!-- logging -->
150-
<org.slf4j.version>1.7.21</org.slf4j.version>
151-
<logback.version>1.1.7</logback.version>
152-
153-
<!-- testing -->
154-
<org.hamcrest.version>1.3</org.hamcrest.version>
155-
<junit.version>4.12</junit.version>
156-
<mockito.version>1.10.19</mockito.version>
157-
158-
<httpcore.version>4.4.5</httpcore.version>
159-
<httpclient.version>4.5.2</httpclient.version>
160-
118+
<hsqldb.version>2.3.4</hsqldb.version>
119+
120+
121+
<!-- commons and utils -->
122+
<guava.version>19.0</guava.version>
123+
<commons-lang3.version>3.4</commons-lang3.version>
124+
161125
<rest-assured.version>2.9.0</rest-assured.version>
162-
126+
127+
<!-- marshalling -->
128+
<jaxb-api.version>2.2.12</jaxb-api.version>
129+
163130
<!-- maven plugins -->
164131
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
165132
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
166133
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
167134
<cargo-maven2-plugin.version>1.5.0</cargo-maven2-plugin.version>
168-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
169-
135+
170136
</properties>
171-
137+
172138
<modules>
173139
<module>common</module>
174140
<module>common-client</module>

0 commit comments

Comments
 (0)