rpms/maven-plugin-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch for MPLUGIN-242

Browse Source 
- Resolves: rhbz#920042
This commit is contained in:
Mikolaj Izdebski 2013-03-11 12:44:28 +01:00
parent b395ebbfef
commit e3eed4cfbc
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
maven-plugin-tools-rhbz-920042.patch Normal file
View File

@ -0,0 +1,33 @@
From 0681545ce57c55b8c35af8189a0f2bfe27256fd7 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 11 Mar 2013 12:40:04 +0100
Subject: [PATCH] Fix MPLUGIN-242
This fixes upstream bug MPLUGIN-242:
NullPointerException in MojoClassVisitor.visit()
See: http://jira.codehaus.org/browse/MPLUGIN-242
---
.../plugin/annotations/scanner/visitors/MojoClassVisitor.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
index be0e70b..c381cf9 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
@@ -105,8 +105,11 @@ public class MojoClassVisitor
public void visit( int version, int access, String name, String signature, String superName, String[] interfaces )
{
mojoAnnotatedClass = new MojoAnnotatedClass();
- mojoAnnotatedClass.setClassName( Type.getObjectType( name ).getClassName() ).setParentClassName(
- Type.getObjectType( superName ).getClassName() );
+ mojoAnnotatedClass.setClassName( Type.getObjectType( name ).getClassName() );
+ if ( superName != null)
+ {
+ mojoAnnotatedClass.setParentClassName( Type.getObjectType( superName ).getClassName() );
+ }
logger.debug( "MojoClassVisitor#visit" );
}
--
1.8.1.2

12
maven-plugin-tools.spec
View File

@ -1,6 +1,6 @@
Name: maven-plugin-tools
Version: 3.1
Release: 9%{?dist}
Release: 10%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
@ -10,6 +10,10 @@ URL: http://maven.apache.org/plugin-tools/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
BuildArch: noarch
# Fix NullPointerException in MojoClassVisitor.visit()
# See: rhbz#920042, http://jira.codehaus.org/browse/MPLUGIN-242
Patch0: %{name}-rhbz-920042.patch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: maven-local
@ -301,6 +305,8 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
# For easier installation
ln -s maven-script/maven-script-{ant,beanshell} .
@ -423,6 +429,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%changelog
* Mon Mar 11 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:3.1-10
- Add patch for MPLUGIN-242
- Resolves: rhbz#920042
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:3.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild