Skip to content

Commit a2fda69

Browse files
author
eugenp
committed
consolidation of dependencies and plugin versions
1 parent cb6be0d commit a2fda69

5 files changed

Lines changed: 30 additions & 114 deletions

File tree

‎api/pom.xml‎

Lines changed: 3 additions & 9 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
<name>rest-api</name>
54
<artifactId>rest-api</artifactId>
@@ -33,7 +32,7 @@
3332
<dependency>
3433
<groupId>com.thoughtworks.xstream</groupId>
3534
<artifactId>xstream</artifactId>
36-
<version>1.4.3</version>
35+
<version>${xstream.version}</version>
3736
</dependency>
3837

3938
</dependencies>
@@ -48,12 +47,7 @@
4847
</resources>
4948

5049
<plugins>
51-
52-
<plugin>
53-
<groupId>org.apache.maven.plugins</groupId>
54-
<artifactId>maven-surefire-plugin</artifactId>
55-
</plugin>
56-
50+
<!-- placeholder -->
5751
</plugins>
5852

5953
</build>

‎common/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@
139139
<dependency>
140140
<groupId>javax.validation</groupId>
141141
<artifactId>validation-api</artifactId>
142-
<version>1.0.0.GA</version>
142+
<version>${validation-api.version}</version>
143143
</dependency>
144144
<dependency>
145145
<groupId>org.hibernate</groupId>
146146
<artifactId>hibernate-validator</artifactId>
147-
<version>4.3.0.Final</version>
147+
<version>${hibernate-validator.version}</version>
148148
</dependency>
149149

150150
<!-- security -->
@@ -287,7 +287,7 @@
287287
<dependency>
288288
<groupId>org.codehaus.groovy</groupId>
289289
<artifactId>groovy</artifactId>
290-
<version>1.8.6</version>
290+
<version>${groovy.version}</version>
291291
</dependency>
292292

293293
</dependencies>
@@ -318,7 +318,7 @@
318318
<plugin>
319319
<groupId>org.zeroturnaround</groupId>
320320
<artifactId>jrebel-maven-plugin</artifactId>
321-
<version>1.1.3</version>
321+
<version>${jrebel-maven-plugin.version}</version>
322322
<executions>
323323
<execution>
324324
<id>generate-rebel-xml</id>

‎pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,17 @@
8282
<!-- persistence -->
8383
<mysql-connector-java.version>5.1.22</mysql-connector-java.version> <!-- latest version on: 05.10.2011 - http://dev.mysql.com/downloads/connector/j/ -->
8484
<hibernate.version>4.1.8.Final</hibernate.version>
85+
<hibernate-jpamodelgen.version>1.2.0.Final</hibernate-jpamodelgen.version>
8586
<commons-dbcp.version>1.4</commons-dbcp.version>
8687
<querydsl.version>2.9.0</querydsl.version>
8788
<spring-data-jpa.version>1.2.0.RELEASE</spring-data-jpa.version>
8889

8990
<h2.version>1.3.168</h2.version>
9091
<hsqldb.version>2.2.9</hsqldb.version>
91-
92+
93+
<validation-api.version>1.0.0.GA</validation-api.version>
94+
<hibernate-validator.version>4.3.0.Final</hibernate-validator.version>
95+
9296
<!-- logging -->
9397
<org.slf4j.version>1.7.2</org.slf4j.version>
9498
<logback.version>1.0.7</logback.version>
@@ -110,7 +114,9 @@
110114
<maven-compiler-plugin.version>3.0</maven-compiler-plugin.version>
111115
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
112116
<jrebel-maven-plugin.version>1.1.3</jrebel-maven-plugin.version>
113-
117+
<cargo-maven2-plugin.version>1.3.1</cargo-maven2-plugin.version>
118+
119+
114120
</properties>
115121

116122
<repositories>

‎sandbox/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.amazonaws</groupId>
3434
<artifactId>aws-java-sdk</artifactId>
35-
<version>1.3.18</version>
35+
<version>${aws-java-sdk}</version>
3636
</dependency>
3737

3838
</dependencies>
@@ -46,14 +46,15 @@
4646
</resources>
4747

4848
<plugins>
49-
50-
<plugin>
51-
<groupId>org.apache.maven.plugins</groupId>
52-
<artifactId>maven-surefire-plugin</artifactId>
53-
</plugin>
54-
49+
50+
<!-- placeholder -->
51+
5552
</plugins>
5653

5754
</build>
55+
56+
<properties>
57+
<aws-java-sdk.version>1.3.18</aws-java-sdk.version>
58+
</properties>
5859

5960
</project>

‎sec/pom.xml‎

Lines changed: 7 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,12 @@
5050
<scope>provided</scope>
5151
</dependency>
5252

53-
<!-- marshalling -->
54-
55-
<!-- <dependency>
56-
<groupId>javax.xml.bind</groupId>
57-
<artifactId>jaxb-api</artifactId>
58-
<version>${jaxb-api.version}</version>
59-
<scope>runtime</scope>
60-
</dependency> -->
61-
6253
<!-- persistence - providers -->
6354

6455
<dependency>
6556
<groupId>com.h2database</groupId>
6657
<artifactId>h2</artifactId>
67-
<version>1.3.168</version>
58+
<version>${h2.version}</version>
6859
</dependency>
6960

7061
<dependency>
@@ -77,15 +68,15 @@
7768
<dependency>
7869
<groupId>org.hsqldb</groupId>
7970
<artifactId>hsqldb</artifactId>
80-
<version>2.2.8</version>
71+
<version>${hsqldb.version}</version>
8172
</dependency>
8273

8374
<!-- persistence - JPA 2 metamodel -->
8475

8576
<dependency>
8677
<groupId>org.hibernate</groupId>
8778
<artifactId>hibernate-jpamodelgen</artifactId>
88-
<version>1.2.0.Final</version>
79+
<version>${hibernate-jpamodelgen.version}</version>
8980
</dependency>
9081

9182
<!-- test scoped -->
@@ -143,7 +134,7 @@
143134
<dependency>
144135
<groupId>org.codehaus.groovy</groupId>
145136
<artifactId>groovy</artifactId>
146-
<version>1.8.6</version>
137+
<version>${groovy.version}</version>
147138
</dependency>
148139

149140
</dependencies>
@@ -176,7 +167,7 @@
176167
<plugin>
177168
<groupId>org.zeroturnaround</groupId>
178169
<artifactId>jrebel-maven-plugin</artifactId>
179-
<version>1.1.3</version>
170+
<version>{jrebel-maven-plugin.version}</version>
180171
<executions>
181172
<execution>
182173
<id>generate-rebel-xml</id>
@@ -191,7 +182,7 @@
191182
<plugin>
192183
<groupId>org.codehaus.cargo</groupId>
193184
<artifactId>cargo-maven2-plugin</artifactId>
194-
<version>1.3.1</version>
185+
<version>${cargo-maven2-plugin.version}</version>
195186
<configuration>
196187
<wait>false</wait>
197188
<container>
@@ -211,83 +202,7 @@
211202
</plugin>
212203

213204
</plugins>
214-
215-
<!-- generated by m2e -->
216-
<pluginManagement>
217-
<plugins>
218-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
219-
<plugin>
220-
<groupId>org.eclipse.m2e</groupId>
221-
<artifactId>lifecycle-mapping</artifactId>
222-
<version>1.0.0</version>
223-
<configuration>
224-
<lifecycleMappingMetadata>
225-
<pluginExecutions>
226-
<pluginExecution>
227-
<pluginExecutionFilter>
228-
<groupId>
229-
org.zeroturnaround
230-
</groupId>
231-
<artifactId>
232-
jrebel-maven-plugin
233-
</artifactId>
234-
<versionRange>
235-
[1.1.0,)
236-
</versionRange>
237-
<goals>
238-
<goal>generate</goal>
239-
</goals>
240-
</pluginExecutionFilter>
241-
<action>
242-
<ignore></ignore>
243-
</action>
244-
</pluginExecution>
245-
<pluginExecution>
246-
<pluginExecutionFilter>
247-
<groupId>com.mysema.maven</groupId>
248-
<artifactId>maven-apt-plugin</artifactId>
249-
<versionRange>[1.0.2,)</versionRange>
250-
<goals>
251-
<goal>process</goal>
252-
</goals>
253-
</pluginExecutionFilter>
254-
<action>
255-
<ignore></ignore>
256-
</action>
257-
</pluginExecution>
258-
<pluginExecution>
259-
<pluginExecutionFilter>
260-
<groupId>org.bsc.maven</groupId>
261-
<artifactId>maven-processor-plugin</artifactId>
262-
<versionRange>[2.0.5,)</versionRange>
263-
<goals>
264-
<goal>process</goal>
265-
</goals>
266-
</pluginExecutionFilter>
267-
<action>
268-
<ignore></ignore>
269-
</action>
270-
</pluginExecution>
271-
<pluginExecution>
272-
<pluginExecutionFilter>
273-
<groupId>org.codehaus.mojo</groupId>
274-
<artifactId>build-helper-maven-plugin</artifactId>
275-
<versionRange>[1.3,)</versionRange>
276-
<goals>
277-
<goal>add-source</goal>
278-
</goals>
279-
</pluginExecutionFilter>
280-
<action>
281-
<ignore></ignore>
282-
</action>
283-
</pluginExecution>
284-
</pluginExecutions>
285-
</lifecycleMappingMetadata>
286-
</configuration>
287-
</plugin>
288-
</plugins>
289-
</pluginManagement>
290-
205+
291206
</build>
292207

293208
<profiles>

0 commit comments

Comments
 (0)