Skip to content

Commit 7e9573f

Browse files
author
Jimbulin
committed
small changes in POMs
- compiler plugin defined only in parent POM; - specified webXml property;
1 parent c13be0e commit 7e9573f

File tree

3 files changed

+23
-42
lines changed

3 files changed

+23
-42
lines changed

my-maps-datalayer/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<version>1.0-SNAPSHOT</version>
1717

1818
<properties>
19-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2019
<version.arquillian>1.0.3.Final</version.arquillian>
2120
<version.arquillian.container>1.0.0.CR3</version.arquillian.container>
2221
<version.weld>1.1.5.Final</version.weld>
@@ -42,15 +41,6 @@
4241

4342
<build>
4443
<plugins>
45-
<plugin>
46-
<groupId>org.apache.maven.plugins</groupId>
47-
<artifactId>maven-compiler-plugin</artifactId>
48-
<version>2.3.2</version>
49-
<configuration>
50-
<source>1.7</source>
51-
<target>1.7</target>
52-
</configuration>
53-
</plugin>
5444
<plugin>
5545
<artifactId>maven-surefire-plugin</artifactId>
5646
<version>${version.maven.surefire}</version>

my-maps-webapp/pom.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,17 @@
1818

1919
<build>
2020
<plugins>
21-
<plugin>
22-
<groupId>org.apache.maven.plugins</groupId>
23-
<artifactId>maven-compiler-plugin</artifactId>
24-
<version>2.3.2</version>
25-
<configuration>
26-
<source>1.7</source>
27-
<target>1.7</target>
28-
</configuration>
29-
</plugin>
3021
<plugin>
3122
<artifactId>maven-surefire-plugin</artifactId>
3223
<version>${version.maven.surefire}</version>
3324
</plugin>
3425
<plugin>
35-
<groupId>org.apache.maven.plugins</groupId>
3626
<artifactId>maven-war-plugin</artifactId>
37-
<version>2.1.1</version>
27+
<version>2.3</version>
3828
<configuration>
39-
<failOnMissingWebXml>false</failOnMissingWebXml>
29+
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
4030
</configuration>
41-
</plugin>
31+
</plugin>
4232
<plugin>
4333
<groupId>org.jboss.as.plugins</groupId>
4434
<artifactId>jboss-as-maven-plugin</artifactId>

pom.xml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>my-maps</groupId>
5-
<artifactId>my-maps</artifactId>
6-
<version>1.0-SNAPSHOT</version>
7-
<modules>
8-
<module>my-maps-datalayer</module>
9-
<module>my-maps-servicelayer</module>
10-
<module>my-maps-webapp</module>
11-
</modules>
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>my-maps</groupId>
5+
<artifactId>my-maps</artifactId>
6+
<version>1.0-SNAPSHOT</version>
7+
<modules>
8+
<module>my-maps-datalayer</module>
9+
<module>my-maps-servicelayer</module>
10+
<module>my-maps-webapp</module>
11+
</modules>
1212

13-
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
16-
</properties>
13+
<properties>
14+
<project.build.source>1.7</project.build.source>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17+
</properties>
1718

18-
<packaging>pom</packaging>
19-
<name>my-maps</name>
19+
<packaging>pom</packaging>
20+
<name>my-maps</name>
2021
<build>
2122
<plugins>
2223
<plugin>
2324
<groupId>org.apache.maven.plugins</groupId>
2425
<artifactId>maven-compiler-plugin</artifactId>
25-
<version>2.3.2</version>
26+
<version>3.1</version>
2627
<configuration>
27-
<source>1.7</source>
28-
<target>1.7</target>
29-
<encoding>UTF-8</encoding>
28+
<source>${project.build.source}</source>
29+
<target>${project.build.source}</target>
30+
<encoding>${project.build.sourceEncoding}</encoding>
3031
</configuration>
3132
</plugin>
3233
</plugins>

0 commit comments

Comments
 (0)