geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r630497 - in /geronimo/plugins/roller/trunk: pom.xml roller-derby-database/pom.xml roller-jetty/pom.xml roller-mysql-database/pom.xml roller-tomcat/pom.xml
Date Sat, 23 Feb 2008 18:20:21 GMT
Author: djencks
Date: Sat Feb 23 10:20:19 2008
New Revision: 630497

URL: http://svn.apache.org/viewvc?rev=630497&view=rev
Log:
Use properties for some versions, fix scope in db modules

Modified:
    geronimo/plugins/roller/trunk/pom.xml
    geronimo/plugins/roller/trunk/roller-derby-database/pom.xml
    geronimo/plugins/roller/trunk/roller-jetty/pom.xml
    geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml
    geronimo/plugins/roller/trunk/roller-tomcat/pom.xml

Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=630497&r1=630496&r2=630497&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Sat Feb 23 10:20:19 2008
@@ -32,11 +32,12 @@
     <packaging>pom</packaging>
 
     <!--  IMPORTANT NOTE
-    BEFORE RELEASING change the versions in the config-xml-content/gbean name in roller-jetty
and roller-tomcat poms
+    BEFORE RELEASING change the rollerPluginVersion below
     -->
     <properties>
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>2.1</geronimoVersion>
+        <rollerPluginVersion>1.0-SNAPSHOT</rollerPluginVersion>
 
         <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>

Modified: geronimo/plugins/roller/trunk/roller-derby-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-derby-database/pom.xml?rev=630497&r1=630496&r2=630497&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-derby-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-derby-database/pom.xml Sat Feb 23 10:20:19 2008
@@ -48,6 +48,7 @@
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-local</artifactId>
             <type>rar</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=630497&r1=630496&r2=630497&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Sat Feb 23 10:20:19 2008
@@ -384,10 +384,7 @@
                             <copy-file relative-to="server" dest-dir="var/roller-data">themes</copy-file>
                             <copy-file relative-to="server" dest-dir="var/roller-data">config</copy-file>
                             <config-xml-content server="default">
-                                <!--  IMPORTANT NOTE
-                                BEFORE RELEASING change the versions in the config-xml-content/gbean
name in roller-jetty and roller-tomcat poms
-                                -->
-                                <gbean name="org.apache.geronimo.plugins/roller-jetty/1.0-SNAPSHOT/car">
+                                <gbean name="org.apache.geronimo.plugins/roller-jetty/${rollerPluginVersion}/car">
                                     <attribute name="contextPath">${RollerContextPath}</attribute>
                                 </gbean>
                             </config-xml-content>

Modified: geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml?rev=630497&r1=630496&r2=630497&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-mysql-database/pom.xml Sat Feb 23 10:20:19 2008
@@ -49,6 +49,7 @@
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-mysql-local</artifactId>
             <type>rar</type>
+            <scope>provided</scope>
         </dependency>
 
         <!-- 

Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=630497&r1=630496&r2=630497&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Sat Feb 23 10:20:19 2008
@@ -386,10 +386,7 @@
                             <copy-file relative-to="server" dest-dir="var/roller-data">themes</copy-file>
                             <copy-file relative-to="server" dest-dir="var/roller-data">config</copy-file>
                             <config-xml-content server="default">
-                                <!--  IMPORTANT NOTE
-                                BEFORE RELEASING change the versions in the config-xml-content/gbean
name in roller-jetty and roller-tomcat poms
-                                -->
-                                <gbean name="org.apache.geronimo.plugins/roller-tomcat/1.0-SNAPSHOT/car">
+                                <gbean name="org.apache.geronimo.plugins/roller-tomcat/${rollerPluginVersion}/car">
                                     <attribute name="contextPath">${RollerContextPath}</attribute>
                                 </gbean>
                             </config-xml-content>



Mime
View raw message