Return-Path: 
 <open-jpa-commits-return-350-apmail-incubator-open-jpa-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-open-jpa-commits-archive@locus.apache.org
Received: (qmail 16097 invoked from network); 29 Aug 2006 09:54:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 29 Aug 2006 09:54:33 -0000
Received: (qmail 99601 invoked by uid 500); 29 Aug 2006 09:54:33 -0000
Delivered-To: apmail-incubator-open-jpa-commits-archive@incubator.apache.org
Received: (qmail 99585 invoked by uid 500); 29 Aug 2006 09:54:33 -0000
Mailing-List: contact open-jpa-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:open-jpa-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:open-jpa-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:open-jpa-commits@incubator.apache.org>
List-Id: <open-jpa-commits.incubator.apache.org>
Reply-To: open-jpa-dev@incubator.apache.org
Delivered-To: mailing list open-jpa-commits@incubator.apache.org
Received: (qmail 99576 invoked by uid 99); 29 Aug 2006 09:54:33 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Aug 2006 02:54:33 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Aug 2006 02:54:32 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id E9BC41A981A; Tue, 29 Aug 2006 02:53:49 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r438035 - in /incubator/openjpa/trunk:
 openjpa-lib/pom.xml
 openjpa-persistence-jdbc/pom.xml pom.xml
Date: Tue, 29 Aug 2006 09:53:49 -0000
To: open-jpa-commits@incubator.apache.org
From: mprudhom@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060829095349.E9BC41A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: mprudhom
Date: Tue Aug 29 02:53:48 2006
New Revision: 438035

URL: http://svn.apache.org/viewvc?rev=438035&view=rev
Log:
Moved build number generation into openjpa-lib, since having it in the top-level pom causes the plugin to be executed multiple times in each module (bug reported at MNG-2221)

Modified:
    incubator/openjpa/trunk/openjpa-lib/pom.xml
    incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml
    incubator/openjpa/trunk/pom.xml

Modified: incubator/openjpa/trunk/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/pom.xml?rev=438035&r1=438034&r2=438035&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-lib/pom.xml Tue Aug 29 02:53:48 2006
@@ -67,6 +67,45 @@
                     <target>1.3</target>
                 </configuration>
             </plugin>
+            <!--
+                get the svn revision number and set it in the
+                subversion.revision setting - disabled for now
+                since we need to be able to build from sources
+                zip (when there is no .svn/ metadata)
+            -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>set subversion revision</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <property name="tmpdir"
+                                    value="${java.io.tmpdir}/openjpamvntmp"/>
+                                <condition property="outdir"
+                                    value="${project.build.outputDirectory}">
+                                    <available type="dir"
+                                    file="${project.build.outputDirectory}"/>
+                                </condition>
+
+                                <property name="outdir" value="${tmpdir}"/>
+
+                                <xmlproperty file="${basedir}/.svn/entries"
+                                    collapseAttributes="true"/>
+                                <property name="subversion.revision"
+                                    value="${wc-entries.entry.revision}"/>
+                                <mkdir dir="${outdir}/META-INF"/>
+                                <echo file="${outdir}/META-INF/revision.properties">revision.number=${subversion.revision}</echo>
+                                <delete dir="${tmpdir}"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=438035&r1=438034&r2=438035&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml Tue Aug 29 02:53:48 2006
@@ -62,22 +62,21 @@
                         <phase>test-compile</phase>
                         <configuration>
                             <tasks>
-								<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
-									<classpath>
-	                                    <path refid="maven.dependency.classpath"/>
-    	                                <path refid="maven.compile.classpath"/>
-        	                            <path refid="maven.test.classpath"/>
-									</classpath>
+                                <path id="cp">
+                                    <path refid="maven.test.classpath"/>
+                                    <path refid="maven.compile.classpath"/>
+                                    <path refid="maven.dependency.classpath"/>
+                                </path>
+								<taskdef name="openjpac" classname=
+                                    "org.apache.openjpa.ant.PCEnhancerTask">
+									<classpath refid="cp"/>
 								</taskdef>
-                                <fileset id="enhance.path.ref" dir="${project.build.testOutputDirectory}">
+                                <fileset id="enhance.path.ref"
+                                    dir="${project.build.testOutputDirectory}">
                                     <include name="**/*.class"/>
                                 </fileset>
 								<openjpac>
-									<classpath>
-                                        <path refid="maven.dependency.classpath"/>
-                                        <path refid="maven.compile.classpath"/>
-                                        <path refid="maven.test.classpath"/>
-									</classpath>
+									<classpath refid="cp"/>
 									<fileset refid="enhance.path.ref"/>
 								</openjpac>
                             </tasks>

Modified: incubator/openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/pom.xml?rev=438035&r1=438034&r2=438035&view=diff
==============================================================================
--- incubator/openjpa/trunk/pom.xml (original)
+++ incubator/openjpa/trunk/pom.xml Tue Aug 29 02:53:48 2006
@@ -154,45 +154,6 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-            <!--
-                get the svn revision number and set it in the
-                subversion.revision setting - disabled for now
-                since we need to be able to build from sources
-                zip (when there is no .svn/ metadata)
-            -->
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>set subversion revision</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <property name="tmpdir"
-                                    value="${java.io.tmpdir}/openjpamvntmp"/>
-                                <condition property="outdir"
-                                    value="${project.build.outputDirectory}">
-                                    <available type="dir"
-                                    file="${project.build.outputDirectory}"/>
-                                </condition>
-
-                                <property name="outdir" value="${tmpdir}"/>
-
-                                <xmlproperty file="${basedir}/.svn/entries"
-                                    collapseAttributes="true"/>
-                                <property name="subversion.revision"
-                                    value="${wc-entries.entry.revision}"/>
-                                <mkdir dir="${outdir}/META-INF"/>
-                                <echo file="${outdir}/META-INF/revision.properties">revision.number=${subversion.revision}</echo>
-                                <delete dir="${tmpdir}"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <reporting>