diff --git a/.gitignore b/.gitignore
index bfb0f37..259d488 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ commons-exec-1.0.1-src.tar.gz
 /commons-exec-1.1-src.tar.gz
 /commons-exec-1.2-src.tar.gz
 /commons-exec-1.3-src.tar.gz
+/commons-exec-1.4.0-src.tar.gz
+/commons-exec-1.5.0-src.tar.gz
+/commons-exec-1.6.0-src.tar.gz
diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec
index 6d730b0..8f07024 100644
--- a/apache-commons-exec.spec
+++ b/apache-commons-exec.spec
@@ -2,22 +2,21 @@
 %global short_name commons-%{base_name}
 
 Name:           apache-commons-exec
-Version:        1.3
-Release:        30%{?dist}
+Version:        1.6.0
+Release:        2%{?dist}
 Summary:        Java library to reliably execute external processes from within the JVM
 License:        Apache-2.0
-URL:            http://commons.apache.org/exec/
+URL:            https://commons.apache.org/proper/%{short_name}
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        https://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 
-BuildRequires:  maven-local
-BuildRequires:  mvn(junit:junit)
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
 
-# Tests execute /usr/bin/ping
+# Tests require /usr/bin/ping
 BuildRequires:  iputils
 
 %description
@@ -33,32 +32,22 @@ This package contains the API documentation for %{name}.
 
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%autosetup -n %{short_name}-%{version}-src
 
-# Fix wrong end-of-line encoding
-for file in LICENSE.txt NOTICE.txt RELEASE-NOTES.txt STATUS; do
-  sed -i.orig "s/\r//" $file && \
-  touch -r $file.orig $file && \
-  rm $file.orig
-done
-
-# Shell scripts used for unit tests must be executable (see
-# http://commons.apache.org/exec/faq.html#environment-testing)
-chmod a+x src/test/scripts/*.sh
-
-
-%mvn_file :%{short_name} %{short_name} %{name}
+# Disable junit-pioneer features since it's not (yet) available in Fedora
+%pom_remove_dep org.junit-pioneer:junit-pioneer
+find src/test/java/ -name "*.java" -exec sed  -i '/SetSystemProperty/d' {} \;
 
 
 %build
-# - Skip Exec57Test (it is unstable), see RHBZ #1202260
 # - Skip Exec34Test/Exec41Test/Exec60Test ("socket: Operation not permitted" on Koji)
+# - Skip Exec57Test (it is unstable), see RHBZ #1202260
+# - Skip Exec65Test (calls sudo)
 %mvn_build -- \
   -Dcommons.osgi.symbolicName=org.apache.commons.exec \
   -Dcommons.packageId=exec \
-  -Dmaven.compiler.source=1.8 \
-  -Dmaven.compiler.target=1.8 \
-  -Dtest=\!org.apache.commons.exec.issues.Exec34Test,\!org.apache.commons.exec.issues.Exec41Test,\!org.apache.commons.exec.issues.Exec57Test,\!org.apache.commons.exec.issues.Exec60Test
+  -Dtest=\!org.apache.commons.exec.issues.Exec34Test,\!org.apache.commons.exec.issues.Exec41Test,\!org.apache.commons.exec.issues.Exec57Test,\!org.apache.commons.exec.issues.Exec60Test,\!org.apache.commons.exec.issues.Exec65Test
+
 
 %install
 %mvn_install
@@ -66,7 +55,7 @@ chmod a+x src/test/scripts/*.sh
 
 %files -f .mfiles
 %license LICENSE.txt NOTICE.txt
-%doc STATUS RELEASE-NOTES.txt
+%doc RELEASE-NOTES.txt
 
 
 %files javadoc -f .mfiles-javadoc
@@ -74,6 +63,33 @@ chmod a+x src/test/scripts/*.sh
 
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Sat Jan 03 2026 Mohamed El Morabity <melmorabity@fedoraproject.org> - 1.6.0-1
+- Update to 1.6.0
+
+* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 1.5.0-3
+- Rebuilt for java-25-openjdk as preffered jdk
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jul 12 2025 Mohamed El Morabity <melmorabity@fedoraproject.org> - 1.5.0-1
+- Update to 1.5.0
+
+* Sun Jan 26 2025 Mohamed El Morabity <melmorabity@fedoraproject.org> - 1.4.0-1
+- Update to 1.4.0
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.3-31
+- Rebuilt for java-21-openjdk as system jdk
+
 * Wed Jan 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-30
 - Port to apache-commons-parent 65
 
diff --git a/sources b/sources
index f6ee31b..6836373 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7d050267a75115fcc4431bd7fa567fc  commons-exec-1.3-src.tar.gz
+SHA512 (commons-exec-1.6.0-src.tar.gz) = 00e8eb552e886ba9da0b9636ee9ffce142eb33faa9d2873e7619e6508ab59b214bde1818f43012ecdab928ddc0697514482b33c3c268729c3049ce4306a7ea1e