[infinispan-commits] Infinispan SVN: r748 - in trunk: cachestore/bdbje and 7 other directories.

infinispan-commits at lists.jboss.org infinispan-commits at lists.jboss.org
Fri Aug 28 11:55:41 EDT 2009


Author: mircea.markus
Date: 2009-08-28 11:55:40 -0400 (Fri, 28 Aug 2009)
New Revision: 748

Modified:
   trunk/cachestore/bdbje/pom.xml
   trunk/cachestore/jdbc/pom.xml
   trunk/cachestore/jdbm/pom.xml
   trunk/cachestore/s3/pom.xml
   trunk/jopr-plugin/pom.xml
   trunk/parent/pom.xml
   trunk/pom.xml
   trunk/tools/pom.xml
   trunk/tree/pom.xml
Log:
mvn improvement - rely on built-in properties({$project.groupId} and ${project.version}) rather than redefining them

Modified: trunk/cachestore/bdbje/pom.xml
===================================================================
--- trunk/cachestore/bdbje/pom.xml	2009-08-28 15:29:43 UTC (rev 747)
+++ trunk/cachestore/bdbje/pom.xml	2009-08-28 15:55:40 UTC (rev 748)
@@ -16,15 +16,15 @@
    <description>Infinispan BerkeleyDB JavaEdition CacheStore module</description>
    <dependencies>
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
          <type>test-jar</type>
          <scope>test</scope>
       </dependency>

Modified: trunk/cachestore/jdbc/pom.xml
===================================================================
--- trunk/cachestore/jdbc/pom.xml	2009-08-28 15:29:43 UTC (rev 747)
+++ trunk/cachestore/jdbc/pom.xml	2009-08-28 15:55:40 UTC (rev 748)
@@ -21,15 +21,15 @@
 
    <dependencies>
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
          <type>test-jar</type>
          <scope>test</scope>
       </dependency>

Modified: trunk/cachestore/jdbm/pom.xml
===================================================================
--- trunk/cachestore/jdbm/pom.xml	2009-08-28 15:29:43 UTC (rev 747)
+++ trunk/cachestore/jdbm/pom.xml	2009-08-28 15:55:40 UTC (rev 748)
@@ -18,15 +18,15 @@
 
    <dependencies>
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
          <type>test-jar</type>
          <scope>test</scope>
       </dependency>

Modified: trunk/cachestore/s3/pom.xml
===================================================================
--- trunk/cachestore/s3/pom.xml	2009-08-28 15:29:43 UTC (rev 747)
+++ trunk/cachestore/s3/pom.xml	2009-08-28 15:55:40 UTC (rev 748)
@@ -25,15 +25,15 @@
 
    <dependencies>
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
          <type>test-jar</type>
          <scope>test</scope>
       </dependency>

Modified: trunk/jopr-plugin/pom.xml
===================================================================
--- trunk/jopr-plugin/pom.xml	2009-08-28 15:29:43 UTC (rev 747)
+++ trunk/jopr-plugin/pom.xml	2009-08-28 15:55:40 UTC (rev 748)
@@ -235,15 +235,15 @@
       <!-- END unnenessary deps -->
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
          <type>test-jar</type>
          <scope>test</scope>
       </dependency>

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml	2009-08-28 15:29:43 UTC (rev 747)
+++ trunk/parent/pom.xml	2009-08-28 15:55:40 UTC (rev 748)
@@ -64,8 +64,6 @@
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <project-package>org.infinispan</project-package>
-      <project-version>4.0.0-SNAPSHOT</project-version>
       <defaultTestGroup>functional,unit</defaultTestGroup>
    </properties>
 

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-08-28 15:29:43 UTC (rev 747)
+++ trunk/pom.xml	2009-08-28 15:55:40 UTC (rev 748)
@@ -111,7 +111,7 @@
                         <configuration>
                            <tasks>
                               <property name="file"
-                                        value="${project.build.directory}/distribution/${artifactId}-${project-version}-single_jar.zip"/>
+                                        value="${project.build.directory}/distribution/${artifactId}-${project.version}-single_jar.zip"/>
                               <zip destfile="${file}.new">
                                  <zipfileset src="${file}">
                                     <exclude name="**/.ignore/**"/>
@@ -153,7 +153,7 @@
                         <descriptor>src/main/resources/assemblies/all.xml</descriptor>
                         <descriptor>src/main/resources/assemblies/src.xml</descriptor>
                      </descriptors>
-                     <finalName>${artifactId}-${project-version}</finalName>
+                     <finalName>${artifactId}-${project.version}</finalName>
                      <outputDirectory>target/distribution</outputDirectory>
                      <workDirectory>target/assembly/work</workDirectory>
                   </configuration>

Modified: trunk/tools/pom.xml
===================================================================
--- trunk/tools/pom.xml	2009-08-28 15:29:43 UTC (rev 747)
+++ trunk/tools/pom.xml	2009-08-28 15:55:40 UTC (rev 748)
@@ -27,65 +27,65 @@
    
    <dependencies>
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
          <type>test-jar</type>
          <scope>test</scope>
       </dependency>
 
       <!-- needs to depend on all other modules it is trying to document! -->
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-cachestore-bdbje</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-cachestore-jdbc</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-cachestore-jdbm</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-cachestore-s3</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-gui-demo</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-jopr-plugin</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-tree</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
       
       <dependency>

Modified: trunk/tree/pom.xml
===================================================================
--- trunk/tree/pom.xml	2009-08-28 15:29:43 UTC (rev 747)
+++ trunk/tree/pom.xml	2009-08-28 15:55:40 UTC (rev 748)
@@ -16,15 +16,15 @@
    <description>Infinispan tree API module</description>
    <dependencies>
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-         <groupId>${project-package}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-core</artifactId>
-         <version>${project-version}</version>
+         <version>${project.version}</version>
          <type>test-jar</type>
          <scope>test</scope>
       </dependency>



More information about the infinispan-commits mailing list