From 5e38145fa1b86fecaf9398b03b1418b84356151c Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Tue, 17 Aug 2010 12:30:40 +0000
Subject: [PATCH] OPENJPA-1712 use project.version instead of pom.version

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986294 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-all/pom.xml                    |  2 +-
 openjpa-examples/pom.xml               |  2 +-
 openjpa-integration/daytrader/pom.xml  |  6 +++---
 openjpa-integration/examples/pom.xml   |  6 +++---
 openjpa-integration/tck/pom.xml        |  4 ++--
 openjpa-integration/validation/pom.xml |  4 ++--
 openjpa-jdbc/pom.xml                   |  2 +-
 openjpa-kernel/pom.xml                 |  2 +-
 openjpa-persistence-jdbc/pom.xml       |  4 ++--
 openjpa-persistence-locking/pom.xml    |  4 ++--
 openjpa-persistence/pom.xml            |  2 +-
 openjpa-slice/pom.xml                  |  8 ++++----
 openjpa-xmlstore/pom.xml               |  6 +++---
 openjpa/pom.xml                        | 14 +++++++-------
 pom.xml                                |  4 +++-
 15 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index a8f34ea48..e1c25b2ba 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <!-- include commons-logging -->
         <dependency>
diff --git a/openjpa-examples/pom.xml b/openjpa-examples/pom.xml
index d29303c26..9ea3c1122 100644
--- a/openjpa-examples/pom.xml
+++ b/openjpa-examples/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml
index b0c8f5576..3c448bd44 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/openjpa-integration/daytrader/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <!-- Maybe one day we can used published artifacts for this...
         <dependency>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
@@ -158,7 +158,7 @@
                     <dependency>
                         <groupId>org.apache.openjpa</groupId>
                         <artifactId>openjpa</artifactId>
-                        <version>${pom.version}</version>
+                        <version>${project.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/openjpa-integration/examples/pom.xml b/openjpa-integration/examples/pom.xml
index 213798190..a9153e8e9 100644
--- a/openjpa-integration/examples/pom.xml
+++ b/openjpa-integration/examples/pom.xml
@@ -66,11 +66,11 @@
                         <delete dir="${examples.base}" quiet="true" />
                         <mkdir dir="${examples.base}" />
 
-                        <unzip overwrite="false" dest="${examples.base}" src="../../openjpa-project/target/site/downloads/apache-openjpa-${pom.version}-binary.zip" />
+                        <unzip overwrite="false" dest="${examples.base}" src="../../openjpa-project/target/site/downloads/apache-openjpa-${project.version}-binary.zip" />
 
                         <path id="assembly.classpath"> 
                             <fileset dir="${examples.base}">
-                                <include name="**/openjpa-all-${pom.version}.jar" />
+                                <include name="**/openjpa-all-${project.version}.jar" />
                             </fileset>
                         </path>
                         <available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-all</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml
index de8b6e61d..643873850 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -201,7 +201,7 @@
           <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-all</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </profile>
@@ -430,7 +430,7 @@ databaseName=${db.name}
           <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
       </profile>
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index 4d604cf5a..00b6bdbd3 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -149,7 +149,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <!-- allow profiles to decide which validation spec to use -->
             <exclusions>
                 <exclusion>
@@ -161,7 +161,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <!-- <classifier>tests</classifier> -->
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml
index 403a2d80d..e27bd3958 100644
--- a/openjpa-jdbc/pom.xml
+++ b/openjpa-jdbc/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index 9dac539c8..64f3f9294 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index 37e473cfa..820d3dd3d 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -683,12 +683,12 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index 1fa350925..44f2a64f0 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -688,12 +688,12 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <!-- <classifier>test-base</classifier> -->
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml
index 9b7dc8478..93398cc6f 100644
--- a/openjpa-persistence/pom.xml
+++ b/openjpa-persistence/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml
index 19f0a6a78..10368ad30 100644
--- a/openjpa-slice/pom.xml
+++ b/openjpa-slice/pom.xml
@@ -40,12 +40,12 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -55,13 +55,13 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml
index 1c4867ca4..8125daefa 100644
--- a/openjpa-xmlstore/pom.xml
+++ b/openjpa-xmlstore/pom.xml
@@ -40,12 +40,12 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <!-- <classifier>test-base</classifier> -->
             <type>test-jar</type>
             <scope>test</scope>
@@ -107,7 +107,7 @@
                         <groupId>org.apache.openjpa</groupId>
                         <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
                         <artifactId>openjpa-persistence-jdbc</artifactId>
-                        <version>${pom.version}</version>
+                        <version>${project.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/openjpa/pom.xml b/openjpa/pom.xml
index 9c912e1aa..a32f7d3aa 100644
--- a/openjpa/pom.xml
+++ b/openjpa/pom.xml
@@ -129,17 +129,17 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <!-- 
                  Need to exclude jaxb, so the following will not get included
                  as compile depends in the aggregate JAR by the shade plugin:
@@ -196,22 +196,22 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-xmlstore</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-slice</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 0c55b518e..2434c1deb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
                                                 <include name="META-INF/*.txt" />
                                             </patternset>
                                             <fileset dir="${project.build.directory}">
-                                                <include name="${artifactId}-${pom.version}.jar" />
+                                                <include name="${artifactId}-${project.version}.jar" />
                                             </fileset>
                                         </unzip>
                                     </tasks>
@@ -299,6 +299,8 @@
                                 <exclude>**/*.log</exclude>
                                 <exclude>**/maven-eclipse.xml</exclude>
                                 <exclude>**/rat.txt</exclude>
+                                <exclude>release.properties</exclude>
+                                <exclude>DEPENDENCIES</exclude>
                                 <!-- Exclude internal build-only repository -->
                                 <exclude>**/internal-repository/**</exclude>
                             </excludes>