[maven] Add patch for MNG-5591
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Feb 24 13:13:02 UTC 2014
commit be67ebc33cfc0006261f2f673c59bec5bebc90c9
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Feb 24 14:13:16 2014 +0100
Add patch for MNG-5591
...et-role-hint-for-ReactorReader-to-default.patch | 28 ++++++++++++++++++++
maven.spec | 8 +++++-
2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-MNG-5591-Set-role-hint-for-ReactorReader-to-default.patch b/0001-MNG-5591-Set-role-hint-for-ReactorReader-to-default.patch
new file mode 100644
index 0000000..301af41
--- /dev/null
+++ b/0001-MNG-5591-Set-role-hint-for-ReactorReader-to-default.patch
@@ -0,0 +1,28 @@
+From a389420bc523cf178dedd8553c33397da448b9ff Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at 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
+ */
+- at Named
++ at Named( "default" )
+ @SessionScoped
+ class ReactorReader
+ implements WorkspaceReader
+--
+1.8.4.2
+
diff --git a/maven.spec b/maven.spec
index 1524147..7f251dd 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,6 +1,6 @@
Name: maven
Version: 3.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java project management and project comprehension tool
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
# Forwarded upstream (MNG-5534)
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
@@ -152,6 +154,7 @@ Group: Documentation
%patch101 -p1
%patch200 -p1
%patch201 -p1
+%patch202 -p1
# not really used during build, but a precaution
rm maven-ant-tasks-*.jar
@@ -274,6 +277,9 @@ ln -sf $(build-classpath plexus/classworlds) \
%changelog
+* Mon Feb 24 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.2.1-3
+- Add patch for MNG-5591
+
* Thu Feb 20 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.2.1-2
- Migrate to Wagon subpackages
More information about the scm-commits
mailing list