Skip to content

Commit 3450a07

Browse files
Doha2012Doha2012
committed
Merge remote-tracking branch 'upstream/master'
2 parents 4c73128 + 6668c11 commit 3450a07

32 files changed

Lines changed: 132 additions & 121 deletions

File tree

‎core-java-8/pom.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43
<groupId>org.baeldung</groupId>
54
<artifactId>spring-rest</artifactId>
@@ -11,10 +10,16 @@
1110

1211
<!-- utils -->
1312

13+
<dependency>
14+
<groupId>commons-io</groupId>
15+
<artifactId>commons-io</artifactId>
16+
<version>2.4</version>
17+
</dependency>
18+
1419
<dependency>
1520
<groupId>com.google.guava</groupId>
1621
<artifactId>guava</artifactId>
17-
<version>17.0</version>
22+
<version>${guava.version}</version>
1823
</dependency>
1924

2025
<dependency>
@@ -121,7 +126,7 @@
121126
<hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
122127

123128
<!-- util -->
124-
<guava.version>17.0</guava.version>
129+
<guava.version>18.0</guava.version>
125130
<commons-lang3.version>3.3.2</commons-lang3.version>
126131

127132
<!-- testing -->

‎core-java-8/src/test/java/org/baeldung/java8/JavaFolderSizeTest.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
import org.apache.commons.io.FileUtils;
1818
import org.junit.Test;
1919

20-
2120
public class JavaFolderSizeTest {
2221

2322
@Test
2423
public void whenGetFolderSizeRecursive_thenCorrect() {
25-
final long expectedSize = 124;
24+
final long expectedSize = 136;
2625

2726
final File folder = new File("src/test/resources");
2827
final long size = getFolderSize(folder);
@@ -32,7 +31,7 @@ public void whenGetFolderSizeRecursive_thenCorrect() {
3231

3332
@Test
3433
public void whenGetFolderSizeUsingJava7_thenCorrect() throws IOException {
35-
final long expectedSize = 124;
34+
final long expectedSize = 136;
3635

3736
final AtomicLong size = new AtomicLong(0);
3837
final Path folder = Paths.get("src/test/resources");
@@ -50,7 +49,7 @@ public FileVisitResult visitFile(final Path file, final BasicFileAttributes attr
5049

5150
@Test
5251
public void whenGetFolderSizeUsingJava8_thenCorrect() throws IOException {
53-
final long expectedSize = 124;
52+
final long expectedSize = 136;
5453

5554
final Path folder = Paths.get("src/test/resources");
5655
final long size = Files.walk(folder).filter(p -> p.toFile().isFile()).mapToLong(p -> p.toFile().length()).sum();
@@ -60,7 +59,7 @@ public void whenGetFolderSizeUsingJava8_thenCorrect() throws IOException {
6059

6160
@Test
6261
public void whenGetFolderSizeUsingApacheCommonsIO_thenCorrect() {
63-
final long expectedSize = 124;
62+
final long expectedSize = 136;
6463

6564
final File folder = new File("src/test/resources");
6665
final long size = FileUtils.sizeOfDirectory(folder);
@@ -70,7 +69,7 @@ public void whenGetFolderSizeUsingApacheCommonsIO_thenCorrect() {
7069

7170
@Test
7271
public void whenGetFolderSizeUsingGuava_thenCorrect() {
73-
final long expectedSize = 124;
72+
final long expectedSize = 136;
7473

7574
final File folder = new File("src/test/resources");
7675

@@ -90,7 +89,7 @@ public void whenGetReadableSize_thenCorrect() {
9089
final double unitValue = 1 << (unitIndex * 10);
9190

9291
final String readableSize = new DecimalFormat("#,##0.#").format(size / unitValue) + " " + units[unitIndex];
93-
assertEquals("124 B", readableSize);
92+
assertEquals("136 B", readableSize);
9493
}
9594

9695
private long getFolderSize(final File folder) {

‎core-java/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@
145145

146146
<properties>
147147
<!-- Spring -->
148-
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
148+
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
149149
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
150150

151151
<!-- persistence -->
152152
<hibernate.version>4.3.7.Final</hibernate.version>
153-
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
153+
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
154154

155155
<!-- marshalling -->
156156
<jackson.version>2.4.2</jackson.version>
@@ -172,9 +172,9 @@
172172
<mockito.version>1.10.8</mockito.version>
173173

174174
<httpcore.version>4.3.3</httpcore.version>
175-
<httpclient.version>4.3.5</httpclient.version>
175+
<httpclient.version>4.3.6</httpclient.version>
176176

177-
<rest-assured.version>2.3.4</rest-assured.version>
177+
<rest-assured.version>2.4.0</rest-assured.version>
178178

179179
<!-- maven plugins -->
180180
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

‎gson/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@
114114

115115
<properties>
116116
<!-- Spring -->
117-
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
117+
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
118118
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
119119

120120
<!-- persistence -->
121121
<hibernate.version>4.3.7.Final</hibernate.version>
122-
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
122+
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
123123

124124
<!-- marshalling -->
125125
<gson.version>2.3</gson.version>
@@ -141,9 +141,9 @@
141141
<mockito.version>1.10.8</mockito.version>
142142

143143
<httpcore.version>4.3.3</httpcore.version>
144-
<httpclient.version>4.3.5</httpclient.version>
144+
<httpclient.version>4.3.6</httpclient.version>
145145

146-
<rest-assured.version>2.3.4</rest-assured.version>
146+
<rest-assured.version>2.4.0</rest-assured.version>
147147

148148
<!-- maven plugins -->
149149
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

‎guava/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@
9494

9595
<properties>
9696
<!-- Spring -->
97-
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
97+
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
9898
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
9999

100100
<!-- persistence -->
101101
<hibernate.version>4.3.7.Final</hibernate.version>
102-
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
102+
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
103103

104104
<!-- logging -->
105105
<org.slf4j.version>1.7.7</org.slf4j.version>
@@ -118,9 +118,9 @@
118118
<mockito.version>1.10.8</mockito.version>
119119

120120
<httpcore.version>4.3.3</httpcore.version>
121-
<httpclient.version>4.3.5</httpclient.version>
121+
<httpclient.version>4.3.6</httpclient.version>
122122

123-
<rest-assured.version>2.3.4</rest-assured.version>
123+
<rest-assured.version>2.4.0</rest-assured.version>
124124

125125
<!-- maven plugins -->
126126
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

‎handling-spring-static-resources/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@
179179
<javax.servlet.jsp-api.version>2.3.2-b01</javax.servlet.jsp-api.version>
180180

181181
<!-- Spring -->
182-
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
182+
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
183183
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
184184

185185
<!-- persistence -->
186186
<hibernate.version>4.3.7.Final</hibernate.version>
187-
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
187+
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
188188
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
189189

190190
<!-- marshalling -->
@@ -208,9 +208,9 @@
208208
<mockito.version>1.10.8</mockito.version>
209209

210210
<httpcore.version>4.3.3</httpcore.version>
211-
<httpclient.version>4.3.5</httpclient.version>
211+
<httpclient.version>4.3.6</httpclient.version>
212212

213-
<rest-assured.version>2.3.4</rest-assured.version>
213+
<rest-assured.version>2.4.0</rest-assured.version>
214214

215215
<!-- Maven plugins -->
216216
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

‎httpclient/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@
149149

150150
<properties>
151151
<!-- Spring -->
152-
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
152+
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
153153
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
154154

155155
<!-- persistence -->
156156
<hibernate.version>4.3.7.Final</hibernate.version>
157-
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
157+
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
158158

159159
<!-- logging -->
160160
<org.slf4j.version>1.7.7</org.slf4j.version>
@@ -175,7 +175,7 @@
175175
<httpcore.version>4.3.3</httpcore.version>
176176
<httpclient.version>4.3.4</httpclient.version>
177177

178-
<rest-assured.version>2.3.4</rest-assured.version>
178+
<rest-assured.version>2.4.0</rest-assured.version>
179179

180180
<!-- maven plugins -->
181181
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

‎jackson/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@
114114

115115
<properties>
116116
<!-- Spring -->
117-
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
117+
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
118118
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
119119

120120
<!-- persistence -->
121121
<hibernate.version>4.3.7.Final</hibernate.version>
122-
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
122+
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
123123

124124
<!-- marshalling -->
125125
<jackson.version>2.4.2</jackson.version>
@@ -141,9 +141,9 @@
141141
<mockito.version>1.10.8</mockito.version>
142142

143143
<httpcore.version>4.3.3</httpcore.version>
144-
<httpclient.version>4.3.5</httpclient.version>
144+
<httpclient.version>4.3.6</httpclient.version>
145145

146-
<rest-assured.version>2.3.4</rest-assured.version>
146+
<rest-assured.version>2.4.0</rest-assured.version>
147147

148148
<!-- maven plugins -->
149149
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

‎mockito/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@
8989

9090
<properties>
9191
<!-- Spring -->
92-
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
92+
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
9393
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
9494

9595
<!-- persistence -->
9696
<hibernate.version>4.3.7.Final</hibernate.version>
97-
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
97+
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
9898

9999
<!-- logging -->
100100
<org.slf4j.version>1.7.7</org.slf4j.version>
@@ -113,9 +113,9 @@
113113
<mockito.version>1.10.8</mockito.version>
114114

115115
<httpcore.version>4.3.3</httpcore.version>
116-
<httpclient.version>4.3.5</httpclient.version>
116+
<httpclient.version>4.3.6</httpclient.version>
117117

118-
<rest-assured.version>2.3.4</rest-assured.version>
118+
<rest-assured.version>2.4.0</rest-assured.version>
119119

120120
<!-- maven plugins -->
121121
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

‎rest-testing/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138

139139
<properties>
140140
<!-- Spring -->
141-
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
141+
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
142142

143143
<!-- marshalling -->
144144
<jackson.version>2.4.2</jackson.version>
@@ -160,9 +160,9 @@
160160
<mockito.version>1.10.8</mockito.version>
161161

162162
<httpcore.version>4.3.3</httpcore.version>
163-
<httpclient.version>4.3.5</httpclient.version>
163+
<httpclient.version>4.3.6</httpclient.version>
164164

165-
<rest-assured.version>2.3.4</rest-assured.version>
165+
<rest-assured.version>2.4.0</rest-assured.version>
166166

167167
<!-- maven plugins -->
168168
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

0 commit comments

Comments
 (0)