diff --git a/.gitignore b/.gitignore
index 2a9ff3e..0875356 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /jboss-logging-tools-1.1.0.Final.tar.xz
 /1.2.0.Beta1.tar.gz
 /2.0.1.Final.tar.gz
+/jboss-logging-tools-2.2.0.Final.tar.gz
diff --git a/jboss-logging-tools.spec b/jboss-logging-tools.spec
index bb169ff..8071ef3 100644
--- a/jboss-logging-tools.spec
+++ b/jboss-logging-tools.spec
@@ -2,25 +2,24 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jboss-logging-tools
-Version:          2.0.1
-Release:          8%{?dist}
+Version:          2.2.0
+Release:          1%{?dist}
 Summary:          JBoss Logging I18n Annotation Processor
 # Not available license file https://issues.jboss.org/browse/LOGTOOL-107
 # ./annotations/src/main/java/org/jboss/logging/annotations/*.java: Apache (v2.0)
 License:          ASL 2.0 and LGPLv2+
 URL:              https://github.com/jboss-logging/jboss-logging-tools
-Source0:          https://github.com/jboss-logging/jboss-logging-tools/archive/%{namedversion}.tar.gz
+Source0:          %{url}/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
+Source1:          http://www.apache.org/licenses/LICENSE-2.0.txt
 
 BuildArch:        noarch
 
 BuildRequires:    maven-local
-BuildRequires:    mvn(org.apache.maven.surefire:surefire-testng)
+BuildRequires:    mvn(junit:junit)
 BuildRequires:    mvn(org.jboss:jboss-parent:pom:)
 BuildRequires:    mvn(org.jboss.jdeparser:jdeparser)
 BuildRequires:    mvn(org.jboss.logging:jboss-logging)
 BuildRequires:    mvn(org.jboss.logmanager:jboss-logmanager)
-BuildRequires:    mvn(org.testng:testng)
-
 
 %description
 This pacakge contains JBoss Logging I18n Annotation Processor
@@ -32,21 +31,38 @@ Summary:          Javadoc for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n jboss-logging-tools-%{namedversion}
+%setup -q -n %{name}-%{namedversion}
 
-%pom_disable_module processor-tests
+cp %{SOURCE1} .
+
+# roaster is not packaged for Fedora, so:
+# - Remove the dependency
+# - Remove the test that requires it
+%pom_remove_dep -r org.jboss.forge.roaster:
+rm processor/src/test/java/org/jboss/logging/processor/generated/GeneratedSourceAnalysisTest.java
+
+# Skip docs module
+%pom_disable_module docs
 
 %build
-# @ random java.lang.ArrayIndexOutOfBoundsException: 0
-%mvn_build -- -Dmaven.test.failure.ignore=true
+%mvn_build
 
 %install
 %mvn_install
 
 %files -f .mfiles
+%license LICENSE-2.0.txt
+%doc README.adoc
+
 %files javadoc -f .mfiles-javadoc
+%license LICENSE-2.0.txt
+%doc README.adoc
 
 %changelog
+* Tue Oct 08 2019 Dogtag PKI Team <pki-devel@redhat.com> - 2.2.0-1
+- Rebuilt as part of revival process
+- BZ#1758293
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 2225bce..1b0b955 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78c08be7cf70504eb7459d8c5f082d01  2.0.1.Final.tar.gz
+SHA512 (jboss-logging-tools-2.2.0.Final.tar.gz) = db1cd2284ada19bbd0be98793eb45780b46ce5a6f6875b8aa1d1f90a2442f2fae7b4b90f62c590a7cf9e4bbd67faddf338c23fe46715bf87c1c9bf6e8d74b5d6