diff --git a/.gitignore b/.gitignore
index 3d201a8..1cbd0a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /maven-invoker-2.1.1-source-release.zip
 /maven-invoker-2.2-source-release.zip
 /maven-invoker-3.0.1-source-release.zip
+/maven-invoker-3.1.0-source-release.zip
diff --git a/maven-invoker.spec b/maven-invoker.spec
index 4042fb2..40d40f1 100644
--- a/maven-invoker.spec
+++ b/maven-invoker.spec
@@ -1,12 +1,12 @@
 Name:           maven-invoker
-Version:        3.0.1
-Release:        6%{?dist}
+Version:        3.1.0
+Release:        1%{?dist}
 Summary:        Fires a maven build in a clean environment
 License:        ASL 2.0
-URL:            http://maven.apache.org/shared/maven-invoker/
+URL:            https://maven.apache.org/shared/maven-invoker/
 BuildArch:      noarch
 
-Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 # Patch rejected upstream
 Patch1:         %{name}-MSHARED-279.patch
@@ -14,9 +14,9 @@ Patch1:         %{name}-MSHARED-279.patch
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
+BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
 # Required by tests
 BuildRequires:  maven-antrun-plugin
 BuildRequires:  maven-clean-plugin
@@ -40,7 +40,10 @@ API documentation for %{name}.
 
 %prep
 %setup -q
+# Change line endings so patch can be applied
+sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
 %patch1 -p1
+%pom_change_dep javax.inject:javax.inject:1  org.eclipse.sisu:org.eclipse.sisu.inject
 
 %build
 %mvn_build
@@ -56,6 +59,10 @@ API documentation for %{name}.
 
 
 %changelog
+* Thu Aug 05 2021 Markku Korkeala <markku.korkeala@iki.fi> - 3.1.0-1
+- Update to upstream version 3.1.0
+- Update dependencies
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index a2dd793..38f52c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (maven-invoker-3.0.1-source-release.zip) = 9465a2aa2750bd3e158fa65d1541637b99883ef74157c1ce975ad08928d15364d3289aebcecd05e28b4d4f7072aab506964255e0a51b9e9a0ea8f8768159dc2c
+SHA512 (maven-invoker-3.1.0-source-release.zip) = 92ba5308f5098fe06c0385980f48de15c06fb7b39f01e3aeec7d89fe4660ae265a7eee093a9783f90ebc0e16265fe87292216019880f18111b2df193ce67133a