diff --git a/maven-plugin-tools-build.tar.xz b/maven-plugin-tools-build.tar.xz
index 4c28d76..86d2c2f 100644
--- a/maven-plugin-tools-build.tar.xz
+++ b/maven-plugin-tools-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1454e8da1b64e7cdba4f30cae9534f35e4213c6ca448abef8bb7d8fae918325f
-size 4868
+oid sha256:22fb3a1f61dcbdc267625510f31f59f69c37c1f18508d6a6c25e8dba995ebf4e
+size 4724
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index b7da664..fec3bce 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -27,17 +27,13 @@ Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{n
 Source1:        %{name}-build.tar.xz
 Patch0:         0002-Remove-dependency-on-jtidy.patch
 BuildRequires:  ant
-BuildRequires:  apache-commons-cli
 BuildRequires:  atinject
 BuildRequires:  bsh2
 BuildRequires:  fdupes
-BuildRequires:  google-guice
-BuildRequires:  guava
 BuildRequires:  httpcomponents-client
 BuildRequires:  httpcomponents-core
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
-BuildRequires:  jdom2
 BuildRequires:  jsoup
 BuildRequires:  maven-lib
 BuildRequires:  maven-reporting-api
@@ -45,15 +41,12 @@ BuildRequires:  maven-resolver-api
 BuildRequires:  maven-wagon-provider-api
 BuildRequires:  modello >= 2.0.0
 BuildRequires:  objectweb-asm
-BuildRequires:  objectweb-asm
 BuildRequires:  plexus-ant-factory
 BuildRequires:  plexus-archiver
 BuildRequires:  plexus-bsh-factory
 BuildRequires:  plexus-classworlds
-BuildRequires:  plexus-cli
 BuildRequires:  plexus-containers-component-annotations
 BuildRequires:  plexus-languages
-BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
 BuildRequires:  qdox
@@ -62,7 +55,6 @@ BuildRequires:  sisu-plexus
 BuildRequires:  slf4j
 BuildRequires:  unzip
 BuildRequires:  velocity
-BuildRequires:  xbean
 BuildArch:      noarch
 
 %description
@@ -171,59 +163,51 @@ API documentation for %{name}.
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-	ant \
-	atinject \
-	bsh2/bsh \
-	commons-cli \
-	guava/guava \
-	guice/google-guice-no_aop \
+    ant \
+    atinject \
+    bsh2/bsh \
     httpcomponents/httpclient \
     httpcomponents/httpcore \
-	jdom2/jdom2 \
     jsoup/jsoup \
-	maven/maven-artifact \
-	maven/maven-compat \
-	maven/maven-core \
-	maven/maven-model \
-	maven/maven-plugin-api \
-	maven/maven-settings \
-	maven-reporting-api/maven-reporting-api \
+    maven/maven-artifact \
+    maven/maven-core \
+    maven/maven-model \
+    maven/maven-plugin-api \
+    maven/maven-settings \
+    maven-reporting-api/maven-reporting-api \
     maven-resolver/maven-resolver-api \
     maven-wagon/provider-api \
-	objectweb-asm/asm \
-	objectweb-asm/asm-commons \
+    objectweb-asm/asm \
+    objectweb-asm/asm-commons \
     objectweb-asm/asm-util \
-	org.eclipse.sisu.inject \
-	org.eclipse.sisu.plexus \
-	plexus/ant-factory \
-	plexus/archiver \
-	plexus/bsh-factory \
-	plexus-classworlds \
-	plexus/cli \
-	plexus-containers/plexus-component-annotations \
+    org.eclipse.sisu.inject \
+    org.eclipse.sisu.plexus \
+    plexus/ant-factory \
+    plexus/archiver \
+    plexus/bsh-factory \
+    plexus-classworlds \
+    plexus-containers/plexus-component-annotations \
     plexus-languages/plexus-java \
-	plexus-metadata-generator \
-	plexus/utils \
-	plexus-velocity/plexus-velocity \
-	qdox \
+    plexus/utils \
+    plexus-velocity/plexus-velocity \
+    qdox \
     slf4j/api \
-	velocity \
-	xbean/xbean-reflect
+    velocity
 
 %{ant} \
-	-Dtest.skip=true \
-	package javadoc
+    -Dtest.skip=true \
+    package javadoc
 
 %install
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 for i in \
-	maven-plugin-annotations \
-	maven-plugin-tools-annotations \
-	maven-plugin-tools-api \
-	maven-plugin-tools-generators \
-	maven-plugin-tools-java; do
+    maven-plugin-annotations \
+    maven-plugin-tools-annotations \
+    maven-plugin-tools-api \
+    maven-plugin-tools-generators \
+    maven-plugin-tools-java; do
   install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
   %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
   %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
@@ -232,11 +216,11 @@ for i in \
   fi
 done
 for i in \
-	maven-plugin-tools-ant \
-	maven-plugin-tools-beanshell \
-	maven-plugin-tools-model \
-	maven-script-ant \
-	maven-script-beanshell; do
+    maven-plugin-tools-ant \
+    maven-plugin-tools-beanshell \
+    maven-plugin-tools-model \
+    maven-script-ant \
+    maven-script-beanshell; do
   install -pm 0644 maven-script/${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
   %{mvn_install_pom} maven-script/${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
   %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}