openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mprud...@apache.org
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 GMT
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>



Mime
View raw message