[plexus-compiler: 8/8] Merge branch 'update-to-version-2.x'

[Michal Srb]

commit 0225a9e6b0d3d813c26eec9bad5449fb00c40f04
Merge: 0425001 158693c
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Mar 7 10:02:07 2013 +0100

    Merge branch 'update-to-version-2.x'
    
    Conflicts:
    	plexus-compiler.spec

 .gitignore                                   |    1 +
 plexus-compiler-ignoreOptionalProblems.patch |   18 ------
 plexus-compiler.spec                         |   72 +++++++++++---------------
 sources                                      |    3 +-
 4 files changed, 34 insertions(+), 60 deletions(-)
---
diff --cc plexus-compiler.spec
index cf5af70,bdf9ffe..64c0516
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@@ -39,12 -38,11 +38,11 @@@ Summary:    Compiler call initiators fo
  # extras subpackage has a bit different licensing
  # parts of compiler-api are ASL2.0/MIT
  License:    MIT and ASL 2.0
 -Group:      Development/Java
 +Group:      Development/Libraries
  URL:        http://plexus.codehaus.org/
  
- Source0:    https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz
- 
- Patch0:     plexus-compiler-ignoreOptionalProblems.patch
+ Source0:    https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz
+ Source1:    http://www.apache.org/licenses/LICENSE-2.0.txt
  
  BuildArch:      noarch
  BuildRequires:  maven-local