Skip to content

Commit 99b9496

Browse files
author
droodev
committed
Maven now builds war correctly
1 parent 5c5934d commit 99b9496

25 files changed

+12
-4
lines changed

pom.xml

+9-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@
2929
<target>1.7</target>
3030
</configuration>
3131
</plugin>
32+
<plugin>
33+
<artifactId>maven-war-plugin</artifactId>
34+
<version>2.6</version>
35+
<configuration>
36+
<warSourceExcludes>**/node_modules/,.*,.tmp/</warSourceExcludes>
37+
</configuration>
38+
</plugin>
3239
</plugins>
3340
</build>
3441

@@ -41,8 +48,8 @@
4148
<dependency>
4249
<groupId>javax</groupId>
4350
<artifactId>javaee-api</artifactId>
44-
<version>6.0</version>
45-
<scope>provided</scope>
51+
<version>6.0</version>
52+
<scope>provided</scope>
4653
</dependency>
4754
<dependency>
4855
<groupId>com.google.code.gson</groupId>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

wpom.iml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<facet type="web" name="Web">
55
<configuration>
66
<descriptors>
7-
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml.old" />
7+
<deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/main/webapp/META-INF/context.xml" />
8+
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
89
</descriptors>
910
<webroots>
1011
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
@@ -22,7 +23,7 @@
2223
<datasource-mapping>
2324
<factory-entry name="domain" />
2425
</datasource-mapping>
25-
<deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/META-INF/persistence.xml" />
26+
<deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/webapp/META-INF/persistence.xml" />
2627
</configuration>
2728
</facet>
2829
</component>

0 commit comments

Comments
 (0)