Skip to content

Commit 07a0413

Browse files
author
eugenp
committed
maven work
1 parent 0f9ba3d commit 07a0413

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

‎common/pom.xml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<dependency>
5050
<groupId>org.apache.httpcomponents</groupId>
5151
<artifactId>httpclient</artifactId>
52-
<version>${httpclient.version}</version>
5352
<exclusions>
5453
<exclusion>
5554
<artifactId>commons-logging</artifactId>
@@ -63,7 +62,6 @@
6362
<dependency>
6463
<groupId>org.springframework</groupId>
6564
<artifactId>spring-core</artifactId>
66-
<version>${spring.version}</version>
6765
<exclusions>
6866
<exclusion>
6967
<artifactId>commons-logging</artifactId>
@@ -74,28 +72,23 @@
7472
<dependency>
7573
<groupId>org.springframework</groupId>
7674
<artifactId>spring-context</artifactId>
77-
<version>${spring.version}</version>
7875
</dependency>
7976
<dependency>
8077
<groupId>org.springframework</groupId>
8178
<artifactId>spring-beans</artifactId>
82-
<version>${spring.version}</version>
8379
</dependency>
8480
<dependency>
8581
<groupId>org.springframework</groupId>
8682
<artifactId>spring-expression</artifactId>
87-
<version>${spring.version}</version>
8883
</dependency>
8984
<dependency>
9085
<groupId>org.springframework</groupId>
9186
<artifactId>spring-aspects</artifactId>
92-
<version>${spring.version}</version>
9387
</dependency>
9488

9589
<dependency>
9690
<groupId>org.springframework</groupId>
9791
<artifactId>spring-webmvc</artifactId>
98-
<version>${spring.version}</version>
9992
<exclusions>
10093
<exclusion>
10194
<artifactId>commons-logging</artifactId>
@@ -106,13 +99,11 @@
10699
<dependency>
107100
<groupId>org.springframework</groupId>
108101
<artifactId>spring-web</artifactId>
109-
<version>${spring.version}</version>
110102
</dependency>
111103

112104
<dependency>
113105
<groupId>org.springframework</groupId>
114106
<artifactId>spring-oxm</artifactId>
115-
<version>${spring.version}</version>
116107
<exclusions>
117108
<exclusion>
118109
<artifactId>commons-lang</artifactId>
@@ -124,12 +115,10 @@
124115
<dependency>
125116
<groupId>org.springframework</groupId>
126117
<artifactId>spring-tx</artifactId>
127-
<version>${spring.version}</version>
128118
</dependency>
129119
<dependency>
130120
<groupId>org.springframework</groupId>
131121
<artifactId>spring-aop</artifactId>
132-
<version>${spring.version}</version>
133122
</dependency>
134123

135124
<!-- web -->
@@ -143,7 +132,7 @@
143132
<dependency>
144133
<groupId>org.apache.tomcat</groupId>
145134
<artifactId>tomcat-servlet-api</artifactId>
146-
<version>7.0.53</version>
135+
<version>${tomcat.version}</version>
147136
<scope>provided</scope>
148137
</dependency>
149138

@@ -152,12 +141,10 @@
152141
<dependency>
153142
<groupId>org.springframework.security</groupId>
154143
<artifactId>spring-security-web</artifactId>
155-
<version>${spring-security.version}</version>
156144
</dependency>
157145
<dependency>
158146
<groupId>org.springframework.security</groupId>
159147
<artifactId>spring-security-config</artifactId>
160-
<version>${spring-security.version}</version>
161148
</dependency>
162149

163150
<!-- validation -->
@@ -170,15 +157,13 @@
170157
<dependency>
171158
<groupId>org.hibernate</groupId>
172159
<artifactId>hibernate-validator</artifactId>
173-
<version>${hibernate-validator.version}</version>
174160
</dependency>
175161

176162
<!-- marshalling -->
177163

178164
<dependency>
179165
<groupId>com.fasterxml.jackson.core</groupId>
180166
<artifactId>jackson-databind</artifactId>
181-
<version>${jackson.version}</version>
182167
</dependency>
183168

184169
<dependency>
@@ -256,7 +241,7 @@
256241
<dependency>
257242
<groupId>org.hibernate</groupId>
258243
<artifactId>hibernate-jpamodelgen</artifactId>
259-
<version>1.2.0.Final</version>
244+
<version>${hibernate.version}</version>
260245
</dependency>
261246

262247
<!-- logging -->

‎pom.xml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,17 @@
55
<artifactId>rest-parent</artifactId>
66
<version>0.12-SNAPSHOT</version>
77
<packaging>pom</packaging>
8+
89
<name>rest-security</name>
910
<url>https://github.com/eugenp/REST</url>
1011
<description>REST Security is a Proof of Concept implementation of a RESTful Service with Spring</description>
11-
12+
13+
<parent>
14+
<groupId>org.springframework.boot</groupId>
15+
<artifactId>spring-boot-starter-parent</artifactId>
16+
<version>1.2.5.RELEASE</version>
17+
</parent>
18+
1219
<build>
1320

1421
<plugins>
@@ -32,15 +39,25 @@
3239
<groupId>org.apache.maven.plugins</groupId>
3340
<artifactId>maven-surefire-plugin</artifactId>
3441
<version>${maven-surefire-plugin.version}</version>
42+
<configuration>
43+
<testFailureIgnore>true</testFailureIgnore>
44+
<excludes>
45+
<exclude>**/*IntegrationTest.java</exclude>
46+
<exclude>**/*LiveTest.java</exclude>
47+
</excludes>
48+
<systemPropertyVariables>
49+
<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
50+
</systemPropertyVariables>
51+
</configuration>
3552
</plugin>
3653

3754
<plugin>
3855
<groupId>org.apache.maven.plugins</groupId>
3956
<artifactId>maven-compiler-plugin</artifactId>
4057
<version>${maven-compiler-plugin.version}</version>
4158
<configuration>
42-
<source>1.7</source>
43-
<target>1.7</target>
59+
<source>1.8</source>
60+
<target>1.8</target>
4461
<compilerArgument>-proc:none</compilerArgument>
4562
</configuration>
4663
</plugin>
@@ -92,6 +109,9 @@
92109

93110
<validation-api.version>1.1.0.Final</validation-api.version>
94111
<hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
112+
113+
<!-- ops related -->
114+
<tomcat.version>8.0.24</tomcat.version>
95115

96116
<!-- logging -->
97117
<org.slf4j.version>1.7.12</org.slf4j.version>

‎sec/pom.xml

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>org.apache.tomcat</groupId>
5454
<artifactId>tomcat-servlet-api</artifactId>
55-
<version>7.0.53</version>
55+
<version>${tomcat.version}</version>
5656
<scope>provided</scope>
5757
</dependency>
5858

@@ -61,34 +61,29 @@
6161
<dependency>
6262
<groupId>org.springframework</groupId>
6363
<artifactId>spring-test</artifactId>
64-
<version>${spring.version}</version>
6564
<scope>test</scope>
6665
</dependency>
6766

6867
<dependency>
6968
<groupId>junit</groupId>
7069
<artifactId>junit</artifactId>
71-
<version>${junit.version}</version>
7270
<scope>test</scope>
7371
</dependency>
7472

7573
<dependency>
7674
<groupId>org.hamcrest</groupId>
7775
<artifactId>hamcrest-core</artifactId>
78-
<version>${org.hamcrest.version}</version>
7976
<scope>test</scope>
8077
</dependency>
8178
<dependency>
8279
<groupId>org.hamcrest</groupId>
8380
<artifactId>hamcrest-library</artifactId>
84-
<version>${org.hamcrest.version}</version>
8581
<scope>test</scope>
8682
</dependency>
8783

8884
<dependency>
8985
<groupId>org.mockito</groupId>
9086
<artifactId>mockito-core</artifactId>
91-
<version>${mockito.version}</version>
9287
<scope>test</scope>
9388
</dependency>
9489

@@ -118,19 +113,19 @@
118113

119114
<plugins>
120115

121-
<plugin>
122-
<groupId>org.apache.maven.plugins</groupId>
123-
<artifactId>maven-surefire-plugin</artifactId>
124-
<configuration>
125-
<excludes>
126-
<exclude>**/*RestIntegrationTest.java</exclude>
127-
<exclude>**/*RestLiveTest.java</exclude>
128-
</excludes>
129-
<systemPropertyVariables>
130-
<persistenceTarget>h2</persistenceTarget>
131-
</systemPropertyVariables>
132-
</configuration>
133-
</plugin>
116+
<!-- <plugin> -->
117+
<!-- <groupId>org.apache.maven.plugins</groupId> -->
118+
<!-- <artifactId>maven-surefire-plugin</artifactId> -->
119+
<!-- <configuration> -->
120+
<!-- <excludes> -->
121+
<!-- <exclude>**/*RestIntegrationTest.java</exclude> -->
122+
<!-- <exclude>**/*RestLiveTest.java</exclude> -->
123+
<!-- </excludes> -->
124+
<!-- <systemPropertyVariables> -->
125+
<!-- <persistenceTarget>h2</persistenceTarget> -->
126+
<!-- </systemPropertyVariables> -->
127+
<!-- </configuration> -->
128+
<!-- </plugin> -->
134129

135130
<plugin>
136131
<groupId>org.codehaus.cargo</groupId>
@@ -139,7 +134,7 @@
139134
<configuration>
140135
<wait>false</wait>
141136
<container>
142-
<containerId>jetty8x</containerId>
137+
<containerId>tomcat8x</containerId>
143138
<type>embedded</type>
144139
<systemProperties>
145140
<envTarget>dev</envTarget>
@@ -148,7 +143,7 @@
148143
</container>
149144
<configuration>
150145
<properties>
151-
<cargo.servlet.port>8080</cargo.servlet.port>
146+
<cargo.servlet.port>8081</cargo.servlet.port>
152147
</properties>
153148
</configuration>
154149
</configuration>

0 commit comments

Comments
 (0)