Update requires to reflect XMvn 2.0 package split

javapackages-tools.spec

@@ -41,7 +41,12 @@ This package provides macros and scripts to support Java packaging.
 Summary:        Macros and scripts for Maven packaging support
 Requires:       %{name} = %{version}-%{release}
 Requires:       maven
-Requires:       xmvn >= 1.0.0-0.1
+Requires:       xmvn >= 2
+Requires:       xmvn-install >= 2
+Requires:       xmvn-subst >= 2
+Requires:       xmvn-resolve >= 2
+Requires:       xmvn-mojo >= 2
+Requires:       xmvn-connector-aether >= 2
 # We want to use OpenJDK 8 for building packages as it is default
 # implementation used in Fedora.  Due to YUM bugs and limitations,
 # sometimes Java 7 may be installed alone.  To workaround this
@@ -87,13 +92,10 @@ This package provides macros and scripts to support packaging Maven artifacts.
 Summary:        Local mode for Apache Ivy
 Requires:       %{name} = %{version}-%{release}
 Requires:       apache-ivy >= 2.3.0-8
-Requires:       guava
-Requires:       maven
-Requires:       plexus-classworlds
-Requires:       plexus-containers-container-default
-Requires:       plexus-utils
-Requires:       xbean
-Requires:       xmvn >= 1.5
+Requires:       xmvn-connector-ivy >= 2
+Requires:       xmvn-subst >= 2
+Requires:       xmvn-install >= 2
+Requires:       xmvn-resolve >= 2
 
 %description -n ivy-local
 This package implements local mode fow Apache Ivy, which allows