Return-Path: 
 <scm-return-39137-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 36482 invoked from network); 11 Nov 2009 17:04:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 11 Nov 2009 17:04:03 -0000
Received: (qmail 62001 invoked by uid 500); 11 Nov 2009 17:04:03 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 61952 invoked by uid 500); 11 Nov 2009 17:04:02 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 61943 invoked by uid 99); 11 Nov 2009 17:04:02 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Nov 2009 17:04:02 +0000
X-ASF-Spam-Status: No, hits=-2.5 required=5.0
	tests=AWL,BAYES_00
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Nov 2009 17:04:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 717212388867; Wed, 11 Nov 2009 17:03:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r834967 - in /geronimo/plugins/openjpa2/branches/2.1:
 geronimo-persistence-jpa20-builder/pom.xml jpa-tests/pom.xml
 openjpa2/pom.xml persistence-jpa20-deployer/pom.xml pom.xml
Date: Wed, 11 Nov 2009 17:03:40 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091111170340.717212388867@eris.apache.org>

Author: dwoods
Date: Wed Nov 11 17:03:39 2009
New Revision: 834967

URL: http://svn.apache.org/viewvc?rev=834967&view=rev
Log:
GERONIMO-4946 build fixes

Modified:
    geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/pom.xml

Modified: geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml?rev=834967&r1=834966&r2=834967&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml Wed Nov 11 17:03:39 2009
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-persistence-jpa20</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml?rev=834967&r1=834966&r2=834967&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml Wed Nov 11 17:03:39 2009
@@ -39,7 +39,6 @@
 
     <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
     <artifactId>jpa-tests</artifactId>
-    <version>2.1.4-M3-SNAPSHOT</version>
     <packaging>pom</packaging>
     
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA Tests</name>
@@ -75,6 +74,7 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
                     <configuration>
                         <resourcesDir>${project.build.outputDirectory}</resourcesDir>

Modified: geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml?rev=834967&r1=834966&r2=834967&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml Wed Nov 11 17:03:39 2009
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openjpa2</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <!-- OpenJPA depends -->

Modified: geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml?rev=834967&r1=834966&r2=834967&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml Wed Nov 11 17:03:39 2009
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-persistence-jpa20-builder</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/plugins/openjpa2/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/pom.xml?rev=834967&r1=834966&r2=834967&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/pom.xml Wed Nov 11 17:03:39 2009
@@ -65,6 +65,9 @@
     </scm>
 
     <properties>
+        <!-- plugin version, which has to match pom version above -->
+        <version>2.1.4-M3-SNAPSHOT</version>
+
         <openjpa2Version>2.0.0-M3</openjpa2Version>
         <jpa2specVersion>1.0-PFD2</jpa2specVersion>
         <bvspecVersion>1.0-CR5</bvspecVersion>