portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r384752 - in /portals/jetspeed-2/trunk: maven-plugin/maven.xml maven-plugin/plugin.properties project.properties
Date Fri, 10 Mar 2006 10:16:01 GMT
Author: ate
Date: Fri Mar 10 02:15:59 2006
New Revision: 384752

URL: http://svn.apache.org/viewcvs?rev=384752&view=rev
Log:
More plugin j2:genapp fixes :(
Seems portals.bridges.version (which I removed yesterday as I still think we shouldn't use
it like that) is used by the plugin itself too.
That, and bridges.groupId as well.
So, to fix this quickly, I reintroduce portals.bridges.version and store it together with
bridges.groupId in the plugin.properties.
Hopefully custom portal generation with maven-1 now is really fixed again.

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

Modified: portals/jetspeed-2/trunk/maven-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/maven.xml?rev=384752&r1=384751&r2=384752&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/maven.xml Fri Mar 10 02:15:59 2006
@@ -68,6 +68,8 @@
         <filter token="SERVLET_API_VERSION" value="${servlet.api.version}" />
         <filter token="MYFACES_VERSION" value="${myfaces.version}" />
         <filter token="SPRING_VERSION" value="${spring.version}" />
+        <filter token="BRIDGES_GROUPID" value="${bridges.groupId}" />
+        <filter token="PORTALS_BRIDGES_VERSION" value="${portals.bridges.version}" />
         <filter token="PORTALS_BRIDGES_COMMON_VERSION" value="${portals.bridges.common.version}"
/>
         <filter token="PORTALS_BRIDGES_FRAMEWORKS_VERSION" value="${portals.bridges.frameworks.version}"
/>
         <filter token="PORTALS_BRIDGES_JSF_VERSION" value="${portals.bridges.jsf.version}"
/>

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.properties?rev=384752&r1=384751&r2=384752&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.properties (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.properties Fri Mar 10 02:15:59 2006
@@ -27,6 +27,8 @@
 servlet.api.version=@SERVLET_API_VERSION@
 myfaces.version=@MYFACES_VERSION@
 spring.version=@SPRING_VERSION@
+bridges.groupId=@BRIDGES_GROUPID@
+portals.bridges.version=@PORTALS_BRIDGES_VERSION@
 portals.bridges.common.version=@PORTALS_BRIDGES_COMMON_VERSION@
 portals.bridges.frameworks.version=@PORTALS_BRIDGES_FRAMEWORKS_VERSION@
 portals.bridges.jsf.version=@PORTALS_BRIDGES_JSF_VERSION@

Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=384752&r1=384751&r2=384752&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Fri Mar 10 02:15:59 2006
@@ -21,6 +21,7 @@
 myfaces.version=1.1.0
 spring.version=1.1.5
 bridges.groupId=org.apache.portals.bridges
+portals.bridges.version=1.0
 portals.bridges.common.version=1.0
 portals.bridges.frameworks.version=1.0
 portals.bridges.jsf.version=1.0



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


Mime
View raw message