openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r986294 - in /openjpa/branches/2.0.x: ./ openjpa-all/ openjpa-examples/ openjpa-integration/daytrader/ openjpa-integration/examples/ openjpa-integration/tck/ openjpa-integration/validation/ openjpa-jdbc/ openjpa-kernel/ openjpa-persistence-...
Date Tue, 17 Aug 2010 12:30:41 GMT
Author: dwoods
Date: Tue Aug 17 12:30:40 2010
New Revision: 986294

URL: http://svn.apache.org/viewvc?rev=986294&view=rev
Log:
OPENJPA-1712 use project.version instead of pom.version

Modified:
    openjpa/branches/2.0.x/openjpa-all/pom.xml
    openjpa/branches/2.0.x/openjpa-examples/pom.xml
    openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml
    openjpa/branches/2.0.x/openjpa-integration/examples/pom.xml
    openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml
    openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml
    openjpa/branches/2.0.x/openjpa-jdbc/pom.xml
    openjpa/branches/2.0.x/openjpa-kernel/pom.xml
    openjpa/branches/2.0.x/openjpa-persistence-jdbc/pom.xml
    openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml
    openjpa/branches/2.0.x/openjpa-persistence/pom.xml
    openjpa/branches/2.0.x/openjpa-slice/pom.xml
    openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml
    openjpa/branches/2.0.x/openjpa/pom.xml
    openjpa/branches/2.0.x/pom.xml

Modified: openjpa/branches/2.0.x/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-all/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-all/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-examples/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-examples/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-integration/examples/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/examples/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-jdbc/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-jdbc/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-jdbc/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-kernel/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-kernel/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence-jdbc/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-persistence-jdbc/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-persistence/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-slice/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-slice/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-slice/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>

Modified: openjpa/branches/2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/pom.xml?rev=986294&r1=986293&r2=986294&view=diff
==============================================================================
--- openjpa/branches/2.0.x/pom.xml (original)
+++ openjpa/branches/2.0.x/pom.xml Tue Aug 17 12:30:40 2010
@@ -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>



Mime
View raw message