svn commit: r384632 - in /portals/jetspeed-2/trunk: jetspeed-components.xml project.properties

[at...@apache.org]

Author: ate
Date: Thu Mar  9 14:26:04 2006
New Revision: 384632

URL: http://svn.apache.org/viewcvs?rev=384632&view=rev
Log:
Fixing incorrect usage of ${portals.bridges.version} references which is unknown to the maven-plugin, and it should remain so 
(there isn't such a thing like a "general" portals.bridges.version, only separate components each with their own version).
These incorrect references resulted in unsatisfied portals-bridges-common-.jar and portals-bridges-velocity-.jar error message
reported from maven-1 builds for custom portal projects generated with j2:portal.genapp (as the maven-plugin can't filter these variables).

Modified:
    portals/jetspeed-2/trunk/jetspeed-components.xml
    portals/jetspeed-2/trunk/project.properties

Modified: portals/jetspeed-2/trunk/jetspeed-components.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-components.xml?rev=384632&r1=384631&r2=384632&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-components.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-components.xml Thu Mar  9 14:26:04 2006
@@ -293,7 +293,7 @@
 		<dependency>
 			<id>org.apache.portals.bridges:portals-bridges-common</id>
 			<version>
-				${portals.bridges.version}
+				${portals.bridges.common.version}
 			</version>
 			<properties>
 				<war.bundle>false</war.bundle>
@@ -303,7 +303,7 @@
 			<id>portals-bridges-velocity</id>
 			<groupId>org.apache.portals.bridges</groupId>
 			<version>
-				${portals.bridges.version}
+				${portals.bridges.velocity.version}
 			</version>
 			<properties>
 				<war.bundle>true</war.bundle>

Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=384632&r1=384631&r2=384632&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Thu Mar  9 14:26:04 2006
@@ -20,7 +20,6 @@
 servlet.api.version=2.3
 myfaces.version=1.1.0
 spring.version=1.1.5
-portals.bridges.version=1.0
 bridges.groupId=org.apache.portals.bridges
 portals.bridges.common.version=1.0
 portals.bridges.frameworks.version=1.0



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org