Author: ate
Date: Thu Dec 23 01:37:42 2010
New Revision: 1052128
URL: http://svn.apache.org/viewvc?rev=1052128&view=rev
Log:
JS2-1227: Build failure with Maven 3
- also cleanup of deprecated usages like ${pom.version} instead of
${project.version} in jetspeed-archetype
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml?rev=1052128&r1=1052127&r2=1052128&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
Thu Dec 23 01:37:42 2010
@@ -66,7 +66,7 @@
<deployments>
<!-- portlet app -->
<deployment>
-
<artifact>${dollar}{pom.groupId}:${parentArtifactId}-pa:war</artifact>
+
<artifact>${dollar}{project.groupId}:${parentArtifactId}-pa:war</artifact>
<infuse>true</infuse>
<expand>true</expand>
<delete>./${parentArtifactId}-pa.war</delete>
@@ -80,7 +80,7 @@
<dependency>
<groupId>${groupId}</groupId>
<artifactId>${parentArtifactId}-pa</artifactId>
- <version>${dollar}{pom.version}</version>
+ <version>${dollar}{project.version}</version>
<type>war</type>
</dependency>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml?rev=1052128&r1=1052127&r2=1052128&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
Thu Dec 23 01:37:42 2010
@@ -112,9 +112,9 @@
<seed>
<categories>serializer</categories>
<filterPropertiesFileName>
-
${dollar}{project.build.directory}/${parentArtifactId}-portal-${dollar}{pom.version}/WEB-INF/conf/spring-filter.properties
+
${dollar}{project.build.directory}/${parentArtifactId}-portal-${dollar}{project.version}/WEB-INF/conf/spring-filter.properties
</filterPropertiesFileName>
-
<applicationRootPath>${dollar}{project.build.directory}/${parentArtifactId}-portal-${dollar}{pom.version}</applicationRootPath>
+
<applicationRootPath>${dollar}{project.build.directory}/${parentArtifactId}-portal-${dollar}{project.version}</applicationRootPath>
<files>
<file>${dollar}{basedir}/src/sql/min/j2-seed.xml</file>
</files>
@@ -247,7 +247,7 @@
</deployment>
<!-- ${parentArtifactId} portal expanded -->
<deployment>
-
<artifact>${dollar}{pom.groupId}:${parentArtifactId}-portal:war</artifact>
+
<artifact>${dollar}{project.groupId}:${parentArtifactId}-portal:war</artifact>
<expand>true</expand>
<targetName>${dollar}{org.apache.jetspeed.portal.context.name}</targetName>
<delete>./${dollar}{org.apache.jetspeed.portal.context.name}.war</delete>
@@ -285,9 +285,9 @@
<dependencies>
<dependency>
- <groupId>${dollar}{pom.groupId}</groupId>
+ <groupId>${dollar}{project.groupId}</groupId>
<artifactId>${parentArtifactId}-portal</artifactId>
- <version>${dollar}{pom.version}</version>
+ <version>${dollar}{project.version}</version>
<type>war</type>
</dependency>
<dependency>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml?rev=1052128&r1=1052127&r2=1052128&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
Thu Dec 23 01:37:42 2010
@@ -166,7 +166,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <warName>${dollar}{pom.artifactId}</warName>
+ <warName>${dollar}{project.artifactId}</warName>
<overlays>
<overlay>
<id>jetspeed</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
