Merge branch 'update-to-version-2.x'

Conflicts:
	plexus-compiler.spec

.gitignore

@@ -2,3 +2,4 @@ plexus-compiler-1.5.2.tar.gz
 /sonatype-plexus-components-plexus-compiler-1.8-0-g7ca7d76.tar.gz
 sonatype-plexus-compiler-plexus-compiler-1.8.3-0-gef6142f.tar.gz
 /sonatype-plexus-compiler-plexus-compiler-1.9.1-0-g233d1ab.tar.gz
+/plexus-compiler-2.1.tar.gz

plexus-compiler-ignoreOptionalProblems.patch

@@ -1,18 +0,0 @@
-diff --git a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
-index 49d890d..b6952b9 100644
---- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
-+++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
-@@ -404,6 +404,13 @@ public class EclipseJavaCompiler
- 
-             return result;
-         }
-+
-+        // added in recent JDT versions
-+        public boolean ignoreOptionalProblems() 
-+        {
-+            return false;
-+        }
-+
-     }
- 
-     private class EclipseCompilerINameEnvironment

plexus-compiler.spec

@@ -29,11 +29,10 @@
 #
 
 %global parent  plexus
-%global dirhash 56a0f9b
 
 Name:       plexus-compiler
-Version:    1.9.2
+Version:    2.2
-Release:    6%{?dist}
+Release:    1%{?dist}
 Epoch:      0
 Summary:    Compiler call initiators for Plexus
 # extras subpackage has a bit different licensing
@@ -42,15 +41,15 @@ License:    MIT and ASL 2.0
 Group:      Development/Libraries
 URL:        http://plexus.codehaus.org/
 
-Source0:    https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz
+Source0:    https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz
-
+Source1:    http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0:     plexus-compiler-ignoreOptionalProblems.patch
 
 BuildArch:      noarch
 BuildRequires:  maven-local
 BuildRequires:  jpackage-utils
 BuildRequires:  junit
 BuildRequires:  classworlds
+BuildRequires:  plexus-compiler-extras
 BuildRequires:  eclipse-ecj
 BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
@@ -66,16 +65,20 @@ additional compilers see %{name}-extras package.
 
 %package extras
 Summary:        Extra compiler support for %{name}
-Group:          Development/Libraries
 # ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/
 #          ...codehaus/plexus/compiler/csharp/CSharpCompiler.java
 # ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java
 License:        MIT and ASL 2.0 and ASL 1.1
-Requires:       %{name} = %{version}-%{release}
 
 %description extras
 Additional support for csharp, eclipse and jikes compilers
 
+%package pom
+Summary:        Maven POM files for %{name}
+
+%description pom
+This package provides %{summary}.
+
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
@@ -84,8 +87,9 @@ Group:          Documentation
 API documentation for %{name}.
 
 %prep
-%setup -q -n sonatype-plexus-compiler-%{dirhash}
+%setup -q -n %{name}-%{name}-%{version}
-%patch0 -p1
+
+cp %{SOURCE1} LICENSE
 
 %pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
 
@@ -93,50 +97,36 @@ API documentation for %{name}.
 %pom_disable_module plexus-compiler-test
 
 %build
-# plexus-compiler-jikes
+%mvn_package ":plexus-compiler{,s}" pom
-%mvn_package "org.codehaus.plexus:plexus-compiler-jikes" plexus-compiler-extras
+%mvn_package ":*{csharp,eclipse,jikes}*" extras
-%mvn_file "org.codehaus.plexus:plexus-compiler-jikes" plexus/compiler-jikes
+# Tests are skipped because of unavailable plexus-compiler-test artifact
-
-# plexus-compiler-eclipse
-%mvn_package "org.codehaus.plexus:plexus-compiler-eclipse" plexus-compiler-extras
-%mvn_file "org.codehaus.plexus:plexus-compiler-eclipse" plexus/compiler-eclipse
-
-# plexus-compiler-csharp
-%mvn_package "org.codehaus.plexus:plexus-compiler-csharp" plexus-compiler-extras
-%mvn_file "org.codehaus.plexus:plexus-compiler-csharp" plexus/compiler-csharp
-
-# plexus-compiler-api
-%mvn_file "org.codehaus.plexus:plexus-compiler-api" plexus/compiler-api
-
-# plexus-compiler-manager
-%mvn_file "org.codehaus.plexus:plexus-compiler-manager" plexus/compiler-manager
-
-# plexus-compiler-javac
-%mvn_file "org.codehaus.plexus:plexus-compiler-javac" plexus/compiler-javac
-
-
 %mvn_build -f
 
 %install
 %mvn_install
 
 %files -f .mfiles
-
+%doc LICENSE
-%files extras -f .mfiles-plexus-compiler-extras
+%files extras -f .mfiles-extras
+%files pom -f .mfiles-pom
 
 %files javadoc -f .mfiles-javadoc
+%doc LICENSE
 
 %changelog
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.9.2-6
+* Tue Mar 05 2013 Michal Srb <msrb@redhat.com> - 0:2.2-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+- Update to upstream version 2.2
+- Add license file (Resolves: #903268)
 
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 0:1.9.2-5
+* Tue Mar 05 2013 Michal Srb <msrb@redhat.com> - 0:2.1-3
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Remove auxiliary aliases
-- Replace maven BuildRequires with maven-local
 
-* Thu Jan 24 2013 Michal Srb <msrb@redhat.com> - 0:1.9.2-4
+* Tue Mar 05 2013 Michal Srb <msrb@redhat.com> - 0:2.1-2
+- Build with original POM files
+
+* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1-1
+- Update to upstream version 2.1
 - Build with xmvn
-- Fixed rpmlint warning
 
 * Wed Dec 5 2012 Michal Srb <msrb@redhat.com> - 0:1.9.2-3
 - Replaced dependency to plexus-container-default with plexus-containers-container-default

sources

@@ -1 +1,2 @@
-623e888e90e834c2e57d943732bc2453  plexus-compiler-1.9.2.tar.gz
+49503026ac81afbf8a3ce7c75abc91bf  plexus-compiler-2.2.tar.gz
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt