diff --git a/.gitignore b/.gitignore
index 064764d..878444b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /javaparser-1.0.11.tar.gz
 /javaparser-parent-2.5.1.tar.gz
 /javaparser-parent-3.3.5.tar.gz
+/javaparser-parent-3.5.20.tar.gz
diff --git a/javaparser.spec b/javaparser.spec
index 273ce21..52e7a34 100644
--- a/javaparser.spec
+++ b/javaparser.spec
@@ -1,7 +1,7 @@
 Name:          javaparser
-Version:       3.3.5
-Release:       6%{?dist}
-Summary:       Java 1 to 9 Parser and Abstract Syntax Tree for Java
+Version:       3.5.20
+Release:       1%{?dist}
+Summary:       Java 1 to 10 Parser and Abstract Syntax Tree for Java
 License:       LGPLv3+ or ASL 2.0
 URL:           http://javaparser.org
 Source0:       https://github.com/javaparser/javaparser/archive/%{name}-parent-%{version}.tar.gz
@@ -16,7 +16,7 @@ BuildRequires:  mvn(javax.annotation:javax.annotation-api)
 BuildArch:     noarch
 
 %description
-This package contains a Java 1 to 9 Parser with AST generation and
+This package contains a Java 1 to 10 Parser with AST generation and
 visitor support. The AST records the source code structure, javadoc
 and comments. It is also possible to change the AST nodes or create new
 ones to modify the source code.
@@ -33,11 +33,11 @@ This package contains API documentation for %{name}.
 sed -i 's/\r//' readme.md
 
 # Remove plugins unnecessary for RPM builds
-%pom_remove_plugin :animal-sniffer-maven-plugin javaparser-core
-%pom_remove_plugin :maven-enforcer-plugin javaparser-core
+%pom_remove_plugin -r :animal-sniffer-maven-plugin
+%pom_remove_plugin -r :maven-enforcer-plugin
+%pom_remove_plugin -r :jacoco-maven-plugin
 %pom_remove_plugin :maven-source-plugin
 %pom_remove_plugin :coveralls-maven-plugin
-%pom_remove_plugin :jacoco-maven-plugin . javaparser-testing
 
 # Compatibility alias
 %mvn_alias :javaparser-core com.google.code.javaparser:javaparser
@@ -48,19 +48,32 @@ sed -i \
   -e 's/com.helger.maven/org.codehaus.mojo/' \
   javaparser-core/pom.xml
 
-# Missing plugin
+# This plugin is not in Fedora, so use maven-resources-plugin to accomplish the same thing
 %pom_remove_plugin :templating-maven-plugin javaparser-core
+%pom_xpath_inject "pom:build" "
+<resources>
+  <resource>
+    <directory>src/main/java-templates</directory>
+    <filtering>true</filtering>
+    <targetPath>\${basedir}/src/main/java</targetPath>
+  </resource>
+</resources>" javaparser-core
 
 # JDK11 fix, add javax.annotation dependency
 %pom_add_dep javax.annotation:javax.annotation-api javaparser-core
 
 # Missing dep on jbehave for testing
-%pom_disable_module javaparser-testing
+%pom_disable_module javaparser-core-testing
+
+# Don't build the symbol solver
+%pom_disable_module javaparser-symbol-solver-core
+%pom_disable_module javaparser-symbol-solver-logic
+%pom_disable_module javaparser-symbol-solver-model
+%pom_disable_module javaparser-symbol-solver-testing
 
 # Only need to ship the core module
 %mvn_package ":javaparser-core-generators" __noinstall
 %mvn_package ":javaparser-metamodel-generator" __noinstall
-%mvn_package ":javaparser-testing" __noinstall
 
 %build
 %mvn_build
@@ -76,6 +89,9 @@ sed -i \
 %license LICENSE LICENSE.APACHE LICENSE.GPL LICENSE.LGPL
 
 %changelog
+* Tue Jul 28 2020 Mat Booth <mat.booth@redhat.com> - 3.5.20-1
+- Update to 3.5.x to get Java 10 support
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index aaeab27..7b6bdf4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (javaparser-parent-3.3.5.tar.gz) = 555002b992d7d7eeebb47057aa5f4285c7c4b10d5c723feaaaed97da7bd5314e9abb6adbd3ef54d92529ed80a0221e86e56e82e33d59bf5e866db7e3c3e0210a
+SHA512 (javaparser-parent-3.5.20.tar.gz) = d131e6c6e9843b731e68f7674fb54cd8c9601d02e412fd2dc57c9aa2c325f5d10f1c3874f6d782a812b28790771c7714053288d632406d851ca7e7c48148105f