From 6f58763edbaa17dea24b4220b4076396f7683bc6 Mon Sep 17 00:00:00 2001
From: Markku Korkeala <markku.korkeala@haidion.com>
Date: Sat, 4 Dec 2021 15:33:55 +0200
Subject: [PATCH] Update to 3.22.0, comment out removed modules, add junit
 dependency.

---
 .gitignore      |  1 +
 javaparser.spec | 12 ++++++++----
 sources         |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 862fd40..2ba1a38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /javaparser-parent-3.3.5.tar.gz
 /javaparser-parent-3.5.20.tar.gz
 /javaparser-parent-3.14.16.tar.gz
+/javaparser-parent-3.22.0.tar.gz
diff --git a/javaparser.spec b/javaparser.spec
index be31198..89950eb 100644
--- a/javaparser.spec
+++ b/javaparser.spec
@@ -1,6 +1,6 @@
 Name:          javaparser
-Version:       3.14.16
-Release:       3%{?dist}
+Version:       3.22.0
+Release:       1%{?dist}
 Summary:       Java 1 to 13 Parser and Abstract Syntax Tree for Java
 License:       LGPLv3+ or ASL 2.0
 URL:           http://javaparser.org
@@ -12,6 +12,7 @@ BuildRequires:  mvn(net.java.dev.javacc:javacc)
 BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(javax.annotation:javax.annotation-api)
+BuildRequires:  mvn(junit:junit)
 
 BuildArch:     noarch
 
@@ -63,8 +64,8 @@ sed -i \
 
 # 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-logic
+#%pom_disable_module javaparser-symbol-solver-model
 %pom_disable_module javaparser-symbol-solver-testing
 
 # Only need to ship the core module
@@ -86,6 +87,9 @@ sed -i \
 %license LICENSE LICENSE.APACHE LICENSE.GPL LICENSE.LGPL
 
 %changelog
+* Sat Dec 04 2021 Markku Korkeala <markku.korkeala@iki.fi> - 3.22.0-1
+- Update to 3.22.0, comment out removed modules, add junit dependency.
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index e40605e..b6d71f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (javaparser-parent-3.14.16.tar.gz) = 56a36f3bc5f7ea66c67b673fa13814dd498226e51261f702c53ad31aa0f107f8b5dd0d676729ed48616f8af63bd63ce5ff208e8f8d8b38ab239cef8aaad4cc99
+SHA512 (javaparser-parent-3.22.0.tar.gz) = 5fabbc64e1d4d58af1d578561a50dc9b3a1f34852dfe5804efd95a8a5fd9281c925cb648b7ea33de1db3eb2f3d2506ef5788a2672da3060b040c8a60bc9d4a23