Use guava20

plexus-containers.spec

@@ -1,6 +1,6 @@
 Name:           plexus-containers
 Version:        1.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Containers for Plexus
 License:        ASL 2.0 and MIT
 URL:            https://github.com/codehaus-plexus/plexus-containers
@@ -11,7 +11,7 @@ Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver
 Patch0:         0001-Port-to-current-qdox.patch
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(com.google.collections:google-collections)
+BuildRequires:  mvn(com.google.guava:guava:20.0)
 BuildRequires:  mvn(commons-cli:commons-cli)
 BuildRequires:  mvn(com.sun:tools)
 BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
@@ -30,7 +30,9 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.jdom:jdom2)
+BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.ow2.asm:asm-all)
+BuildRequires:  mvn(org.ow2.asm:asm-commons)
 
 
 %description
@@ -91,6 +93,8 @@ Obsoletes:      %{name}-container-default-javadoc < %{version}-%{release}
 # For Maven 3 compat
 %pom_add_dep org.apache.maven:maven-core plexus-component-metadata
 
+%pom_change_dep -r :google-collections com.google.guava:guava:20.0
+
 # ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM
 %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
@@ -146,6 +150,9 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Feb 05 2018 Michael Simacek <msimacek@redhat.com> - 1.7.1-4
+- Use guava20
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild