diff --git a/00-port-to-commons-lang3.patch b/00-port-to-commons-lang3.patch
new file mode 100644
index 0000000..83a2252
--- /dev/null
+++ b/00-port-to-commons-lang3.patch
@@ -0,0 +1,28 @@
+diff --git a/hawtjni-generator/pom.xml b/hawtjni-generator/pom.xml
+index 89ad35a..8722ccc 100644
+--- a/hawtjni-generator/pom.xml
++++ b/hawtjni-generator/pom.xml
+@@ -35,6 +35,10 @@
+ hawtjni-runtime
+ ${project.version}
+
++
++ org.apache.commons
++ commons-lang3
++
+
+ xbean-finder
+ org.apache.xbean
+diff --git a/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/ReflectField.java b/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/ReflectField.java
+index fc4bb4b..b0e53bb 100755
+--- a/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/ReflectField.java
++++ b/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/ReflectField.java
+@@ -14,7 +14,7 @@ import java.lang.reflect.Field;
+ import java.util.Arrays;
+ import java.util.HashSet;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.fusesource.hawtjni.runtime.FieldFlag;
+ import org.fusesource.hawtjni.runtime.JniField;
+ import org.fusesource.hawtjni.runtime.T32;
diff --git a/hawtjni.spec b/hawtjni.spec
index fa23dbb..9bc7a31 100644
--- a/hawtjni.spec
+++ b/hawtjni.spec
@@ -1,6 +1,6 @@
Name: hawtjni
Version: 1.17
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Code generator that produces the JNI code
# Maven plugin is under ASL 2.0.
# stdint.h, shipped in JAR as resource, used only with M$ VC++, is under BSD.
@@ -10,14 +10,18 @@ License: ASL 2.0 and EPL-1.0 and BSD
URL: http://hawtjni.fusesource.org/
Source0: https://github.com/fusesource/hawtjni/archive/%{name}-project-%{version}.tar.gz
+# trivially port from commons-lang to commons-lang3
+Patch0: 00-port-to-commons-lang3.patch
+
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(commons-cli:commons-cli)
-BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(org.apache.commons:commons-lang3)
BuildRequires: mvn(org.apache.maven:maven-archiver)
BuildRequires: mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-artifact-manager)
+BuildRequires: mvn(org.apache.maven:maven-compat)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-project)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
@@ -63,9 +67,7 @@ This package allows to use HawtJNI from a maven plugin.
%prep
%setup -q -n %{name}-%{name}-project-%{version}
-
-# this dependency seems to be missing
-%pom_add_dep commons-lang:commons-lang hawtjni-generator
+%patch0 -p1
# This package needs maven compat for ArtifactResolver class
%pom_add_dep org.apache.maven:maven-compat hawtjni-maven-plugin
@@ -99,6 +101,9 @@ This package allows to use HawtJNI from a maven plugin.
%files -n maven-hawtjni-plugin -f .mfiles-maven-plugin
%changelog
+* Thu Jul 30 2020 Fabio Valentini - 1.17-6
+- Port to commons-lang3.
+
* Tue Jul 28 2020 Fedora Release Engineering - 1.17-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild