struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r386985 - in /struts/shale/trunk/build: blank/ clay-plugin/ core-library/ core-test/ designtime/ mailreader/ remoting/ spring/ sql-browser/ test-framework/ tiger/ tiles/ use-cases/
Date Sun, 19 Mar 2006 16:06:33 GMT
Author: wsmoak
Date: Sun Mar 19 08:06:31 2006
New Revision: 386985

URL: http://svn.apache.org/viewcvs?rev=386985&view=rev
Log:
For the Maven 1 build, let the version number be inherited from the parent pom, and use the
${pom.currentVersion} expression rather than explicit versions on dependencies.

Modified:
    struts/shale/trunk/build/blank/project.xml
    struts/shale/trunk/build/clay-plugin/project.xml
    struts/shale/trunk/build/core-library/project.xml
    struts/shale/trunk/build/core-test/project.xml
    struts/shale/trunk/build/designtime/project.xml
    struts/shale/trunk/build/mailreader/project.xml
    struts/shale/trunk/build/remoting/project.xml
    struts/shale/trunk/build/spring/project.xml
    struts/shale/trunk/build/sql-browser/project.xml
    struts/shale/trunk/build/test-framework/project.xml
    struts/shale/trunk/build/tiger/project.xml
    struts/shale/trunk/build/tiles/project.xml
    struts/shale/trunk/build/use-cases/project.xml

Modified: struts/shale/trunk/build/blank/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/blank/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/blank/project.xml (original)
+++ struts/shale/trunk/build/blank/project.xml Sun Mar 19 08:06:31 2006
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-core</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-test</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>
         <properties>
           <scope>test</scope>
         </properties>

Modified: struts/shale/trunk/build/clay-plugin/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/clay-plugin/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/clay-plugin/project.xml (original)
+++ struts/shale/trunk/build/clay-plugin/project.xml Sun Mar 19 08:06:31 2006
@@ -113,12 +113,12 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-core</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-test</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>>
       <properties>
           <scope>test</scope>
       </properties>

Modified: struts/shale/trunk/build/core-library/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-library/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/core-library/project.xml (original)
+++ struts/shale/trunk/build/core-library/project.xml Sun Mar 19 08:06:31 2006
@@ -22,7 +22,6 @@
   <extend>../project.xml</extend>
   <id>shale-core</id>
   <name>Shale Core Library</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
 
   <siteAddress>people.apache.org</siteAddress>
   <siteDirectory>/www/struts.apache.org/struts-shale/shale-core/</siteDirectory>

Modified: struts/shale/trunk/build/core-test/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-test/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/core-test/project.xml (original)
+++ struts/shale/trunk/build/core-test/project.xml Sun Mar 19 08:06:31 2006
@@ -27,7 +27,6 @@
   <extend>../project.xml</extend>
   <artifactId>shale-core-test</artifactId>
   <name>Shale Core Library Tests</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
 
   <siteAddress>people.apache.org</siteAddress>
   <siteDirectory>/www/struts.apache.org/struts-shale/shale-core-test/</siteDirectory>
@@ -65,19 +64,19 @@
         <dependency>
           <groupId>org.apache.struts.shale</groupId>
           <artifactId>shale-core</artifactId>
-          <version>1.0.1-SNAPSHOT</version>
+          <version>${pom.currentVersion}</version>
         </dependency>
 
         <dependency>
           <groupId>org.apache.struts.shale</groupId>
           <artifactId>shale-remoting</artifactId>
-          <version>1.0.1-SNAPSHOT</version>
+          <version>${pom.currentVersion}</version>
         </dependency>
         
         <dependency>
           <groupId>org.apache.struts.shale</groupId>
           <artifactId>shale-test</artifactId>
-          <version>1.0.1-SNAPSHOT</version>
+          <version>${pom.currentVersion}</version>>
           <properties>
               <scope>test</scope>
           </properties>

Modified: struts/shale/trunk/build/designtime/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/designtime/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/designtime/project.xml (original)
+++ struts/shale/trunk/build/designtime/project.xml Sun Mar 19 08:06:31 2006
@@ -22,7 +22,6 @@
   <extend>../project.xml</extend>
   <artifactId>shale-designtime</artifactId>
   <name>Shale Designtime</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
 
   <siteAddress>people.apache.org</siteAddress>
   <siteDirectory>/www/struts.apache.org/struts-shale/shale-designtime/</siteDirectory>
@@ -42,7 +41,7 @@
       <dependency>
         <groupId>org.apache.struts.shale</groupId>
         <artifactId>shale-core</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>${pom.currentVersion}</version>>
         <url>http://struts.apache.org/struts-shale</url>
       </dependency>
 

Modified: struts/shale/trunk/build/mailreader/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/mailreader/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/mailreader/project.xml (original)
+++ struts/shale/trunk/build/mailreader/project.xml Sun Mar 19 08:06:31 2006
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-core</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>

Modified: struts/shale/trunk/build/remoting/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/remoting/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/remoting/project.xml (original)
+++ struts/shale/trunk/build/remoting/project.xml Sun Mar 19 08:06:31 2006
@@ -22,7 +22,6 @@
    <extend>../project.xml</extend>
    <artifactId>shale-remoting</artifactId>
    <name>Shale Remoting</name>
-   <currentVersion>1.0.1-SNAPSHOT</currentVersion>
 
   <!-- Gump integration -->
    <gumpRepositoryId>jakarta</gumpRepositoryId>
@@ -95,7 +94,7 @@
       <dependency>
          <groupId>org.apache.struts.shale</groupId>
          <artifactId>shale-test</artifactId>
-         <version>1.0.1-SNAPSHOT</version>
+         <version>${pom.currentVersion}</version>
          <properties>
             <scope>test</scope>
          </properties>

Modified: struts/shale/trunk/build/spring/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/spring/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/spring/project.xml (original)
+++ struts/shale/trunk/build/spring/project.xml Sun Mar 19 08:06:31 2006
@@ -22,7 +22,6 @@
   <extend>../project.xml</extend>
   <id>shale-spring</id>
   <name>Shale Spring Integration</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
 
   <siteAddress>people.apache.org</siteAddress>
   <siteDirectory>/www/struts.apache.org/struts-shale/shale-spring/</siteDirectory>

Modified: struts/shale/trunk/build/sql-browser/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/sql-browser/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/sql-browser/project.xml (original)
+++ struts/shale/trunk/build/sql-browser/project.xml Sun Mar 19 08:06:31 2006
@@ -115,7 +115,7 @@
       <dependency>
          <groupId>org.apache.struts.shale</groupId>
          <artifactId>shale-core</artifactId>
-         <version>1.0.1-SNAPSHOT</version>
+         <version>${pom.currentVersion}</version>
          <properties>
             <war.bundle>true</war.bundle>
          </properties>
@@ -124,7 +124,7 @@
       <dependency>
          <groupId>org.apache.struts.shale</groupId>
          <artifactId>shale-tiger</artifactId>
-         <version>1.0.1-SNAPSHOT</version>
+         <version>${pom.currentVersion}</version>
          <properties>
             <war.bundle>true</war.bundle>
          </properties>
@@ -133,7 +133,7 @@
       <dependency>
          <groupId>org.apache.struts.shale</groupId>
          <artifactId>shale-test</artifactId>
-         <version>1.0.1-SNAPSHOT</version>
+         <version>${pom.currentVersion}</version>
          <properties>
             <scope>test</scope>
          </properties>

Modified: struts/shale/trunk/build/test-framework/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/test-framework/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/test-framework/project.xml (original)
+++ struts/shale/trunk/build/test-framework/project.xml Sun Mar 19 08:06:31 2006
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-core</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>>
       <url>http://struts.apache.org/struts-shale</url>
     </dependency>
     <dependency>

Modified: struts/shale/trunk/build/tiger/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/tiger/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/tiger/project.xml (original)
+++ struts/shale/trunk/build/tiger/project.xml Sun Mar 19 08:06:31 2006
@@ -22,7 +22,6 @@
     <extend>../project.xml</extend>
     <artifactId>shale-tiger</artifactId>
     <name>Shale Tiger Extensions</name>
-    <currentVersion>1.0.1-SNAPSHOT</currentVersion>
 
     <siteAddress>people.apache.org</siteAddress>
     <siteDirectory>/www/struts.apache.org/struts-shale/shale-tiger/</siteDirectory>
@@ -103,13 +102,13 @@
         <dependency>
             <groupId>org.apache.struts.shale</groupId>
             <artifactId>shale-core</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>${pom.currentVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts.shale</groupId>
             <artifactId>shale-test</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>${pom.currentVersion}</version>
             <properties>
                 <scope>test</scope>
             </properties>

Modified: struts/shale/trunk/build/tiles/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/tiles/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/tiles/project.xml (original)
+++ struts/shale/trunk/build/tiles/project.xml Sun Mar 19 08:06:31 2006
@@ -22,7 +22,6 @@
   <extend>../project.xml</extend>
   <id>shale-tiles</id>
   <name>Shale Tiles Integration</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
 
   <!-- Gump integration -->
   <gumpRepositoryId>jakarta</gumpRepositoryId>

Modified: struts/shale/trunk/build/use-cases/project.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build/use-cases/project.xml?rev=386985&r1=386984&r2=386985&view=diff
==============================================================================
--- struts/shale/trunk/build/use-cases/project.xml (original)
+++ struts/shale/trunk/build/use-cases/project.xml Sun Mar 19 08:06:31 2006
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-core</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-remoting</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-clay</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-spring</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
@@ -116,7 +116,7 @@
     <dependency>
       <groupId>org.apache.struts.shale</groupId>
       <artifactId>shale-test</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>
       <properties>
           <scope>test</scope>
       </properties>



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


Mime
View raw message