[java-sig-commits] [plexus-compiler] Update to upstream version 2.3

[Michal Srb]

commit 2186f00031f575c96294f6d851f54e369ada361b
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Sep 13 09:52:57 2013 +0200

    Update to upstream version 2.3

 .gitignore           |    1 +
 plexus-compiler.spec |   20 ++++++++++++++++----
 sources              |    2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd58cd8..c5a992c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ plexus-compiler-1.5.2.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-2.3.tar.gz
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index c11f6f4..cd59d9f 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -31,8 +31,8 @@
 %global parent  plexus
 
 Name:       plexus-compiler
-Version:    2.2
-Release:    5%{?dist}
+Version:    2.3
+Release:    1%{?dist}
 Epoch:      0
 Summary:    Compiler call initiators for Plexus
 # extras subpackage has a bit different licensing
@@ -92,14 +92,23 @@ API documentation for %{name}.
 cp %{SOURCE1} LICENSE
 cp %{SOURCE2} LICENSE.MIT
 
-%pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
+%pom_disable_module plexus-compiler-aspectj plexus-compilers
+# missing com.google.errorprone:error_prone_core
+%pom_disable_module plexus-compiler-javac-errorprone plexus-compilers
 
 # don't build/install compiler-test module, it needs maven2 test harness
 %pom_disable_module plexus-compiler-test
 
-%build
+# don't install sources jars
+%mvn_package ":*::sources:" __noinstall
+
 %mvn_package ":plexus-compiler{,s}" pom
 %mvn_package ":*{csharp,eclipse,jikes}*" extras
+
+# don't generate requires on test dependency (see #1007498)
+pom_xpath_remove "pom:dependency[pom:artifactId[text()='plexus-compiler-test']]" plexus-compilers
+
+%build
 # Tests are skipped because of unavailable plexus-compiler-test artifact
 %mvn_build -f
 
@@ -115,6 +124,9 @@ cp %{SOURCE2} LICENSE.MIT
 %doc LICENSE LICENSE.MIT
 
 %changelog
+* Fri Sep 13 2013 Michal Srb <msrb at redhat.com> - 0:2.3-1
+- Update to upstream version 2.3
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 197d737..cf9f0b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-49503026ac81afbf8a3ce7c75abc91bf  plexus-compiler-2.2.tar.gz
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
+77e87e5c0ff677fa908c36ec80ba5331  plexus-compiler-2.3.tar.gz