Skip to content

Commit eedcbeb

Browse files
Doha2012Doha2012
committed
Merge remote-tracking branch 'upstream/master'
2 parents 18c7448 + 01548ef commit eedcbeb

File tree

31 files changed

+156
-155
lines changed

31 files changed

+156
-155
lines changed

‎apache-fop/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143

144144
<properties>
145145
<!-- Spring -->
146-
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
146+
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
147147
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
148148

149149
<!-- persistence -->
@@ -167,19 +167,19 @@
167167
<!-- testing -->
168168
<org.hamcrest.version>1.3</org.hamcrest.version>
169169
<junit.version>4.11</junit.version>
170-
<mockito.version>1.10.8</mockito.version>
170+
<mockito.version>1.10.17</mockito.version>
171171

172-
<httpcore.version>4.3.3</httpcore.version>
172+
<httpcore.version>4.4</httpcore.version>
173173
<httpclient.version>4.3.6</httpclient.version>
174174

175175
<rest-assured.version>2.4.0</rest-assured.version>
176176

177177
<!-- maven plugins -->
178178
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
179179
<maven-war-plugin.version>2.5</maven-war-plugin.version>
180-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
180+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
181181
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
182-
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
182+
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
183183

184184
</properties>
185185

‎core-java/pom.xml‎

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

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

151151
<!-- persistence -->
@@ -169,19 +169,19 @@
169169
<!-- testing -->
170170
<org.hamcrest.version>1.3</org.hamcrest.version>
171171
<junit.version>4.11</junit.version>
172-
<mockito.version>1.10.8</mockito.version>
172+
<mockito.version>1.10.17</mockito.version>
173173

174-
<httpcore.version>4.3.3</httpcore.version>
174+
<httpcore.version>4.4</httpcore.version>
175175
<httpclient.version>4.3.6</httpclient.version>
176176

177177
<rest-assured.version>2.4.0</rest-assured.version>
178178

179179
<!-- maven plugins -->
180180
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
181181
<maven-war-plugin.version>2.5</maven-war-plugin.version>
182-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
182+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
183183
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
184-
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
184+
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
185185

186186
</properties>
187187

‎gson/pom.xml‎

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

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

120120
<!-- persistence -->
@@ -138,19 +138,19 @@
138138
<!-- testing -->
139139
<org.hamcrest.version>1.3</org.hamcrest.version>
140140
<junit.version>4.11</junit.version>
141-
<mockito.version>1.10.8</mockito.version>
141+
<mockito.version>1.10.17</mockito.version>
142142

143-
<httpcore.version>4.3.3</httpcore.version>
143+
<httpcore.version>4.4</httpcore.version>
144144
<httpclient.version>4.3.6</httpclient.version>
145145

146146
<rest-assured.version>2.4.0</rest-assured.version>
147147

148148
<!-- maven plugins -->
149149
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
150150
<maven-war-plugin.version>2.5</maven-war-plugin.version>
151-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
151+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
152152
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
153-
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
153+
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
154154

155155
</properties>
156156

‎guava/pom.xml‎

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

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

100100
<!-- persistence -->
@@ -115,19 +115,19 @@
115115
<!-- testing -->
116116
<org.hamcrest.version>1.3</org.hamcrest.version>
117117
<junit.version>4.11</junit.version>
118-
<mockito.version>1.10.8</mockito.version>
118+
<mockito.version>1.10.17</mockito.version>
119119

120-
<httpcore.version>4.3.3</httpcore.version>
120+
<httpcore.version>4.4</httpcore.version>
121121
<httpclient.version>4.3.6</httpclient.version>
122122

123123
<rest-assured.version>2.4.0</rest-assured.version>
124124

125125
<!-- maven plugins -->
126126
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
127127
<maven-war-plugin.version>2.5</maven-war-plugin.version>
128-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
128+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
129129
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
130-
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
130+
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
131131

132132
</properties>
133133

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<dependency>
124124
<groupId>joda-time</groupId>
125125
<artifactId>joda-time</artifactId>
126-
<version>2.3</version>
126+
<version>2.6</version>
127127
</dependency>
128128

129129
<!-- Handlebars.java -->
@@ -172,20 +172,21 @@
172172

173173
<properties>
174174
<java-version>1.7</java-version>
175-
<org.springframework-version>4.1.0.RELEASE</org.springframework-version>
176-
<org.springframework.security-version>3.2.0.RELEASE</org.springframework.security-version>
175+
<!-- Spring -->
176+
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
177+
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
178+
177179
<org.aspectj-version>1.8.1</org.aspectj-version>
178-
<org.slf4j-version>1.6.1</org.slf4j-version>
179180
<javax.servlet.jsp-api.version>2.3.2-b01</javax.servlet.jsp-api.version>
180181

181182
<!-- Spring -->
182-
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
183+
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
183184
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
184185

185186
<!-- persistence -->
186187
<hibernate.version>4.3.7.Final</hibernate.version>
187188
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
188-
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
189+
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
189190

190191
<!-- marshalling -->
191192

@@ -205,18 +206,18 @@
205206
<!-- testing -->
206207
<org.hamcrest.version>1.3</org.hamcrest.version>
207208
<junit.version>4.11</junit.version>
208-
<mockito.version>1.10.8</mockito.version>
209+
<mockito.version>1.10.17</mockito.version>
209210

210-
<httpcore.version>4.3.3</httpcore.version>
211+
<httpcore.version>4.4</httpcore.version>
211212
<httpclient.version>4.3.6</httpclient.version>
212213

213214
<rest-assured.version>2.4.0</rest-assured.version>
214215

215216
<!-- Maven plugins -->
216217
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
217218
<maven-war-plugin.version>2.5</maven-war-plugin.version>
218-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
219-
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
219+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
220+
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
220221
</properties>
221222

222223
</project>

‎httpclient/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154

155155
<properties>
156156
<!-- Spring -->
157-
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
157+
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
158158
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
159159

160160
<!-- persistence -->
@@ -175,19 +175,19 @@
175175
<!-- testing -->
176176
<org.hamcrest.version>1.3</org.hamcrest.version>
177177
<junit.version>4.11</junit.version>
178-
<mockito.version>1.10.8</mockito.version>
178+
<mockito.version>1.10.17</mockito.version>
179179

180-
<httpcore.version>4.3.3</httpcore.version>
180+
<httpcore.version>4.4</httpcore.version>
181181
<httpclient.version>4.4-beta1</httpclient.version> <!-- 4.3.6 --> <!-- 4.4-beta1 -->
182182

183183
<rest-assured.version>2.4.0</rest-assured.version>
184184

185185
<!-- maven plugins -->
186186
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
187187
<maven-war-plugin.version>2.5</maven-war-plugin.version>
188-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
188+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
189189
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
190-
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
190+
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
191191

192192
</properties>
193193

‎jackson/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115

116116
<properties>
117117
<!-- Spring -->
118-
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
118+
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
119119
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
120120

121121
<!-- persistence -->
@@ -139,19 +139,19 @@
139139
<!-- testing -->
140140
<org.hamcrest.version>1.3</org.hamcrest.version>
141141
<junit.version>4.11</junit.version>
142-
<mockito.version>1.10.8</mockito.version>
142+
<mockito.version>1.10.17</mockito.version>
143143

144-
<httpcore.version>4.3.3</httpcore.version>
144+
<httpcore.version>4.4</httpcore.version>
145145
<httpclient.version>4.3.6</httpclient.version>
146146

147147
<rest-assured.version>2.4.0</rest-assured.version>
148148

149149
<!-- maven plugins -->
150150
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
151151
<maven-war-plugin.version>2.5</maven-war-plugin.version>
152-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
152+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
153153
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
154-
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
154+
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
155155

156156
</properties>
157157

‎mockito/pom.xml‎

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

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

9595
<!-- persistence -->
@@ -110,19 +110,19 @@
110110
<!-- testing -->
111111
<org.hamcrest.version>1.3</org.hamcrest.version>
112112
<junit.version>4.11</junit.version>
113-
<mockito.version>1.10.8</mockito.version>
113+
<mockito.version>1.10.17</mockito.version>
114114

115-
<httpcore.version>4.3.3</httpcore.version>
115+
<httpcore.version>4.4</httpcore.version>
116116
<httpclient.version>4.3.6</httpclient.version>
117117

118118
<rest-assured.version>2.4.0</rest-assured.version>
119119

120120
<!-- maven plugins -->
121121
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
122122
<maven-war-plugin.version>2.5</maven-war-plugin.version>
123-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
123+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
124124
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
125-
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
125+
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
126126

127127
</properties>
128128

‎rest-testing/pom.xml‎

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

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

143143
<!-- marshalling -->
144144
<jackson.version>2.4.2</jackson.version>
@@ -157,19 +157,19 @@
157157
<!-- testing -->
158158
<org.hamcrest.version>1.3</org.hamcrest.version>
159159
<junit.version>4.11</junit.version>
160-
<mockito.version>1.10.8</mockito.version>
160+
<mockito.version>1.10.17</mockito.version>
161161

162-
<httpcore.version>4.3.3</httpcore.version>
162+
<httpcore.version>4.4</httpcore.version>
163163
<httpclient.version>4.3.6</httpclient.version>
164164

165165
<rest-assured.version>2.4.0</rest-assured.version>
166166

167167
<!-- maven plugins -->
168168
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
169169
<maven-war-plugin.version>2.5</maven-war-plugin.version>
170-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
170+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
171171
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
172-
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
172+
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
173173

174174
</properties>
175175

‎sandbox/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,17 +157,17 @@
157157
<!-- testing -->
158158
<org.hamcrest.version>1.3</org.hamcrest.version>
159159
<junit.version>4.11</junit.version>
160-
<mockito.version>1.10.8</mockito.version>
160+
<mockito.version>1.10.17</mockito.version>
161161

162-
<httpcore.version>4.3.3</httpcore.version>
162+
<httpcore.version>4.4</httpcore.version>
163163
<httpclient.version>4.3.6</httpclient.version>
164164

165165
<rest-assured.version>2.4.0</rest-assured.version>
166166

167167
<!-- maven plugins -->
168168
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
169169
<maven-war-plugin.version>2.5</maven-war-plugin.version>
170-
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
170+
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
171171
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
172172
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
173173

0 commit comments

Comments
 (0)