Skip to content

Commit 3a7d946

Browse files
author
[email protected]
committed
Fixed most of the maven build except the path to using tomcatconf. Moving the tree from src/main has caused changing all the default path locations that maven uses to be specified.
git-svn-id: http://webgoat.googlecode.com/svn/branches/webgoat-6.0@486 4033779f-a91e-0410-96ef-6bf7bf53c507
1 parent 6a96547 commit 3a7d946

File tree

1 file changed

+72
-64
lines changed

1 file changed

+72
-64
lines changed

‎pom.xml‎

Lines changed: 72 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,30 @@
55
<artifactId>WebGoat</artifactId>
66
<packaging>war</packaging>
77
<version>6.0-SNAPSHOT</version>
8-
8+
99
<repositories>
1010
<repository>
1111
<id>maven2-repository.dev.java.net</id>
1212
<name>Java.net Maven 2 Repository</name>
1313
<url>http://download.java.net/maven/2</url>
1414
</repository>
1515
</repositories>
16-
17-
<!-- Shared version number properties -->
16+
17+
<!-- Shared version number properties -->
1818
<properties>
19-
<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
20-
<spring.security.version>3.1.2.RELEASE</spring.security.version>
21-
<tiles.version>2.2.2</tiles.version>
22-
</properties>
19+
<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
20+
<spring.security.version>3.1.2.RELEASE</spring.security.version>
21+
<tiles.version>2.2.2</tiles.version>
22+
</properties>
2323

2424
<build>
25-
<resources>
25+
<sourceDirectory>${basedir}/java</sourceDirectory>
26+
<resources>
2627
<resource>
27-
<directory>java</directory>
28+
<directory>${basedir}/java</directory>
2829
</resource>
2930
<resource>
30-
<directory>${basedir}resources</directory>
31+
<directory>${basedir}/resources</directory>
3132
</resource>
3233
</resources>
3334
<plugins>
@@ -41,11 +42,18 @@
4142
</configuration>
4243
</plugin>
4344
<plugin>
44-
<artifactId>maven-eclipse-plugin</artifactId>
45-
<configuration>
46-
<wtpversion>1.5</wtpversion>
47-
</configuration>
48-
</plugin>
45+
<artifactId>maven-eclipse-plugin</artifactId>
46+
<configuration>
47+
<wtpversion>1.5</wtpversion>
48+
</configuration>
49+
</plugin>
50+
<plugin>
51+
<groupId>org.apache.maven.plugins</groupId>
52+
<artifactId>maven-war-plugin</artifactId>
53+
<configuration>
54+
<warSourceDirectory>${basedir}/webapp</warSourceDirectory>
55+
</configuration>
56+
</plugin>
4957
</plugins>
5058
</build>
5159

@@ -95,11 +103,11 @@
95103
<artifactId>commons-digester</artifactId>
96104
<version>1.4.1</version>
97105
<exclusions>
98-
<exclusion>
99-
<groupId>xml-apis</groupId>
100-
<artifactId>xml-apis</artifactId>
101-
</exclusion>
102-
</exclusions>
106+
<exclusion>
107+
<groupId>xml-apis</groupId>
108+
<artifactId>xml-apis</artifactId>
109+
</exclusion>
110+
</exclusions>
103111
</dependency>
104112
<dependency>
105113
<groupId>commons-logging</groupId>
@@ -155,8 +163,8 @@
155163
<groupId>net.sourceforge.jtds</groupId>
156164
<artifactId>jtds</artifactId>
157165
<version>1.2.2</version>
158-
</dependency>
159-
<dependency>
166+
</dependency>
167+
<dependency>
160168
<groupId>org.apache.tomcat</groupId>
161169
<artifactId>tomcat-catalina</artifactId>
162170
<version>7.0.27</version>
@@ -173,54 +181,54 @@
173181
<version>6.0</version>
174182
<scope>provided</scope>
175183
</dependency>
176-
184+
177185
<dependency>
178186
<groupId>org.springframework</groupId>
179187
<artifactId>spring-core</artifactId>
180188
<version>${org.springframework.version}</version>
181189
</dependency>
182190

183-
<!-- Spring MVC framework -->
184-
<dependency>
191+
<!-- Spring MVC framework -->
192+
<dependency>
185193
<groupId>org.springframework</groupId>
186194
<artifactId>spring-webmvc</artifactId>
187195
<version>${org.springframework.version}</version>
188-
<type>jar</type>
189-
</dependency>
190-
196+
<type>jar</type>
197+
</dependency>
198+
191199
<dependency>
192200
<groupId>org.springframework.security</groupId>
193201
<artifactId>spring-security-core</artifactId>
194202
<version>${spring.security.version}</version>
195203
</dependency>
196-
204+
197205
<dependency>
198-
<groupId>org.springframework.security</groupId>
199-
<artifactId>spring-security-config</artifactId>
200-
<version>${spring.security.version}</version>
201-
</dependency>
202-
206+
<groupId>org.springframework.security</groupId>
207+
<artifactId>spring-security-config</artifactId>
208+
<version>${spring.security.version}</version>
209+
</dependency>
210+
203211
<dependency>
204-
<groupId>org.springframework.security</groupId>
205-
<artifactId>spring-security-web</artifactId>
206-
<version>${spring.security.version}</version>
207-
</dependency>
212+
<groupId>org.springframework.security</groupId>
213+
<artifactId>spring-security-web</artifactId>
214+
<version>${spring.security.version}</version>
215+
</dependency>
208216

209-
<!-- Apache Commons Upload -->
217+
<!-- Apache Commons Upload -->
210218
<dependency>
211219
<groupId>commons-fileupload</groupId>
212220
<artifactId>commons-fileupload</artifactId>
213221
<version>1.2.2</version>
214222
</dependency>
215223

216-
<!-- Apache Commons Upload -->
224+
<!-- Apache Commons Upload -->
217225
<dependency>
218226
<groupId>commons-io</groupId>
219227
<artifactId>commons-io</artifactId>
220228
<version>1.3.2</version>
221229
</dependency>
222230

223-
<!-- JSTL -->
231+
<!-- JSTL -->
224232
<dependency>
225233
<groupId>javax.servlet</groupId>
226234
<artifactId>jstl</artifactId>
@@ -232,24 +240,24 @@
232240
<artifactId>standard</artifactId>
233241
<version>1.1.2</version>
234242
</dependency>
235-
243+
236244
<dependency>
237245
<groupId>log4j</groupId>
238246
<artifactId>log4j</artifactId>
239247
<version>1.2.15</version>
240248
<exclusions>
241-
<exclusion>
249+
<exclusion>
242250
<groupId>javax.jms</groupId>
243251
<artifactId>jms</artifactId>
244-
</exclusion>
245-
<exclusion>
252+
</exclusion>
253+
<exclusion>
246254
<groupId>com.sun.jdmk</groupId>
247255
<artifactId>jmxtools</artifactId>
248-
</exclusion>
249-
<exclusion>
256+
</exclusion>
257+
<exclusion>
250258
<groupId>com.sun.jmx</groupId>
251259
<artifactId>jmxri</artifactId>
252-
</exclusion>
260+
</exclusion>
253261
</exclusions>
254262
</dependency>
255263
<dependency>
@@ -258,44 +266,44 @@
258266
<version>4.8.1</version>
259267
<type>jar</type>
260268
</dependency>
261-
<dependency>
269+
<dependency>
262270
<groupId>org.apache.tiles</groupId>
263271
<artifactId>tiles-core</artifactId>
264272
<version>${tiles.version}</version>
265-
<type>jar</type>
266-
</dependency>
267-
<dependency>
273+
<type>jar</type>
274+
</dependency>
275+
<dependency>
268276
<groupId>org.apache.tiles</groupId>
269277
<artifactId>tiles-template</artifactId>
270278
<version>${tiles.version}</version>
271-
<type>jar</type>
272-
</dependency>
273-
<dependency>
279+
<type>jar</type>
280+
</dependency>
281+
<dependency>
274282
<groupId>org.apache.tiles</groupId>
275283
<artifactId>tiles-servlet</artifactId>
276284
<version>${tiles.version}</version>
277285
<type>jar</type>
278-
</dependency>
279-
<dependency>
286+
</dependency>
287+
<dependency>
280288
<groupId>org.apache.tiles</groupId>
281289
<artifactId>tiles-jsp</artifactId>
282290
<version>${tiles.version}</version>
283291
<type>jar</type>
284-
</dependency>
285-
<dependency>
292+
</dependency>
293+
<dependency>
286294
<groupId>org.slf4j</groupId>
287295
<artifactId>slf4j-api</artifactId>
288296
<version>1.5.8</version>
289297
<type>jar</type>
290-
</dependency>
291-
<dependency>
298+
</dependency>
299+
<dependency>
292300
<groupId>org.slf4j</groupId>
293301
<artifactId>slf4j-log4j12</artifactId>
294302
<version>1.5.8</version>
295303
<type>jar</type>
296-
</dependency>
297-
304+
</dependency>
305+
298306
<!-- ************* END spring MVC and related dependencies ************** -->
299-
307+
300308
</dependencies>
301309
</project>

0 commit comments

Comments
 (0)