From 9b6716c552ea68d975d67d53886d7f70f84c71a5 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Wed, 4 Mar 2009 12:38:00 +0000
Subject: [PATCH] o Restored backward-compat with maven-assembly-plugin

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749982 13f79535-47bb-0310-9956-ffa450edef68
---
 .../maven/artifact/resolver/ArtifactResolutionResult.java     | 2 +-
 .../org/apache/maven/artifact/resolver/ArtifactResolver.java  | 4 ++++
 .../java/org/apache/maven/toolchain/ToolchainManager.java     | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
index 012d39199c..b7be1aae46 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
@@ -106,7 +106,7 @@ public class ArtifactResolutionResult
 
     public List<Artifact> getMissingArtifacts()
     {
-        return missingArtifacts == null ? Collections.EMPTY_LIST : missingArtifacts;
+        return missingArtifacts == null ? Collections.<Artifact> emptyList() : missingArtifacts;
     }
 
     public ArtifactResolutionResult addMissingArtifact( Artifact artifact )
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
index bb79682e99..e2bb17815b 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
@@ -33,6 +33,10 @@ import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 public interface ArtifactResolver
 {
 
+    // USED BY MAVEN ASSEMBLY PLUGIN 2.2-beta-2 
+    @Deprecated
+    String ROLE = ArtifactResolver.class.getName();
+
     void setOnline( boolean online );
 
     boolean isOnline();
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
index fe8117624f..4aef19d3d3 100644
--- a/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
+++ b/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
@@ -30,6 +30,7 @@ public interface ToolchainManager
 {
 
     // NOTE: Some plugins like Surefire access this field directly!
+    @Deprecated
     String ROLE = ToolchainManager.class.getName();
 
     /**