diff --git a/0001-Port-to-current-qdox.patch b/0001-Port-to-current-qdox.patch
deleted file mode 100644
index 703762a..0000000
--- a/0001-Port-to-current-qdox.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 81ed06024dd78113d2e6c5090e59cacc43453a54 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Fri, 20 Jan 2017 17:27:51 +0100
-Subject: [PATCH] Port to current qdox
-
----
- .../java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java | 2 +-
- pom.xml                                                                 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java
-index 0a798fe..41efa44 100644
---- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java
-+++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java
-@@ -244,7 +244,7 @@ public class QDoxComponentGleaner
-         // Remove any Plexus specific interfaces from the calculation
-         // ----------------------------------------------------------------------
- 
--        List<JavaClass> interfaces = new ArrayList<JavaClass>(  javaClass.getImplementedInterfaces() );
-+        List<JavaClass> interfaces = new ArrayList<JavaClass>(  javaClass.getInterfaces() );
- 
-         for ( Iterator<JavaClass> it = interfaces.iterator(); it.hasNext(); )
-         {
-diff --git a/pom.xml b/pom.xml
-index eaba94d..f80f0d2 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -85,7 +85,7 @@
-       <dependency>
-         <groupId>com.thoughtworks.qdox</groupId>
-         <artifactId>qdox</artifactId>
--        <version>2.0-M2</version>
-+        <version>2.0-M5</version>
-       </dependency>
-       <dependency>
-         <groupId>org.jdom</groupId>
--- 
-2.9.3
-
diff --git a/plexus-component-metadata.changes b/plexus-component-metadata.changes
index 1d9d84b..36a55e5 100644
--- a/plexus-component-metadata.changes
+++ b/plexus-component-metadata.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Nov 24 14:53:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.1.0
+- Removed patch:
+  * 0001-Port-to-current-qdox.patch
+    + integrated upstream
+- Added patch:
+  * plexus-containers-asm6.patch
+    + allow building against asm6
+- Specify maven.compiler.release to fix build with jdk9+ and newer
+  maven-javadoc-plugin
+
 -------------------------------------------------------------------
 Thu Apr 11 19:58:47 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec
index b39c1e9..5a35760 100644
--- a/plexus-component-metadata.spec
+++ b/plexus-component-metadata.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package plexus
+# spec file for package plexus-component-metadata
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %global comp_name plexus-component-metadata
 %bcond_with tests
 Name:           %{comp_name}
-Version:        1.7.1
+Version:        2.1.0
 Release:        0
 Summary:        Component metadata from %{base_name}
 # Most of the files are either under ASL 2.0 or MIT
@@ -33,24 +33,21 @@ URL:            https://github.com/codehaus-plexus/plexus-containers
 Source0:        https://github.com/codehaus-plexus/%{base_name}/archive/%{base_name}-%{version}.tar.gz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 Source2:        LICENSE.MIT
-Patch0:         0001-Port-to-current-qdox.patch
+Patch0:         plexus-containers-asm6.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
-BuildRequires:  mvn(commons-cli:commons-cli)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven:maven-project)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-cli)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.jdom:jdom2)
-BuildRequires:  mvn(org.ow2.asm:asm-all)
+BuildRequires:  mvn(org.ow2.asm:asm)
 #!BuildRequires: maven-compiler-plugin-bootstrap
 #!BuildRequires: maven-jar-plugin-bootstrap
 #!BuildRequires: maven-javadoc-plugin-bootstrap
@@ -95,9 +92,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
 %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
 %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
 
-%pom_remove_dep com.sun:tools plexus-component-javadoc
-%pom_add_dep com.sun:tools plexus-component-javadoc
-
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
@@ -120,17 +114,18 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
 # to prevent ant from failing
 mkdir -p plexus-component-annotations/src/test/java
 
-# integration tests fix
-sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|" plexus-component-javadoc/src/it/basic/pom.xml
-
 %build
 pushd %{comp_name}
 %{mvn_file} :%{comp_name} %{base_name}/%{comp_name}
-%if %{with tests}
-  %{mvn_build}
-%else
-  %{mvn_build} -f
+%{mvn_build} \
+%if %{without tests}
+	-f \
 %endif
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+	-- -Dmaven.compiler.release=6
+%endif
+
+# empty line, keep
 popd
 
 %install
diff --git a/plexus-containers-1.7.1.tar.gz b/plexus-containers-1.7.1.tar.gz
deleted file mode 100644
index d9b05c7..0000000
--- a/plexus-containers-1.7.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ec0608d1c144450eb299b0cd964c3b5fbb8b36143bf18c8019481187c1788577
-size 349903
diff --git a/plexus-containers-2.1.0.tar.gz b/plexus-containers-2.1.0.tar.gz
new file mode 100644
index 0000000..c1db9c3
--- /dev/null
+++ b/plexus-containers-2.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b077bff72fd7b7705e3410557f38f7b7671babaefab28a0e70ccb7b1e3eac6c
+size 347570
diff --git a/plexus-containers-asm6.patch b/plexus-containers-asm6.patch
new file mode 100644
index 0000000..576c8c6
--- /dev/null
+++ b/plexus-containers-asm6.patch
@@ -0,0 +1,48 @@
+diff -urEbwB plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
+--- plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java	2019-10-23 12:28:46.000000000 +0200
++++ plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java	2019-11-22 03:26:41.546581926 +0100
+@@ -35,7 +35,7 @@
+   private final AnnClass annClass;
+ 
+   private AnnReader(AnnClass annClass) {
+-    super(Opcodes.ASM7);
++    super(Opcodes.ASM6);
+     this.annClass = annClass;
+   }
+ 
+@@ -64,7 +64,7 @@
+   public FieldVisitor visitField(int access, final String name, final String desc, String signature, Object value) {
+     final AnnField field = new AnnField(annClass, access, name, desc);
+     annClass.addField(field);
+-    return new FieldVisitor(Opcodes.ASM7) {
++    return new FieldVisitor(Opcodes.ASM6) {
+ 
+       public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+         Ann ann = new Ann(desc);
+@@ -79,7 +79,7 @@
+     final AnnMethod method = new AnnMethod(annClass, access, mname, mdesc);
+     annClass.addMethod(method);
+     
+-    return new MethodVisitor(Opcodes.ASM7) {
++    return new MethodVisitor(Opcodes.ASM6) {
+ 
+       public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+         Ann ann = new Ann(desc);
+@@ -99,7 +99,7 @@
+     private Ann ann;
+ 
+     public AnnAnnReader(Ann ann) {
+-      super(Opcodes.ASM7);
++      super(Opcodes.ASM6);
+       this.ann = ann;
+     }
+ 
+@@ -132,7 +132,7 @@
+     private ArrayList<String> array = new ArrayList<String>();
+ 
+     public AnnAnnArrayReader(Ann ann, String name) {
+-      super(Opcodes.ASM7);
++      super(Opcodes.ASM6);
+       this.ann = ann;
+       this.name = name;
+     }
diff --git a/plexus-containers-build.tar.xz b/plexus-containers-build.tar.xz
index a7da0e5..122c699 100644
--- a/plexus-containers-build.tar.xz
+++ b/plexus-containers-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6498e024e6f2b30aedf22b10a4006023d4a8ac27d6eb26a010ae0357d3eb444
-size 4964
+oid sha256:9a06444eb2bd8543e75e5828db22a6a693a0fa14e5548c724421cc0e33d7cdee
+size 4968
diff --git a/plexus-containers.changes b/plexus-containers.changes
index 42a2b38..4cf32e7 100644
--- a/plexus-containers.changes
+++ b/plexus-containers.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Nov 24 14:46:44 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.1.0
+  * Does not build plexus-component-javadoc any more
+- Removed patch:
+  * 0001-Port-to-current-qdox.patch
+    + integrated upstream
+- Do not force building with java < 9 any more
+
 -------------------------------------------------------------------
 Tue Apr  9 17:10:35 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-containers.spec b/plexus-containers.spec
index dcc06b6..d33a244 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-containers
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %bcond_with tests
 Name:           plexus-containers
-Version:        1.7.1
+Version:        2.1.0
 Release:        0
 Summary:        Containers for Plexus
 # Most of the files are either under ASL 2.0 or MIT
@@ -32,16 +32,14 @@ Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 Source2:        LICENSE.MIT
 Source100:      %{name}-build.tar.xz
-Patch0:         0001-Port-to-current-qdox.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  guava20
+BuildRequires:  guava
 BuildRequires:  javapackages-local
 BuildRequires:  junit
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-utils
 BuildRequires:  xbean
-BuildConflicts: java-devel >= 9
 BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  ant-junit
@@ -55,14 +53,6 @@ application server. There are many reusable components for hibernate,
 form processing, jndi, i18n, velocity, etc. Plexus also includes an
 application server which is like a J2EE application server.
 
-%package component-javadoc
-Summary:        Javadoc component from %{name}
-Group:          Development/Libraries/Java
-Requires:       mvn(com.sun:tools)
-
-%description component-javadoc
-%{summary}.
-
 %package component-annotations
 Summary:        Component API from %{name}
 Group:          Development/Libraries/Java
@@ -73,7 +63,7 @@ Group:          Development/Libraries/Java
 %package container-default
 Summary:        Default Container from %{name}
 Group:          Development/Libraries/Java
-Requires:       mvn(com.google.guava:guava:20.0)
+Requires:       mvn(com.google.guava:guava)
 Requires:       mvn(org.apache.xbean:xbean-reflect)
 Requires:       mvn(org.codehaus.plexus:plexus-classworlds)
 Requires:       mvn(org.codehaus.plexus:plexus-utils)
@@ -94,13 +84,11 @@ Group:          Documentation/HTML
 %setup -q -n %{name}-%{name}-%{version} -a100
 
 mkdir -p lib
-build-jar-repository -s lib plexus/classworlds plexus/utils guava20/guava-20.0 junit xbean/xbean-reflect
+build-jar-repository -s lib plexus/classworlds plexus/utils guava/guava junit xbean/xbean-reflect
 %if %{with tests}
 build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest/core
 %endif
 
-%patch0 -p1
-
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 
@@ -117,9 +105,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
 %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
 %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
 
-%pom_remove_dep com.sun:tools plexus-component-javadoc
-%pom_add_dep com.sun:tools plexus-component-javadoc
-
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
@@ -142,11 +127,8 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
 # to prevent ant from failing
 mkdir -p plexus-component-annotations/src/test/java
 
-# integration tests fix
-sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|" plexus-component-javadoc/src/it/basic/pom.xml
-
 %build
-for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do
+for i in plexus-component-annotations plexus-container-default; do
   pushd ${i}
   	%pom_remove_parent .
 	%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId><version>%{version}</version>" .
@@ -161,7 +143,7 @@ done
 %install
 # jars
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
-for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do
+for i in plexus-component-annotations plexus-container-default; do
   install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
 done
 install -dm 0755 %{buildroot}%{_javadir}/plexus
@@ -170,16 +152,15 @@ ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexu
 
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do
+for i in plexus-component-annotations plexus-container-default; do
   install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
 done
 %add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations
-%add_maven_depmap %{name}/plexus-component-javadoc.pom %{name}/plexus-component-javadoc.jar -f component-javadoc
 %add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api
 
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
-for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do
+for i in plexus-component-annotations plexus-container-default; do
   cp -pr ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
 done
 %fdupes -s %{buildroot}%{_javadocdir}
@@ -191,9 +172,6 @@ done
 %files container-default -f .mfiles-container-default
 %license LICENSE-2.0.txt LICENSE.MIT
 
-%files component-javadoc -f .mfiles-component-javadoc
-%license LICENSE-2.0.txt LICENSE.MIT
-
 %files javadoc
 %license LICENSE-2.0.txt LICENSE.MIT
 %{_javadocdir}/%{name}
diff --git a/plexus-metadata-generator-cli.patch b/plexus-metadata-generator-cli.patch
new file mode 100644
index 0000000..e471bcd
--- /dev/null
+++ b/plexus-metadata-generator-cli.patch
@@ -0,0 +1,66 @@
+diff -urEbwBN plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java
+--- plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java	1970-01-01 01:00:00.000000000 +0100
++++ plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java	2019-11-22 04:47:34.934070355 +0100
+@@ -0,0 +1,62 @@
++package org.codehaus.plexus.metadata;
++
++import java.io.File;
++import java.util.Arrays;
++import java.util.Collections;
++
++import org.apache.commons.cli.CommandLine;
++import org.apache.commons.cli.OptionBuilder;
++import org.apache.commons.cli.Options;
++import org.codehaus.plexus.PlexusContainer;
++import org.codehaus.plexus.tools.cli.AbstractCli;
++
++public class PlexusMetadataGeneratorCli
++    extends AbstractCli
++{
++    public static final char SOURCE_DIRECTORY = 's';
++    public static final char SOURCE_ENCODING = 'e';
++    public static final char CLASSES_DIRECTORY = 'c';
++    public static final char OUTPUT_FILE = 'o';
++    public static final char DESCRIPTORS_DIRECTORY = 'm';
++
++    public static void main( String[] args )
++        throws Exception
++    {
++        new PlexusMetadataGeneratorCli().execute( args );
++    }
++
++    @Override
++    public String getPomPropertiesPath()
++    {
++        return "META-INF/maven/org.codehaus.plexus/plexus-metadata-generator/pom.properties";
++    }
++
++    @Override
++    @SuppressWarnings("static-access")
++    public Options buildCliOptions( Options options )
++    {
++        options.addOption( OptionBuilder.withLongOpt( "source" ).hasArg().withDescription( "Source directory." ).create( SOURCE_DIRECTORY ) );
++        options.addOption( OptionBuilder.withLongOpt( "encoding" ).hasArg().withDescription( "Source file encoding." ).create( SOURCE_ENCODING ) );
++        options.addOption( OptionBuilder.withLongOpt( "classes" ).hasArg().withDescription( "Classes directory." ).create( CLASSES_DIRECTORY ) );
++        options.addOption( OptionBuilder.withLongOpt( "output" ).hasArg().withDescription( "Output directory." ).create( OUTPUT_FILE ) );
++        options.addOption( OptionBuilder.withLongOpt( "descriptors" ).hasArg().withDescription( "Descriptors directory." ).create( DESCRIPTORS_DIRECTORY ) );
++        return options;
++    }    
++
++    public void invokePlexusComponent( CommandLine cli, PlexusContainer plexus )
++        throws Exception
++    {
++        MetadataGenerator metadataGenerator = plexus.lookup( MetadataGenerator.class );
++        
++        MetadataGenerationRequest request = new MetadataGenerationRequest();        
++        request.classesDirectory = new File( cli.getOptionValue( CLASSES_DIRECTORY ) );
++        request.classpath = Collections.emptyList();
++        request.sourceDirectories = Arrays.asList( new String[]{ new File( cli.getOptionValue( SOURCE_DIRECTORY ) ).getAbsolutePath() } );
++        request.sourceEncoding = cli.getOptionValue( SOURCE_ENCODING );
++        request.useContextClassLoader = true;
++        request.outputFile = new File( cli.getOptionValue( OUTPUT_FILE ) );
++        request.componentDescriptorDirectory = new File( cli.getOptionValue( DESCRIPTORS_DIRECTORY ) );
++        
++        metadataGenerator.generateDescriptor( request );
++    }
++}
diff --git a/plexus-metadata-generator.changes b/plexus-metadata-generator.changes
index e623bcd..73026e8 100644
--- a/plexus-metadata-generator.changes
+++ b/plexus-metadata-generator.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Nov 24 14:50:30 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.1.0
+- Removed patch:
+  * 0001-Port-to-current-qdox.patch
+    + integrated upstream
+- Added patches:
+  * plexus-containers-asm6.patch
+    + allow building against asm6
+  * plexus-metadata-generator-cli.patch
+    + bring back the PlexusMetadataGeneratorCli.java removed by
+      upstream, but which we use heavily
+
 -------------------------------------------------------------------
 Tue Apr  9 17:17:04 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec
index eade9b9..4533a0e 100644
--- a/plexus-metadata-generator.spec
+++ b/plexus-metadata-generator.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-metadata-generator
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %global comp_name component-metadata
 %bcond_with tests
 Name:           plexus-metadata-generator
-Version:        1.7.1
+Version:        2.1.0
 Release:        0
 Summary:        Component metadata from %{base_name}
 # Most of the files are either under ASL 2.0 or MIT
@@ -34,7 +34,8 @@ Source0:        https://github.com/codehaus-plexus/%{base_name}/archive/%{base_n
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 Source2:        LICENSE.MIT
 Source100:      %{base_name}-build.tar.xz
-Patch0:         0001-Port-to-current-qdox.patch
+Patch0:         plexus-containers-asm6.patch
+Patch1:         plexus-metadata-generator-cli.patch
 Patch1000:      %{name}-nomojo.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-cli
@@ -50,9 +51,8 @@ BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
 BuildRequires:  qdox >= 2
 BuildRequires:  xbean
-BuildConflicts: java-devel >= 9
 Requires:       apache-commons-cli
-Requires:       guava20
+Requires:       guava
 Requires:       jdom2
 Requires:       objectweb-asm
 Requires:       plexus-cli
@@ -90,6 +90,7 @@ build-jar-repository -s lib hamcrest/core
 %endif
 
 %patch0 -p1
+%patch1 -p1
 
 %patch1000 -p1
 
@@ -109,9 +110,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
 %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
 %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
 
-%pom_remove_dep com.sun:tools plexus-component-javadoc
-%pom_add_dep com.sun:tools plexus-component-javadoc
-
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
@@ -134,17 +132,12 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
 # to prevent ant from failing
 mkdir -p plexus-component-annotations/src/test/java
 
-# integration tests fix
-sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|" plexus-component-javadoc/src/it/basic/pom.xml
-
 rm -rf plexus-%{comp_name}/src/main/java/org/codehaus/plexus/maven
 rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven
 
 %pom_remove_dep :maven-core plexus-%{comp_name}
 %pom_remove_dep :maven-model plexus-%{comp_name}
 %pom_remove_dep :maven-plugin-api plexus-%{comp_name}
-%pom_remove_dep :maven-project plexus-%{comp_name}
-%pom_remove_dep :maven-plugin-annotations plexus-%{comp_name}
 
 %pom_remove_parent plexus-%{comp_name}
 %pom_xpath_inject "pom:project" "
@@ -176,7 +169,7 @@ install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 # script
-%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava20/guava-20.0:xbean/xbean-reflect %{name}
+%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
 
 %files -f .mfiles
 %license LICENSE-2.0.txt LICENSE.MIT