diff --git a/.gitignore b/.gitignore
index 6722616..84ad8ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /google-guice-3.2.6.tar.xz
 /google-guice-4.0.tar.xz
 /google-guice-4.1.tar.xz
+/google-guice-4.2.2.tar.xz
diff --git a/google-guice.spec b/google-guice.spec
index 1aba54b..2135ac9 100644
--- a/google-guice.spec
+++ b/google-guice.spec
@@ -2,8 +2,8 @@
 %global short_name guice
 
 Name:           google-%{short_name}
-Version:        4.1
-Release:        11%{?dist}
+Version:        4.2.2
+Release:        1%{?dist}
 Summary:        Lightweight dependency injection framework for Java 5 and above
 License:        ASL 2.0
 URL:            https://github.com/google/%{short_name}
@@ -16,12 +16,13 @@ Source1:        create-tarball.sh
 BuildRequires:  maven-local
 BuildRequires:  mvn(aopalliance:aopalliance)
 BuildRequires:  mvn(cglib:cglib)
-BuildRequires:  mvn(com.google.guava:guava:19.0)
+BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(javax.servlet:servlet-api)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.sonatype.plugins:munge-maven-plugin)
@@ -29,8 +30,6 @@ BuildRequires:  mvn(org.sonatype.plugins:munge-maven-plugin)
 BuildRequires:  mvn(org.apache:apache-jar-resource-bundle)
 
 
-# Test dependencies:
-
 %description
 Put simply, Guice alleviates the need for factories and the use of new
 in your Java code. Think of Guice's @Inject as the new new. You will
@@ -108,13 +107,6 @@ Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Servlet module for Guice.
 
 
-%package -n %{short_name}-testlib
-Summary:        TestLib extension module for Guice
-
-%description -n %{short_name}-testlib
-Guice is a lightweight dependency injection framework for Java 5
-and above. This package provides TestLib module for Guice.
-
 %package -n %{short_name}-throwingproviders
 Summary:        ThrowingProviders extension module for Guice
 
@@ -135,7 +127,6 @@ Summary:        API documentation for Guice
 %description javadoc
 This package provides %{summary}.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -175,6 +166,12 @@ This package provides %{summary}.
 
 %pom_disable_module jdk8-tests
 
+# Require a newer compiler
+%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" "1.8"
+%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" "1.8"
+
+%pom_disable_module testlib extensions
+
 %build
 %mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:"
 
@@ -202,7 +199,6 @@ This package provides %{summary}.
 %files -n %{short_name}-jndi -f .mfiles-guice-jndi
 %files -n %{short_name}-multibindings -f .mfiles-guice-multibindings
 %files -n %{short_name}-servlet -f .mfiles-guice-servlet
-%files -n %{short_name}-testlib -f .mfiles-guice-testlib
 %files -n %{short_name}-throwingproviders -f .mfiles-guice-throwingproviders
 
 %files -n %{short_name}-bom -f .mfiles-guice-bom
@@ -212,6 +208,10 @@ This package provides %{summary}.
 
 
 %changelog
+* Fri Apr 05 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.2-1
+- Update to upstream version 4.2.2
+- Fixes: RHBZ #1563661
+
 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1-11
 - Remove legacy Provides
 
diff --git a/sources b/sources
index 1f42259..40113dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (google-guice-4.1.tar.xz) = 9a0250c5c821a6fce71db55502265ff2e93aef63901767c1b23bcc3a7370befc0c12dba07731d3c18c412acef9b74644ab85b13f623acb68f40c29fcb9fe5a69
+SHA512 (google-guice-4.2.2.tar.xz) = 2ab60fe0ff277f0f2be5613b453ffe014bdb0ad08f88beb8698d7d93bd9d6d915e0f5eeaf5b3d3617439c48e44a4b850f1e48d9e82c070618fead00ccb482cb4