Skip to content

Commit 9defcce

Browse files
author
eugenp
committed
maven and eclipse cleanup
1 parent 37be740 commit 9defcce

File tree

18 files changed

+43
-428
lines changed

18 files changed

+43
-428
lines changed

‎common-client/pom.xml

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
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">
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">
23
<modelVersion>4.0.0</modelVersion>
34
<artifactId>rest-common-client</artifactId>
45
<name>rest-common-client</name>
@@ -41,7 +42,6 @@
4142
<dependency>
4243
<groupId>org.apache.httpcomponents</groupId>
4344
<artifactId>httpclient</artifactId>
44-
<version>${httpclient.version}</version>
4545
<exclusions>
4646
<exclusion>
4747
<artifactId>commons-logging</artifactId>
@@ -55,7 +55,6 @@
5555
<dependency>
5656
<groupId>org.springframework</groupId>
5757
<artifactId>spring-core</artifactId>
58-
<version>${spring.version}</version>
5958
<exclusions>
6059
<exclusion>
6160
<artifactId>commons-logging</artifactId>
@@ -66,48 +65,40 @@
6665
<dependency>
6766
<groupId>org.springframework</groupId>
6867
<artifactId>spring-context</artifactId>
69-
<version>${spring.version}</version>
7068
</dependency>
7169
<dependency>
7270
<groupId>org.springframework</groupId>
7371
<artifactId>spring-beans</artifactId>
74-
<version>${spring.version}</version>
7572
</dependency>
7673
<dependency>
7774
<groupId>org.springframework</groupId>
7875
<artifactId>spring-expression</artifactId>
79-
<version>${spring.version}</version>
8076
</dependency>
8177
<dependency>
8278
<groupId>org.springframework</groupId>
8379
<artifactId>spring-oxm</artifactId>
84-
<version>${spring.version}</version>
8580
</dependency>
86-
81+
8782
<!-- may be unnecessary - check -->
8883
<dependency>
8984
<groupId>org.springframework</groupId>
9085
<artifactId>spring-aspects</artifactId>
91-
<version>${spring.version}</version>
9286
</dependency>
9387
<dependency>
9488
<groupId>org.springframework</groupId>
9589
<artifactId>spring-aop</artifactId>
96-
<version>${spring.version}</version>
9790
</dependency>
9891

9992
<dependency>
10093
<groupId>org.springframework</groupId>
10194
<artifactId>spring-web</artifactId>
102-
<version>${spring.version}</version>
10395
</dependency>
10496

10597
<!-- security -->
10698

10799
<dependency>
108100
<groupId>org.springframework.security</groupId>
109101
<artifactId>spring-security-config</artifactId>
110-
<version>${spring-security.version}</version>
111102
</dependency>
112103

113104
<!-- validation -->
@@ -120,15 +111,13 @@
120111
<dependency>
121112
<groupId>org.hibernate</groupId>
122113
<artifactId>hibernate-validator</artifactId>
123-
<version>${hibernate-validator.version}</version>
124114
</dependency>
125115

126116
<!-- marshalling -->
127117

128118
<dependency>
129119
<groupId>com.fasterxml.jackson.core</groupId>
130120
<artifactId>jackson-databind</artifactId>
131-
<version>${jackson.version}</version>
132121
</dependency>
133122

134123
<dependency>
@@ -147,7 +136,6 @@
147136
<dependency>
148137
<groupId>org.aspectj</groupId>
149138
<artifactId>aspectjweaver</artifactId>
150-
<version>${aspectjweaver.version}</version>
151139
<scope>runtime</scope>
152140
</dependency>
153141

@@ -156,59 +144,50 @@
156144
<dependency>
157145
<groupId>org.slf4j</groupId>
158146
<artifactId>slf4j-api</artifactId>
159-
<version>${org.slf4j.version}</version>
160147
</dependency>
161148
<dependency>
162149
<groupId>ch.qos.logback</groupId>
163150
<artifactId>logback-classic</artifactId>
164-
<version>${logback.version}</version>
165151
<!-- <scope>runtime</scope> -->
166152
</dependency>
167153
<dependency>
168154
<groupId>org.slf4j</groupId>
169155
<artifactId>jcl-over-slf4j</artifactId>
170-
<version>${org.slf4j.version}</version>
171156
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
172157
</dependency>
173158
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
174159
<groupId>org.slf4j</groupId>
175160
<artifactId>log4j-over-slf4j</artifactId>
176-
<version>${org.slf4j.version}</version>
177161
</dependency>
178162

179163
<!-- test scoped -->
180164

181165
<dependency>
182166
<groupId>org.springframework</groupId>
183167
<artifactId>spring-test</artifactId>
184-
<version>${spring.version}</version>
185168
<scope>test</scope>
186169
</dependency>
187170

188171
<dependency>
189172
<groupId>junit</groupId>
190173
<artifactId>junit</artifactId>
191-
<version>${junit.version}</version>
192174
<scope>test</scope>
193175
</dependency>
194176

195177
<dependency>
196178
<groupId>org.hamcrest</groupId>
197179
<artifactId>hamcrest-core</artifactId>
198-
<version>${org.hamcrest.version}</version>
199180
<scope>test</scope>
200181
</dependency>
201182
<dependency>
202183
<groupId>org.hamcrest</groupId>
203184
<artifactId>hamcrest-library</artifactId>
204-
<version>${org.hamcrest.version}</version>
205185
<scope>test</scope>
206186
</dependency>
207187

208188
<dependency>
209189
<groupId>org.mockito</groupId>
210190
<artifactId>mockito-core</artifactId>
211-
<version>${mockito.version}</version>
212191
<scope>test</scope>
213192
</dependency>
214193

@@ -230,7 +209,7 @@
230209
<dependency>
231210
<groupId>com.amazonaws</groupId>
232211
<artifactId>aws-java-sdk</artifactId>
233-
<version>1.7.8</version>
212+
<version>${aws.version}</version>
234213
<exclusions>
235214
<exclusion>
236215
<artifactId>commons-logging</artifactId>
@@ -259,22 +238,26 @@
259238

260239
<plugins>
261240

262-
<plugin>
263-
<groupId>org.apache.maven.plugins</groupId>
264-
<artifactId>maven-surefire-plugin</artifactId>
265-
<configuration>
266-
<excludes>
267-
<exclude>**/*LiveTest.java</exclude>
268-
<exclude>**/*CloudIntegrationTest.java</exclude>
269-
</excludes>
270-
<systemPropertyVariables>
271-
<persistenceTarget>h2</persistenceTarget>
272-
</systemPropertyVariables>
273-
</configuration>
274-
</plugin>
241+
<!-- <plugin> -->
242+
<!-- <groupId>org.apache.maven.plugins</groupId> -->
243+
<!-- <artifactId>maven-surefire-plugin</artifactId> -->
244+
<!-- <configuration> -->
245+
<!-- <excludes> -->
246+
<!-- <exclude>**/*LiveTest.java</exclude> -->
247+
<!-- <exclude>**/*CloudIntegrationTest.java</exclude> -->
248+
<!-- </excludes> -->
249+
<!-- <systemPropertyVariables> -->
250+
<!-- <persistenceTarget>h2</persistenceTarget> -->
251+
<!-- </systemPropertyVariables> -->
252+
<!-- </configuration> -->
253+
<!-- </plugin> -->
275254

276255
</plugins>
277256

278257
</build>
279258

259+
<properties>
260+
<aws.version>1.10.10</aws.version>
261+
</properties>
262+
280263
</project>

‎common/pom.xml

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@
123123

124124
<!-- web -->
125125

126-
<!-- <dependency>
127-
<groupId>javax.servlet</groupId>
128-
<artifactId>javax.servlet-api</artifactId>
129-
<version>${javax.servlet-api.version}</version>
130-
<scope>provided</scope>
131-
</dependency> -->
132126
<dependency>
133127
<groupId>org.apache.tomcat</groupId>
134128
<artifactId>tomcat-servlet-api</artifactId>
@@ -177,12 +171,10 @@
177171
<dependency>
178172
<groupId>org.springframework</groupId>
179173
<artifactId>spring-jdbc</artifactId>
180-
<version>${spring.version}</version>
181174
</dependency>
182175
<dependency>
183176
<groupId>org.springframework</groupId>
184177
<artifactId>spring-orm</artifactId>
185-
<version>${spring.version}</version>
186178
</dependency>
187179
<dependency>
188180
<groupId>org.springframework.data</groupId>
@@ -193,7 +185,6 @@
193185
<dependency>
194186
<groupId>org.hibernate</groupId>
195187
<artifactId>hibernate-entitymanager</artifactId>
196-
<version>${hibernate.version}</version>
197188
</dependency>
198189
<dependency>
199190
<groupId>org.hibernate</groupId>
@@ -211,7 +202,6 @@
211202
<dependency>
212203
<groupId>org.aspectj</groupId>
213204
<artifactId>aspectjweaver</artifactId>
214-
<version>${aspectjweaver.version}</version>
215205
<scope>runtime</scope>
216206
</dependency>
217207

@@ -220,88 +210,75 @@
220210
<dependency>
221211
<groupId>com.h2database</groupId>
222212
<artifactId>h2</artifactId>
223-
<version>${h2.version}</version>
224213
</dependency>
225214

226215
<dependency>
227216
<groupId>mysql</groupId>
228217
<artifactId>mysql-connector-java</artifactId>
229-
<version>${mysql-connector-java.version}</version>
230218
<scope>runtime</scope>
231219
</dependency>
232220

233221
<dependency>
234222
<groupId>org.hsqldb</groupId>
235223
<artifactId>hsqldb</artifactId>
236-
<version>${hsqldb.version}</version>
237224
</dependency>
238225

239226
<!-- persistence - JPA 2 metamodel -->
240227

241228
<dependency>
242229
<groupId>org.hibernate</groupId>
243230
<artifactId>hibernate-jpamodelgen</artifactId>
244-
<version>${hibernate.version}</version>
245231
</dependency>
246232

247233
<!-- logging -->
248234

249235
<dependency>
250236
<groupId>org.slf4j</groupId>
251237
<artifactId>slf4j-api</artifactId>
252-
<version>${org.slf4j.version}</version>
253238
</dependency>
254239
<dependency>
255240
<groupId>ch.qos.logback</groupId>
256241
<artifactId>logback-classic</artifactId>
257-
<version>${logback.version}</version>
258242
<!-- <scope>runtime</scope> -->
259243
</dependency>
260244
<dependency>
261245
<groupId>org.slf4j</groupId>
262246
<artifactId>jcl-over-slf4j</artifactId>
263-
<version>${org.slf4j.version}</version>
264247
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
265248
</dependency>
266249
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
267250
<groupId>org.slf4j</groupId>
268251
<artifactId>log4j-over-slf4j</artifactId>
269-
<version>${org.slf4j.version}</version>
270252
</dependency>
271253

272254
<!-- test scoped -->
273255

274256
<dependency>
275257
<groupId>org.springframework</groupId>
276258
<artifactId>spring-test</artifactId>
277-
<version>${spring.version}</version>
278259
<scope>test</scope>
279260
</dependency>
280261

281262
<dependency>
282263
<groupId>junit</groupId>
283264
<artifactId>junit</artifactId>
284-
<version>${junit.version}</version>
285265
<scope>test</scope>
286266
</dependency>
287267

288268
<dependency>
289269
<groupId>org.hamcrest</groupId>
290270
<artifactId>hamcrest-core</artifactId>
291-
<version>${org.hamcrest.version}</version>
292271
<scope>test</scope>
293272
</dependency>
294273
<dependency>
295274
<groupId>org.hamcrest</groupId>
296275
<artifactId>hamcrest-library</artifactId>
297-
<version>${org.hamcrest.version}</version>
298276
<scope>test</scope>
299277
</dependency>
300278

301279
<dependency>
302280
<groupId>org.mockito</groupId>
303281
<artifactId>mockito-core</artifactId>
304-
<version>${mockito.version}</version>
305282
<scope>test</scope>
306283
</dependency>
307284

@@ -330,18 +307,18 @@
330307

331308
<plugins>
332309

333-
<plugin>
334-
<groupId>org.apache.maven.plugins</groupId>
335-
<artifactId>maven-surefire-plugin</artifactId>
336-
<configuration>
337-
<excludes>
338-
<exclude>**/*RestIntegrationTest.java</exclude>
339-
</excludes>
340-
<systemPropertyVariables>
341-
<persistenceTarget>h2</persistenceTarget>
342-
</systemPropertyVariables>
343-
</configuration>
344-
</plugin>
310+
<!-- <plugin> -->
311+
<!-- <groupId>org.apache.maven.plugins</groupId> -->
312+
<!-- <artifactId>maven-surefire-plugin</artifactId> -->
313+
<!-- <configuration> -->
314+
<!-- <excludes> -->
315+
<!-- <exclude>**/*RestIntegrationTest.java</exclude> -->
316+
<!-- </excludes> -->
317+
<!-- <systemPropertyVariables> -->
318+
<!-- <persistenceTarget>h2</persistenceTarget> -->
319+
<!-- </systemPropertyVariables> -->
320+
<!-- </configuration> -->
321+
<!-- </plugin> -->
345322

346323
</plugins>
347324

‎pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
133133
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
134134
<cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
135+
<maven-war-plugin.version>2.3</maven-war-plugin.version>
135136

136137
</properties>
137138

0 commit comments

Comments
 (0)