Several changes in the pom.xml files to avoid maven warnings during the
build:
1) renamed property "pom.build.finalName" ==> "project.build.finalName"
2) renamed property "pom.version" ==> "project.version"
3) Added version for maven-war-plugin
diff --git a/maven-pluto-plugin/pom.xml b/maven-pluto-plugin/pom.xml
index 2f90409..c0fcd94 100644
--- a/maven-pluto-plugin/pom.xml
+++ b/maven-pluto-plugin/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-util</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/pluto-ant-tasks/pom.xml b/pluto-ant-tasks/pom.xml
index b740b65..0e626e7 100644
--- a/pluto-ant-tasks/pom.xml
+++ b/pluto-ant-tasks/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-util</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/pluto-container-driver-api/pom.xml b/pluto-container-driver-api/pom.xml
index ecd1b46..326f9aa 100644
--- a/pluto-container-driver-api/pom.xml
+++ b/pluto-container-driver-api/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/pluto-container/pom.xml b/pluto-container/pom.xml
index 78bde00..35f3298 100644
--- a/pluto-container/pom.xml
+++ b/pluto-container/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/pluto-portal-driver-impl/pom.xml b/pluto-portal-driver-impl/pom.xml
index ee42fd0..ab9baaa 100644
--- a/pluto-portal-driver-impl/pom.xml
+++ b/pluto-portal-driver-impl/pom.xml
@@ -35,25 +35,25 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-driver-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-portal-driver</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/pluto-portal-driver/pom.xml b/pluto-portal-driver/pom.xml
index 0de54be..52702cc 100644
--- a/pluto-portal-driver/pom.xml
+++ b/pluto-portal-driver/pom.xml
@@ -35,25 +35,25 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-driver-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-taglib</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/pluto-portal/pom.xml b/pluto-portal/pom.xml
index 9fc26a4..3d7f6de 100644
--- a/pluto-portal/pom.xml
+++ b/pluto-portal/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.portals.pluto</groupId>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-portal-driver</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-portal-driver-impl</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -123,7 +123,6 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
<configuration>
<webResources>
<resource>
@@ -147,7 +146,7 @@
<goal>process</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<attached>false</attached>
</configuration>
</execution>
diff --git a/pluto-testsuite/pom.xml b/pluto-testsuite/pom.xml
index c7f4c12..b78dd18 100644
--- a/pluto-testsuite/pom.xml
+++ b/pluto-testsuite/pom.xml
@@ -98,7 +98,7 @@
<plugin>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -118,7 +118,7 @@
<goal>process</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<attached>false</attached>
</configuration>
</execution>
@@ -166,7 +166,7 @@
-->
<property environment="env" />
<property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}" />
- <copy file="target/${pom.build.finalName}.war" tofile="${deploy.dir}/testsuite.war" />
+ <copy file="target/${project.build.finalName}.war" tofile="${deploy.dir}/testsuite.war" />
</tasks>
</configuration>
<goals>
@@ -203,7 +203,7 @@
-->
<property environment="env" />
<property name="deploy.dir" value="${env.PORTLET_DEPLOY_DIR}" />
- <copy file="target/${pom.build.finalName}.war" tofile="${deploy.dir}/testsuite.war" />
+ <copy file="target/${project.build.finalName}.war" tofile="${deploy.dir}/testsuite.war" />
</tasks>
</configuration>
<goals>
diff --git a/pluto-util/pom.xml b/pluto-util/pom.xml
index 4e96b92..14c1156 100644
--- a/pluto-util/pom.xml
+++ b/pluto-util/pom.xml
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 260a325..318e826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,6 +498,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
