diff --git a/jaxb.spec b/jaxb.spec
index 26a507b..5fa43a1 100644
--- a/jaxb.spec
+++ b/jaxb.spec
@@ -2,7 +2,7 @@
 
 Name:           jaxb
 Version:        2.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        JAXB Reference Implementation
 # EDL-1.0 license is BSD-3-clause
 License:        BSD
@@ -184,56 +184,6 @@ pushd jaxb-ri
 %pom_remove_plugin :maven-enforcer-plugin external xsom . codemodel
 %pom_remove_plugin :buildnumber-maven-plugin docs/www external xsom . codemodel
 
-%pom_xpath_remove 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:configuration/pom:release' external xsom
-
-%pom_xpath_set 'pom:execution[pom:id = "base-compile"]/pom:configuration/pom:release' 8 external xsom
-
-%pom_xpath_inject 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:executions' '
-  <execution>
-    <id>module-compile</id>
-    <goals>
-      <goal>compile</goal>
-    </goals>
-    <configuration>
-      <source>9</source>
-      <target>9</target>
-      <includes>
-        <include>module-info.java</include>
-      </includes>
-    </configuration>
-  </execution>' external xsom bundles/runtime
-
-%pom_xpath_set 'pom:execution[pom:id = "base-compile"]/pom:id' default-compile external xsom
-
-%pom_xpath_replace 'pom:execution[pom:id = "default-compile"]/pom:id' '
-  <id>module-compile</id>
-  <goals>
-    <goal>compile</goal>
-  </goals>' txw/compiler codemodel/codemodel-annotation-compiler xjc bundles/xjc
-
-%pom_xpath_inject 'pom:execution[pom:id = "module-compile"]/pom:configuration' '
-  <source>9</source>
-  <target>9</target>
-  <includes>
-    <include>module-info.java</include>
-  </includes>' txw/compiler codemodel/codemodel-annotation-compiler xjc bundles/xjc
-
-%pom_xpath_inject 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:executions' '
-  <execution>
-    <id>default-compile</id>
-    <goals>
-      <goal>compile</goal>
-    </goals>
-    <configuration>
-      <source>8</source>
-      <target>8</target>
-      <release>8</release>
-      <excludes>
-        <exclude>module-info.java</exclude>
-      </excludes>
-    </configuration>
-  </execution>' txw/compiler codemodel/codemodel-annotation-compiler xjc bundles/xjc
-
 # Fix dep on xml resolver
 %pom_change_dep com.sun.org.apache.xml.internal:resolver xml-resolver:xml-resolver:1.2 xjc bundles/xjc
 sed -i -e 's/com\.sun\.org\.apache\.xml\.internal\.resolver/org.apache.xml.resolver/' xjc/src/main/java/com/sun/tools/xjc/CatalogUtil.java
@@ -397,6 +347,9 @@ popd
 %files relaxng-datatype -f jaxb-ri/.mfiles-relaxng-datatype
 
 %changelog
+* Wed Nov 17 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 2.3.5-2
+- Remove workaround for SUREFIRE-1897
+
 * Tue Oct 26 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 2.3.5-1
 - Update to version 2.3.5
 - Remove jp_minimal