Skip to content

Commit 4fa323c

Browse files
author
eugenp
committed
maven upgrades
1 parent 7faea3a commit 4fa323c

7 files changed

Lines changed: 822 additions & 740 deletions

File tree

‎spring-rest/pom.xml‎

Lines changed: 175 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,177 @@
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">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>org.baeldung</groupId>
4-
<artifactId>spring-rest</artifactId>
5-
<version>0.1-SNAPSHOT</version>
6-
7-
<name>spring-rest</name>
8-
<packaging>war</packaging>
9-
10-
<dependencies>
11-
12-
<!-- Spring -->
13-
14-
<dependency>
15-
<groupId>org.springframework</groupId>
16-
<artifactId>spring-web</artifactId>
17-
<version>${org.springframework.version}</version>
18-
</dependency>
19-
<dependency>
20-
<groupId>org.springframework</groupId>
21-
<artifactId>spring-webmvc</artifactId>
22-
<version>${org.springframework.version}</version>
23-
</dependency>
24-
25-
<!-- web -->
26-
27-
<dependency>
28-
<groupId>javax.servlet</groupId>
29-
<artifactId>javax.servlet-api</artifactId>
30-
<version>3.0.1</version>
31-
<scope>provided</scope>
32-
</dependency>
33-
34-
<dependency>
35-
<groupId>javax.servlet</groupId>
36-
<artifactId>jstl</artifactId>
37-
<version>1.2</version>
38-
<scope>runtime</scope>
39-
</dependency>
40-
41-
<!-- test scoped -->
42-
43-
<dependency>
44-
<groupId>junit</groupId>
45-
<artifactId>junit-dep</artifactId>
46-
<version>${junit.version}</version>
47-
<scope>test</scope>
48-
</dependency>
49-
50-
<dependency>
51-
<groupId>org.hamcrest</groupId>
52-
<artifactId>hamcrest-core</artifactId>
53-
<version>${org.hamcrest.version}</version>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.hamcrest</groupId>
58-
<artifactId>hamcrest-library</artifactId>
59-
<version>${org.hamcrest.version}</version>
60-
<scope>test</scope>
61-
</dependency>
62-
63-
<dependency>
64-
<groupId>org.mockito</groupId>
65-
<artifactId>mockito-core</artifactId>
66-
<version>${mockito.version}</version>
67-
<scope>test</scope>
68-
</dependency>
69-
70-
</dependencies>
71-
72-
<build>
73-
<finalName>spring-rest</finalName>
74-
<resources>
75-
<resource>
76-
<directory>src/main/resources</directory>
77-
<filtering>true</filtering>
78-
</resource>
79-
</resources>
80-
81-
<plugins>
82-
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-surefire-plugin</artifactId>
86-
<version>${maven-surefire-plugin.version}</version>
87-
<configuration>
88-
<excludes>
89-
<!-- <exclude>**/*ProductionTest.java</exclude> -->
90-
</excludes>
91-
<systemPropertyVariables>
92-
<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
93-
</systemPropertyVariables>
94-
</configuration>
95-
</plugin>
96-
97-
<plugin>
98-
<groupId>org.codehaus.cargo</groupId>
99-
<artifactId>cargo-maven2-plugin</artifactId>
100-
<version>${cargo-maven2-plugin.version}</version>
101-
<configuration>
102-
<wait>true</wait>
103-
<container>
104-
<containerId>jetty8x</containerId>
105-
<type>embedded</type>
106-
<systemProperties>
107-
<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
108-
</systemProperties>
109-
</container>
110-
<configuration>
111-
<properties>
112-
<cargo.servlet.port>8082</cargo.servlet.port>
113-
</properties>
114-
</configuration>
115-
</configuration>
116-
</plugin>
117-
118-
</plugins>
119-
120-
</build>
121-
122-
<properties>
123-
<!-- Spring -->
124-
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
125-
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
126-
127-
<!-- persistence -->
128-
<hibernate.version>4.3.0.Final</hibernate.version>
129-
<mysql-connector-java.version>5.1.27</mysql-connector-java.version>
130-
131-
<!-- logging -->
132-
<org.slf4j.version>1.7.5</org.slf4j.version>
133-
<logback.version>1.0.11</logback.version>
134-
135-
<!-- various -->
136-
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
137-
138-
<!-- util -->
139-
<guava.version>15.0</guava.version>
140-
<commons-lang3.version>3.1</commons-lang3.version>
141-
142-
<!-- testing -->
143-
<org.hamcrest.version>1.3</org.hamcrest.version>
144-
<junit.version>4.11</junit.version>
145-
<mockito.version>1.9.5</mockito.version>
146-
147-
<httpcore.version>4.3</httpcore.version>
148-
<httpclient.version>4.3.1</httpclient.version>
149-
150-
<rest-assured.version>2.1.0</rest-assured.version>
151-
<groovy.version>1.8.9</groovy.version>
152-
153-
<!-- Maven plugins -->
154-
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
155-
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
156-
</properties>
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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.baeldung</groupId>
5+
<artifactId>spring-rest</artifactId>
6+
<version>0.1-SNAPSHOT</version>
7+
8+
<name>spring-rest</name>
9+
<packaging>war</packaging>
10+
11+
<dependencies>
12+
13+
<!-- Spring -->
14+
15+
<dependency>
16+
<groupId>org.springframework</groupId>
17+
<artifactId>spring-web</artifactId>
18+
<version>${org.springframework.version}</version>
19+
</dependency>
20+
<dependency>
21+
<groupId>org.springframework</groupId>
22+
<artifactId>spring-webmvc</artifactId>
23+
<version>${org.springframework.version}</version>
24+
</dependency>
25+
26+
<!-- web -->
27+
28+
<dependency>
29+
<groupId>javax.servlet</groupId>
30+
<artifactId>javax.servlet-api</artifactId>
31+
<version>3.0.1</version>
32+
<scope>provided</scope>
33+
</dependency>
34+
35+
<dependency>
36+
<groupId>javax.servlet</groupId>
37+
<artifactId>jstl</artifactId>
38+
<version>1.2</version>
39+
<scope>runtime</scope>
40+
</dependency>
41+
42+
<!-- test scoped -->
43+
44+
<dependency>
45+
<groupId>junit</groupId>
46+
<artifactId>junit-dep</artifactId>
47+
<version>${junit.version}</version>
48+
<scope>test</scope>
49+
</dependency>
50+
51+
<dependency>
52+
<groupId>org.hamcrest</groupId>
53+
<artifactId>hamcrest-core</artifactId>
54+
<version>${org.hamcrest.version}</version>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.hamcrest</groupId>
59+
<artifactId>hamcrest-library</artifactId>
60+
<version>${org.hamcrest.version}</version>
61+
<scope>test</scope>
62+
</dependency>
63+
64+
<dependency>
65+
<groupId>org.mockito</groupId>
66+
<artifactId>mockito-core</artifactId>
67+
<version>${mockito.version}</version>
68+
<scope>test</scope>
69+
</dependency>
70+
71+
</dependencies>
72+
73+
<build>
74+
<finalName>spring-rest</finalName>
75+
<resources>
76+
<resource>
77+
<directory>src/main/resources</directory>
78+
<filtering>true</filtering>
79+
</resource>
80+
</resources>
81+
82+
<plugins>
83+
84+
<plugin>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-compiler-plugin</artifactId>
87+
<version>3.1</version>
88+
<configuration>
89+
<source>1.7</source>
90+
<target>1.7</target>
91+
</configuration>
92+
</plugin>
93+
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-war-plugin</artifactId>
97+
<version>${maven-war-plugin.version}</version>
98+
</plugin>
99+
100+
<plugin>
101+
<groupId>org.apache.maven.plugins</groupId>
102+
<artifactId>maven-surefire-plugin</artifactId>
103+
<version>${maven-surefire-plugin.version}</version>
104+
<configuration>
105+
<excludes>
106+
<!-- <exclude>**/*ProductionTest.java</exclude> -->
107+
</excludes>
108+
<systemPropertyVariables>
109+
<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
110+
</systemPropertyVariables>
111+
</configuration>
112+
</plugin>
113+
114+
<plugin>
115+
<groupId>org.codehaus.cargo</groupId>
116+
<artifactId>cargo-maven2-plugin</artifactId>
117+
<version>${cargo-maven2-plugin.version}</version>
118+
<configuration>
119+
<wait>true</wait>
120+
<container>
121+
<containerId>jetty8x</containerId>
122+
<type>embedded</type>
123+
<systemProperties>
124+
<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
125+
</systemProperties>
126+
</container>
127+
<configuration>
128+
<properties>
129+
<cargo.servlet.port>8082</cargo.servlet.port>
130+
</properties>
131+
</configuration>
132+
</configuration>
133+
</plugin>
134+
135+
</plugins>
136+
137+
</build>
138+
139+
<properties>
140+
<!-- Spring -->
141+
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
142+
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
143+
144+
<!-- persistence -->
145+
<hibernate.version>4.3.0.Final</hibernate.version>
146+
<mysql-connector-java.version>5.1.27</mysql-connector-java.version>
147+
148+
<!-- logging -->
149+
<org.slf4j.version>1.7.5</org.slf4j.version>
150+
<logback.version>1.0.11</logback.version>
151+
152+
<!-- various -->
153+
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
154+
155+
<!-- util -->
156+
<guava.version>15.0</guava.version>
157+
<commons-lang3.version>3.1</commons-lang3.version>
158+
159+
<!-- testing -->
160+
<org.hamcrest.version>1.3</org.hamcrest.version>
161+
<junit.version>4.11</junit.version>
162+
<mockito.version>1.9.5</mockito.version>
163+
164+
<httpcore.version>4.3</httpcore.version>
165+
<httpclient.version>4.3.1</httpclient.version>
166+
167+
<rest-assured.version>2.1.0</rest-assured.version>
168+
169+
<!-- Maven plugins -->
170+
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
171+
<maven-war-plugin.version>2.4</maven-war-plugin.version>
172+
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
173+
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
174+
175+
</properties>
157176

158177
</project>

‎spring-security-rest-basic-auth/pom.xml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,12 @@
239239
</configuration>
240240
</plugin>
241241

242+
<plugin>
243+
<groupId>org.apache.maven.plugins</groupId>
244+
<artifactId>maven-war-plugin</artifactId>
245+
<version>${maven-war-plugin.version}</version>
246+
</plugin>
247+
242248
<plugin>
243249
<groupId>org.apache.maven.plugins</groupId>
244250
<artifactId>maven-surefire-plugin</artifactId>
@@ -308,11 +314,13 @@
308314
<mockito.version>1.9.5</mockito.version>
309315

310316
<rest-assured.version>2.1.0</rest-assured.version>
311-
<groovy.version>1.8.9</groovy.version>
312317

313318
<!-- Maven plugins -->
314-
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
315-
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
319+
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
320+
<maven-war-plugin.version>2.4</maven-war-plugin.version>
321+
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
322+
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
323+
316324
</properties>
317325

318326
</project>

0 commit comments

Comments
 (0)