[java-sig-commits] [maven: 4/4] Merge branch 'master' into f20
commit 5fa15811e9ed76604b5c36b597863a7c3529e499
Merge: 911334b 5f933c9
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Nov 5 17:43:42 2013 +0100
Merge branch 'master' into f20
Conflicts:
maven.spec
.gitignore | 1 +
0001-Migrate-from-easymock-1-to-easymock-3.patch | 22 ++++++++--------
0001-Update-Aether-to-0.9.0.M3.patch | 24 ++++++++--------
0005-Use-generics-in-modello-generated-code.patch | 22 ++++++++--------
maven.spec | 29 ++++++++++++++------
sources | 2 +-
6 files changed, 56 insertions(+), 44 deletions(-)
---
diff --cc maven.spec
index 64e4b8a,533fa4f..832e08a
--- a/maven.spec
+++ b/maven.spec
@@@ -1,6 -1,6 +1,6 @@@
Name: maven
- Version: 3.1.0
- Release: 11%{?dist}
+ Version: 3.1.1
-Release: 5%{?dist}
++Release: 12%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@@ -267,16 -264,25 +264,30 @@@ ln -sf $(build-classpath plexus/classwo
%changelog
- * Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-11
++* Tue Nov 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-6
++- Update F20 to upstream bugfix release 3.1.1
++
+ * Tue Nov 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-5
- Add OrderWithRequires: xmvn
- Related: rhbz#1014355
+ * Tue Oct 29 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-4
+ - Add explicit requires
+
+ * Wed Oct 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-3
+ - Rebuild to regenerate broken POM files
+ - Related: rhbz#1021484
+
-* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-2
+* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-10
- Add dependencies of wagon-http-shaded to plexus.core
- Remove objectweb-asm from plexus.core
+- Add explicit requires
+- Resolves: rhbz#1023872
+ * Mon Oct 7 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-1
+ - Update to upstream version 3.1.1
+ - Remove patch for MNG-5503 (included upstream)
+
* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-9
- Synchronize JAR list in lib/ with upstream release
- Remove test dependencies on aopalliance and cglib