From 87a37f82e8187a2e3a22820d29515c40766f6640 Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 22 Apr 2003 11:48:50 +0000
Subject: [PATCH] Use jar:jar instead of java:jar. java:jar is deprecated.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113368 13f79535-47bb-0310-9956-ffa450edef68
---
 ashkelon/maven.xml                  | 2 +-
 dist/plugin.jelly                   | 2 +-
 dist/xdocs/goals.xml                | 2 +-
 jnlp/plugin.jelly                   | 2 +-
 linkcheck/maven.xml                 | 2 +-
 native/samples/helloworld/maven.xml | 2 +-
 plugin/plugin.jelly                 | 2 +-
 uberjar/plugin.jelly                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ashkelon/maven.xml b/ashkelon/maven.xml
index 189d2b00..4bb90c97 100644
--- a/ashkelon/maven.xml
+++ b/ashkelon/maven.xml
@@ -1,4 +1,4 @@
-<project default="java:jar"
+<project default="jar:jar"
   xmlns:j="jelly:core"
   xmlns:u="jelly:util"
   xmlns:ant="jelly:ant"
diff --git a/dist/plugin.jelly b/dist/plugin.jelly
index 78f79d37..4f3eec12 100644
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -26,7 +26,7 @@
 
   <goal
     name="dist:prepare-bin-filesystem"
-    prereqs="xdoc:init, java:jar, javadoc:generate"
+    prereqs="xdoc:init, jar:jar, javadoc:generate"
     description="Builds the binary distribution file system.">
     
     <!--
diff --git a/dist/xdocs/goals.xml b/dist/xdocs/goals.xml
index a23b7b1c..9ac95241 100644
--- a/dist/xdocs/goals.xml
+++ b/dist/xdocs/goals.xml
@@ -80,7 +80,7 @@
         <description>
           This goal sets up the file system in preparation of the
           binary distribution. It's prerequisites are the
-          <code>java:jar</code> and <code>javadoc:generate</code> goals.
+          <code>jar:jar</code> and <code>javadoc:generate</code> goals.
         </description>
       </goal>
     </goals>
diff --git a/jnlp/plugin.jelly b/jnlp/plugin.jelly
index 25bfe6b6..a33ef72d 100644
--- a/jnlp/plugin.jelly
+++ b/jnlp/plugin.jelly
@@ -24,7 +24,7 @@
 
     <goal name="jnlp:generate-jnlp"
              description="Generate the .jnlp file and sign all jars"
-             prereqs="java:jar">
+             prereqs="jar:jar">
 
         <ant:mkdir dir="${maven.jnlp.dir}"/>
         <ant:echo>Creating ${maven.jnlp.dir}/${pom.artifactId}.jnlp ...</ant:echo>
diff --git a/linkcheck/maven.xml b/linkcheck/maven.xml
index 02a7408f..39f174ec 100644
--- a/linkcheck/maven.xml
+++ b/linkcheck/maven.xml
@@ -1,4 +1,4 @@
-<project default="java:jar"
+<project default="jar:jar"
   xmlns:j="jelly:core"
   xmlns:u="jelly:util"
   xmlns:ant="jelly:ant"
diff --git a/native/samples/helloworld/maven.xml b/native/samples/helloworld/maven.xml
index fa85a369..3e9bc673 100644
--- a/native/samples/helloworld/maven.xml
+++ b/native/samples/helloworld/maven.xml
@@ -1,4 +1,4 @@
-<project default="java:jar"
+<project default="jar:jar"
   xmlns:j="jelly:core"
   xmlns:u="jelly:util"
   xmlns:ant="jelly:ant"
diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index 29d8e99d..5d4a29a5 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -11,7 +11,7 @@
         copied the maven.xml to tweak the resources
         Now it is up to the plugin to define the resources.
       -->  
-    <attainGoal name="java:jar"/>
+    <attainGoal name="jar:jar"/>
 
     <copy file="${maven.build.dir}/${maven.final.name}.jar"
       todir="${maven.repo.local}/maven/jars" />
diff --git a/uberjar/plugin.jelly b/uberjar/plugin.jelly
index b0258d39..b1acc6a1 100644
--- a/uberjar/plugin.jelly
+++ b/uberjar/plugin.jelly
@@ -30,7 +30,7 @@
   <!--==================================================================-->    
   <goal 
     name="uberjar:uberjar"
-    prereqs="java:jar, uberjar:init"
+    prereqs="jar:jar, uberjar:init"
     description="Build an uberjar">
 
     <j:set var="uberconf" value="${maven.uberjar.classworlds.conf}"/>