Add patch for MNG-5591

This commit is contained in:
Mikolaj Izdebski 2014-02-24 14:13:16 +01:00
parent 54bf0a1db2
commit be67ebc33c
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From a389420bc523cf178dedd8553c33397da448b9ff Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 24 Feb 2014 13:59:31 +0100
Subject: [PATCH] [MNG-5591] Set role hint for ReactorReader to "default"
Sisu uses implicit role hint "default" only for components which class
names are prefixed with "Default". Since ReactorReader is not, hole
hint "default" needs to be explicitly added as argument to @Named.
---
maven-core/src/main/java/org/apache/maven/ReactorReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
index 9aa8385..405d40b 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -46,7 +46,7 @@
*
* @author Jason van Zyl
*/
-@Named
+@Named( "default" )
@SessionScoped
class ReactorReader
implements WorkspaceReader
--
1.8.4.2

View File

@ -1,6 +1,6 @@
Name: maven Name: maven
Version: 3.2.1 Version: 3.2.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
Group: Development/Tools Group: Development/Tools
@ -21,6 +21,8 @@ Patch101: 0001-Migrate-from-easymock-1-to-easymock-3.patch
Patch200: 0001-Update-Aether-to-0.9.0.M3.patch Patch200: 0001-Update-Aether-to-0.9.0.M3.patch
# Forwarded upstream (MNG-5534) # Forwarded upstream (MNG-5534)
Patch201: 0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch Patch201: 0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch
# Forwarded upstream (MNG-5591)
Patch202: 0001-MNG-5591-Set-role-hint-for-ReactorReader-to-default.patch
BuildArch: noarch BuildArch: noarch
@ -152,6 +154,7 @@ Group: Documentation
%patch101 -p1 %patch101 -p1
%patch200 -p1 %patch200 -p1
%patch201 -p1 %patch201 -p1
%patch202 -p1
# not really used during build, but a precaution # not really used during build, but a precaution
rm maven-ant-tasks-*.jar rm maven-ant-tasks-*.jar
@ -274,6 +277,9 @@ ln -sf $(build-classpath plexus/classworlds) \
%changelog %changelog
* Mon Feb 24 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-3
- Add patch for MNG-5591
* Thu Feb 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-2 * Thu Feb 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-2
- Migrate to Wagon subpackages - Migrate to Wagon subpackages