Skip to content

Commit 350330b

Browse files
author
eugenp
committed
cleanup work
1 parent 8b372c1 commit 350330b

3 files changed

Lines changed: 40 additions & 31 deletions

File tree

‎spring-security-rest-custom/.settings/org.eclipse.wst.common.project.facet.core.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<faceted-project>
33
<installed facet="java" version="1.7"/>
4-
<installed facet="jst.web" version="3.0"/>
4+
<installed facet="jst.web" version="3.1"/>
55
</faceted-project>

‎spring-security-rest-custom/pom.xml‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,103 +8,94 @@
88
<name>spring-security-rest-custom</name>
99
<packaging>war</packaging>
1010

11+
<parent>
12+
<groupId>org.springframework.boot</groupId>
13+
<artifactId>spring-boot-starter-parent</artifactId>
14+
<version>1.2.4.RELEASE</version>
15+
</parent>
16+
1117
<dependencies>
1218

1319
<!-- Spring Security -->
1420

1521
<dependency>
1622
<groupId>org.springframework.security</groupId>
1723
<artifactId>spring-security-web</artifactId>
18-
<version>${org.springframework.security.version}</version>
1924
</dependency>
2025
<dependency>
2126
<groupId>org.springframework.security</groupId>
2227
<artifactId>spring-security-config</artifactId>
23-
<version>${org.springframework.security.version}</version>
2428
</dependency>
2529

2630
<!-- Spring -->
2731

2832
<dependency>
2933
<groupId>org.springframework</groupId>
3034
<artifactId>spring-core</artifactId>
31-
<version>${org.springframework.version}</version>
3235
<exclusions>
33-
<exclusion>
34-
<artifactId>commons-logging</artifactId>
35-
<groupId>commons-logging</groupId>
36-
</exclusion>
36+
<exclusion>
37+
<artifactId>commons-logging</artifactId>
38+
<groupId>commons-logging</groupId>
39+
</exclusion>
3740
</exclusions>
3841
</dependency>
3942
<dependency>
4043
<groupId>org.springframework</groupId>
4144
<artifactId>spring-context</artifactId>
42-
<version>${org.springframework.version}</version>
4345
</dependency>
4446
<dependency>
4547
<groupId>org.springframework</groupId>
4648
<artifactId>spring-jdbc</artifactId>
47-
<version>${org.springframework.version}</version>
4849
</dependency>
4950
<dependency>
5051
<groupId>org.springframework</groupId>
5152
<artifactId>spring-beans</artifactId>
52-
<version>${org.springframework.version}</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.springframework</groupId>
5656
<artifactId>spring-aop</artifactId>
57-
<version>${org.springframework.version}</version>
5857
</dependency>
5958
<dependency>
6059
<groupId>org.springframework</groupId>
6160
<artifactId>spring-tx</artifactId>
62-
<version>${org.springframework.version}</version>
6361
</dependency>
6462
<dependency>
6563
<groupId>org.springframework</groupId>
6664
<artifactId>spring-expression</artifactId>
67-
<version>${org.springframework.version}</version>
6865
</dependency>
6966

7067
<dependency>
7168
<groupId>org.springframework</groupId>
7269
<artifactId>spring-web</artifactId>
73-
<version>${org.springframework.version}</version>
7470
</dependency>
7571
<dependency>
7672
<groupId>org.springframework</groupId>
7773
<artifactId>spring-webmvc</artifactId>
78-
<version>${org.springframework.version}</version>
7974
</dependency>
8075

8176
<dependency>
8277
<groupId>org.springframework</groupId>
8378
<artifactId>spring-oxm</artifactId>
84-
<version>${org.springframework.version}</version>
8579
</dependency>
8680

8781
<!-- marshalling -->
8882

8983
<dependency>
9084
<groupId>com.fasterxml.jackson.core</groupId>
9185
<artifactId>jackson-databind</artifactId>
92-
<version>2.2.2</version>
9386
</dependency>
9487

9588
<!-- web -->
9689

9790
<dependency>
9891
<groupId>javax.servlet</groupId>
9992
<artifactId>javax.servlet-api</artifactId>
100-
<version>3.0.1</version>
10193
<scope>provided</scope>
10294
</dependency>
10395

10496
<dependency>
10597
<groupId>javax.servlet</groupId>
10698
<artifactId>jstl</artifactId>
107-
<version>1.2</version>
10899
<scope>runtime</scope>
109100
</dependency>
110101

@@ -125,7 +116,6 @@
125116
<dependency>
126117
<groupId>org.apache.httpcomponents</groupId>
127118
<artifactId>httpclient</artifactId>
128-
<version>${httpclient.version}</version>
129119
<exclusions>
130120
<exclusion>
131121
<artifactId>commons-logging</artifactId>
@@ -159,23 +149,41 @@
159149
<dependency>
160150
<groupId>org.hamcrest</groupId>
161151
<artifactId>hamcrest-core</artifactId>
162-
<version>${org.hamcrest.version}</version>
163152
<scope>test</scope>
164153
</dependency>
165154
<dependency>
166155
<groupId>org.hamcrest</groupId>
167156
<artifactId>hamcrest-library</artifactId>
168-
<version>${org.hamcrest.version}</version>
169157
<scope>test</scope>
170158
</dependency>
171159

172160
<dependency>
173161
<groupId>org.mockito</groupId>
174162
<artifactId>mockito-core</artifactId>
175-
<version>${mockito.version}</version>
176163
<scope>test</scope>
177164
</dependency>
178165

166+
<!-- logging -->
167+
168+
<dependency>
169+
<groupId>org.slf4j</groupId>
170+
<artifactId>slf4j-api</artifactId>
171+
</dependency>
172+
<dependency>
173+
<groupId>ch.qos.logback</groupId>
174+
<artifactId>logback-classic</artifactId>
175+
<!-- <scope>runtime</scope> -->
176+
</dependency>
177+
<dependency>
178+
<groupId>org.slf4j</groupId>
179+
<artifactId>jcl-over-slf4j</artifactId>
180+
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
181+
</dependency>
182+
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
183+
<groupId>org.slf4j</groupId>
184+
<artifactId>log4j-over-slf4j</artifactId>
185+
</dependency>
186+
179187
</dependencies>
180188

181189
<build>
@@ -200,16 +208,16 @@
200208
<debuglevel>source</debuglevel>
201209
</configuration>
202210
</plugin>
203-
211+
204212
<plugin>
205213
<groupId>org.apache.maven.plugins</groupId>
206214
<artifactId>maven-war-plugin</artifactId>
207215
<version>${maven-war-plugin.version}</version>
208-
<configuration>
209-
<failOnMissingWebXml>false</failOnMissingWebXml>
210-
</configuration>
216+
<configuration>
217+
<failOnMissingWebXml>false</failOnMissingWebXml>
218+
</configuration>
211219
</plugin>
212-
220+
213221
<plugin>
214222
<groupId>org.apache.maven.plugins</groupId>
215223
<artifactId>maven-surefire-plugin</artifactId>
@@ -284,7 +292,7 @@
284292
<maven-war-plugin.version>2.6</maven-war-plugin.version>
285293
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
286294
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
287-
295+
288296
</properties>
289297

290298
</project>

‎spring-security-rest-full/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@
457457
<parent>
458458
<groupId>org.springframework.boot</groupId>
459459
<artifactId>spring-boot-starter-parent</artifactId>
460-
<version>1.2.2.RELEASE</version>
460+
<version>1.2.4.RELEASE</version>
461461
</parent>
462+
462463
</project>

0 commit comments

Comments
 (0)