|
@@ -20,6 +20,11 @@
|
20
|
20
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
21
|
21
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
22
|
22
|
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
|
23
|
+ <maven.compiler.source>1.7</maven.compiler.source>
|
|
24
|
+ <maven.compiler.target>1.7</maven.compiler.target>
|
|
25
|
+
|
|
26
|
+ <maven.test.skip>true</maven.test.skip>
|
|
27
|
+
|
23
|
28
|
|
24
|
29
|
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
|
25
|
30
|
<javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
|
|
@@ -53,40 +58,6 @@
|
53
|
58
|
|
54
|
59
|
<build>
|
55
|
60
|
<plugins>
|
56
|
|
- <plugin>
|
57
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
58
|
|
- <artifactId>maven-compiler-plugin</artifactId>
|
59
|
|
- <version>3.1</version>
|
60
|
|
- <configuration>
|
61
|
|
- <source>1.7</source>
|
62
|
|
- <target>1.7</target>
|
63
|
|
- <encoding>UTF8</encoding>
|
64
|
|
- </configuration>
|
65
|
|
- </plugin>
|
66
|
|
- <plugin>
|
67
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
68
|
|
- <artifactId>maven-resources-plugin</artifactId>
|
69
|
|
- <version>2.6</version>
|
70
|
|
- <configuration>
|
71
|
|
- <encoding>UTF-8</encoding>
|
72
|
|
- </configuration>
|
73
|
|
- </plugin>
|
74
|
|
- <plugin>
|
75
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
76
|
|
- <artifactId>maven-war-plugin</artifactId>
|
77
|
|
- <version>2.5</version>
|
78
|
|
- <configuration>
|
79
|
|
- <archiveClasses>false</archiveClasses>
|
80
|
|
- </configuration>
|
81
|
|
- </plugin>
|
82
|
|
- <plugin>
|
83
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
84
|
|
- <artifactId>maven-surefire-plugin</artifactId>
|
85
|
|
- <version>2.19.1</version>
|
86
|
|
- <configuration>
|
87
|
|
- <skip>true</skip>
|
88
|
|
- </configuration>
|
89
|
|
- </plugin>
|
90
|
61
|
</plugins>
|
91
|
62
|
</build>
|
92
|
63
|
|
|
@@ -123,7 +94,7 @@
|
123
|
94
|
<plugin>
|
124
|
95
|
<groupId>org.apache.maven.plugins</groupId>
|
125
|
96
|
<artifactId>maven-source-plugin</artifactId>
|
126
|
|
- <version>2.2.1</version>
|
|
97
|
+ <version>3.0.1</version>
|
127
|
98
|
<executions>
|
128
|
99
|
<execution>
|
129
|
100
|
<phase>package</phase>
|
|
@@ -137,7 +108,7 @@
|
137
|
108
|
<plugin>
|
138
|
109
|
<groupId>org.apache.maven.plugins</groupId>
|
139
|
110
|
<artifactId>maven-javadoc-plugin</artifactId>
|
140
|
|
- <version>2.10.3</version>
|
|
111
|
+ <version>3.0.0</version>
|
141
|
112
|
<executions>
|
142
|
113
|
<execution>
|
143
|
114
|
<phase>package</phase>
|