You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2007/12/17 12:54:16 UTC
svn commit: r604846 - in /db/jdo/trunk: api2-legacy/maven.xml
api2-legacy/project.xml api2/maven.xml api2/project.xml
tck2-legacy/maven.xml tck2-legacy/project.xml tck2/maven.xml tck2/project.xml
Author: andyj
Date: Mon Dec 17 03:54:14 2007
New Revision: 604846
URL: http://svn.apache.org/viewvc?rev=604846&view=rev
Log:
JDO-560 Attempt to get rid of Maven1.1 whines about specifying defaultGoal in project.xml instead of maven.xml. Well it IS in project.xml and it still whines so just ignore.
Modified:
db/jdo/trunk/api2-legacy/maven.xml
db/jdo/trunk/api2-legacy/project.xml
db/jdo/trunk/api2/maven.xml
db/jdo/trunk/api2/project.xml
db/jdo/trunk/tck2-legacy/maven.xml
db/jdo/trunk/tck2-legacy/project.xml
db/jdo/trunk/tck2/maven.xml
db/jdo/trunk/tck2/project.xml
Modified: db/jdo/trunk/api2-legacy/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2-legacy/maven.xml?rev=604846&r1=604845&r2=604846&view=diff
==============================================================================
--- db/jdo/trunk/api2-legacy/maven.xml (original)
+++ db/jdo/trunk/api2-legacy/maven.xml Mon Dec 17 03:54:14 2007
@@ -16,22 +16,13 @@
limitations under the License.
-->
-<project default="default"
+<project
xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- >
-
- <!-- ==================== -->
- <!-- Default Global Goals -->
- <!-- ==================== -->
-
- <goal name="default">
- <attainGoal name="jar:install"/>
- </goal>
+ xmlns:ant="jelly:ant">
<goal name="build">
<attainGoal name="javadoc"/>
- <attainGoal name="default"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="rebuild">
Modified: db/jdo/trunk/api2-legacy/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2-legacy/project.xml?rev=604846&r1=604845&r2=604846&view=diff
==============================================================================
--- db/jdo/trunk/api2-legacy/project.xml (original)
+++ db/jdo/trunk/api2-legacy/project.xml Mon Dec 17 03:54:14 2007
@@ -79,6 +79,9 @@
</resource>
</resources>
</unitTest>
+
+ <defaultGoal>jar:install</defaultGoal>
+
<!-- J A R R E S O U R C E S -->
<!-- Resources that are packaged up inside the JAR file -->
<resources>
Modified: db/jdo/trunk/api2/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/maven.xml?rev=604846&r1=604845&r2=604846&view=diff
==============================================================================
--- db/jdo/trunk/api2/maven.xml (original)
+++ db/jdo/trunk/api2/maven.xml Mon Dec 17 03:54:14 2007
@@ -16,22 +16,13 @@
limitations under the License.
-->
-<project default="default"
+<project
xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- >
-
- <!-- ==================== -->
- <!-- Default Global Goals -->
- <!-- ==================== -->
-
- <goal name="default">
- <attainGoal name="jar:install"/>
- </goal>
+ xmlns:ant="jelly:ant">
<goal name="build">
<attainGoal name="javadoc"/>
- <attainGoal name="default"/>
+ <attainGoal name="jar:install"/>
</goal>
<goal name="rebuild">
Modified: db/jdo/trunk/api2/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/project.xml?rev=604846&r1=604845&r2=604846&view=diff
==============================================================================
--- db/jdo/trunk/api2/project.xml (original)
+++ db/jdo/trunk/api2/project.xml Mon Dec 17 03:54:14 2007
@@ -83,6 +83,8 @@
</resource>
</resources>
</unitTest>
+ <defaultGoal>jar:install</defaultGoal>
+
<!-- J A R R E S O U R C E S -->
<!-- Resources that are packaged up inside the JAR file -->
<resources>
Modified: db/jdo/trunk/tck2-legacy/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/maven.xml?rev=604846&r1=604845&r2=604846&view=diff
==============================================================================
--- db/jdo/trunk/tck2-legacy/maven.xml (original)
+++ db/jdo/trunk/tck2-legacy/maven.xml Mon Dec 17 03:54:14 2007
@@ -16,20 +16,11 @@
limitations under the License.
-->
-<project default="default"
+<project
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
- xmlns:u="jelly:util"
- >
-
- <!-- ==================== -->
- <!-- Default Global Goals -->
- <!-- ==================== -->
-
- <goal name="default">
- <attainGoal name="jar:install"/>
- </goal>
+ xmlns:u="jelly:util">
<goal name="help">
<echo>Custom goals for this project are:</echo>
@@ -87,7 +78,7 @@
</goal>
<goal name="build">
- <attainGoal name="default"/>
+ <attainGoal name="jar:install"/>
<attainGoal name="setProps"/>
<attainGoal name="privateInstallSchema"/>
<attainGoal name="privateRuntck.jdori"/>
Modified: db/jdo/trunk/tck2-legacy/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/project.xml?rev=604846&r1=604845&r2=604846&view=diff
==============================================================================
--- db/jdo/trunk/tck2-legacy/project.xml (original)
+++ db/jdo/trunk/tck2-legacy/project.xml Mon Dec 17 03:54:14 2007
@@ -159,6 +159,7 @@
<!-- =================== -->
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <defaultGoal>jar:install</defaultGoal>
<resources>
<resource>
<directory>${basedir}/..</directory>
Modified: db/jdo/trunk/tck2/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/maven.xml?rev=604846&r1=604845&r2=604846&view=diff
==============================================================================
--- db/jdo/trunk/tck2/maven.xml (original)
+++ db/jdo/trunk/tck2/maven.xml Mon Dec 17 03:54:14 2007
@@ -16,20 +16,11 @@
limitations under the License.
-->
-<project default="default"
+<project
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
- xmlns:u="jelly:util"
- >
-
- <!-- ==================== -->
- <!-- Default Global Goals -->
- <!-- ==================== -->
-
- <goal name="default">
- <attainGoal name="jar:install"/>
- </goal>
+ xmlns:u="jelly:util">
<!-- Note : keep this so that it is max 80 char width when run
so we allow for the worst case scenario of a basic VT -->
@@ -92,7 +83,7 @@
</goal>
<goal name="build">
- <attainGoal name="default"/>
+ <attainGoal name="jar:install"/>
<attainGoal name="setProps"/>
<attainGoal name="privateInstallSchema"/>
<attainGoal name="privateRuntck.jdori"/>
Modified: db/jdo/trunk/tck2/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.xml?rev=604846&r1=604845&r2=604846&view=diff
==============================================================================
--- db/jdo/trunk/tck2/project.xml (original)
+++ db/jdo/trunk/tck2/project.xml Mon Dec 17 03:54:14 2007
@@ -171,6 +171,7 @@
<!-- =================== -->
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <defaultGoal>jar:install</defaultGoal>
<resources>
<resource>
<directory>${basedir}/..</directory>