File project.diff of Package maven-plugin-tools

--- maven-plugin-plugin-bootstrap.spec.orig
+++ maven-plugin-plugin-bootstrap.spec
@@ -36,12 +36,12 @@ Patch20:        maven-plugin-plugin-boot
 BuildRequires:  ant
 BuildRequires:  atinject
 BuildRequires:  javapackages-local >= 6
-BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
 BuildRequires:  maven-plugin-tools-api
 BuildRequires:  maven-plugin-tools-generators
-BuildRequires:  maven-resolver-api
-BuildRequires:  maven-resolver-util
+BuildRequires:  maven-resolver1-api
+BuildRequires:  maven-resolver1-util
+BuildRequires:  maven3-lib
 BuildRequires:  objectweb-asm >= 9.9
 BuildRequires:  plexus-build-api0
 BuildRequires:  plexus-utils
@@ -68,21 +68,24 @@ artifact metadata and a generic help goa
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
 
+%pom_xpath_set pom:project/pom:properties/pom:maven3Version 3
+%pom_xpath_set pom:project/pom:properties/pom:resolverVersion 1
+
 %build
 mkdir -p lib
 build-jar-repository -s lib \
     atinject \
-    maven/maven-artifact \
-    maven/maven-core \
-    maven/maven-model \
-    maven/maven-plugin-api \
-    maven/maven-repository-metadata \
-    maven/maven-settings \
+    maven/maven-artifact-3 \
+    maven/maven-core-3 \
+    maven/maven-model-3 \
+    maven/maven-plugin-api-3 \
+    maven/maven-repository-metadata-3 \
+    maven/maven-settings-3 \
     maven-plugin-tools/maven-plugin-annotations \
     maven-plugin-tools/maven-plugin-tools-api \
     maven-plugin-tools/maven-plugin-tools-generators \
-    maven-resolver/maven-resolver-api \
-    maven-resolver/maven-resolver-util \
+    maven-resolver/maven-resolver-api-1 \
+    maven-resolver/maven-resolver-util-1 \
     objectweb-asm/asm \
     org.eclipse.sisu.inject \
     org.eclipse.sisu.plexus \
--- maven-plugin-plugin.spec.orig
+++ maven-plugin-plugin.spec
@@ -35,15 +35,15 @@ BuildRequires:  mvn(org.apache.maven.plu
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-api)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-tools-generators)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-api)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-util)
-BuildRequires:  mvn(org.apache.maven:maven-artifact)
-BuildRequires:  mvn(org.apache.maven:maven-core)
-BuildRequires:  mvn(org.apache.maven:maven-model)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-api:1)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-util:1)
+BuildRequires:  mvn(org.apache.maven:maven-artifact:3)
+BuildRequires:  mvn(org.apache.maven:maven-core:3)
+BuildRequires:  mvn(org.apache.maven:maven-model:3)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
-BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven:maven-repository-metadata)
-BuildRequires:  mvn(org.apache.maven:maven-settings)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api:3)
+BuildRequires:  mvn(org.apache.maven:maven-repository-metadata:3)
+BuildRequires:  mvn(org.apache.maven:maven-settings:3)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-velocity)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
@@ -81,6 +81,9 @@ API documentation for %{name}.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
 
+%pom_xpath_set pom:project/pom:properties/pom:maven3Version 3
+%pom_xpath_set pom:project/pom:properties/pom:resolverVersion 1
+
 %build
 pushd %{name}
 %{mvn_file} :%{name} %{base_name}/%{name}
--- maven-plugin-report-plugin.spec.orig
+++ maven-plugin-report-plugin.spec
@@ -37,13 +37,13 @@ BuildRequires:  mvn(org.apache.maven.plu
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
-BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-api)
-BuildRequires:  mvn(org.apache.maven:maven-artifact)
-BuildRequires:  mvn(org.apache.maven:maven-core)
-BuildRequires:  mvn(org.apache.maven:maven-model)
-BuildRequires:  mvn(org.apache.maven:maven-model-builder)
+BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-api:1)
+BuildRequires:  mvn(org.apache.maven:maven-artifact:3)
+BuildRequires:  mvn(org.apache.maven:maven-core:3)
+BuildRequires:  mvn(org.apache.maven:maven-model-builder:3)
+BuildRequires:  mvn(org.apache.maven:maven-model:3)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
-BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api:3)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-i18n)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-xml)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
--- maven-plugin-tools.spec.orig
+++ maven-plugin-tools.spec
@@ -35,10 +35,10 @@ BuildRequires:  httpcomponents-core
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  jsoup
-BuildRequires:  maven-lib
 BuildRequires:  maven-reporting-api
-BuildRequires:  maven-resolver-api
+BuildRequires:  maven-resolver1-api
 BuildRequires:  maven-wagon-provider-api
+BuildRequires:  maven3-lib
 BuildRequires:  objectweb-asm >= 9.9
 BuildRequires:  plexus-archiver
 BuildRequires:  plexus-classworlds
@@ -156,6 +156,9 @@ API documentation for %{name}.
 
 %pom_remove_dep net.sf.jtidy:jtidy maven-plugin-tools-generators
 
+%pom_xpath_set pom:project/pom:properties/pom:maven3Version 3
+%pom_xpath_set pom:project/pom:properties/pom:resolverVersion 1
+
 %{mvn_package} :maven-plugin-tools __noinstall
 %{mvn_package} :maven-script __noinstall
 %{mvn_package} :{*} @1
@@ -168,14 +171,14 @@ build-jar-repository -s lib \
     httpcomponents/httpcore \
     jsoup/jsoup \
     maven/maven-api-plugin \
-    maven/maven-artifact \
-    maven/maven-compat \
-    maven/maven-core \
-    maven/maven-model \
-    maven/maven-plugin-api \
-    maven/maven-settings \
+    maven/maven-artifact-3 \
+    maven/maven-compat-3 \
+    maven/maven-core-3 \
+    maven/maven-model-3 \
+    maven/maven-plugin-api-3 \
+    maven/maven-settings-3 \
     maven-reporting-api/maven-reporting-api \
-    maven-resolver/maven-resolver-api \
+    maven-resolver/maven-resolver-api-1 \
     maven-wagon/provider-api \
     objectweb-asm/asm \
     objectweb-asm/asm-commons \