diff --git a/0002-Add-support-for-XMvn-workspace-reader.patch b/0002-Add-support-for-XMvn-workspace-reader.patch
index f0e4fba..9cc2bca 100644
--- a/0002-Add-support-for-XMvn-workspace-reader.patch
+++ b/0002-Add-support-for-XMvn-workspace-reader.patch
@@ -14,7 +14,7 @@ diff --git a/pom.xml b/pom.xml
index 915ae45..3948cd3 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -262,6 +262,24 @@
+@@ -262,6 +262,18 @@
@@ -25,12 +25,6 @@ index 915ae45..3948cd3 100644
+
+
+ org.fedoraproject.xmvn
-+ xmvn-launcher
-+ 2.5.0
-+ provided
-+
-+
-+ org.fedoraproject.xmvn
+ xmvn-connector-aether
+ 2.5.0
+ provided
diff --git a/0003-Add-support-for-XMvn-3.patch b/0003-Add-support-for-XMvn-3.patch
new file mode 100644
index 0000000..5dd349d
--- /dev/null
+++ b/0003-Add-support-for-XMvn-3.patch
@@ -0,0 +1,31 @@
+diff -up ./src/main/java/org/eclipse/aether/internal/ant/XMvnRepoSys.java.fix ./src/main/java/org/eclipse/aether/internal/ant/XMvnRepoSys.java
+--- ./src/main/java/org/eclipse/aether/internal/ant/XMvnRepoSys.java.fix 2017-08-22 22:42:20.729666492 -0400
++++ ./src/main/java/org/eclipse/aether/internal/ant/XMvnRepoSys.java 2017-08-22 22:42:50.335664467 -0400
+@@ -6,9 +6,6 @@ import org.eclipse.aether.DefaultReposit
+ import org.eclipse.aether.repository.WorkspaceReader;
+ import org.eclipse.aether.util.repository.ChainedWorkspaceReader;
+ import org.fedoraproject.xmvn.connector.aether.XMvnWorkspaceReader;
+-import org.fedoraproject.xmvn.locator.IsolatedXMvnServiceLocator;
+-import org.fedoraproject.xmvn.locator.XMvnHomeClassLoader;
+-import org.fedoraproject.xmvn.resolver.Resolver;
+
+ class XMvnRepoSys
+ {
+@@ -16,16 +13,7 @@ class XMvnRepoSys
+
+ public XMvnRepoSys()
+ {
+- ClassLoader antClassLoader = AntRepoSys.class.getClassLoader();
+-
+- XMvnHomeClassLoader xmvnClassLoader = new XMvnHomeClassLoader( antClassLoader );
+- xmvnClassLoader.addJar( Paths.get( "/usr/share/java/slf4j/api.jar" ) );
+- xmvnClassLoader.addJar( Paths.get( "/usr/share/java/slf4j/simple.jar" ) );
+-
+- IsolatedXMvnServiceLocator serviceLocator = new IsolatedXMvnServiceLocator( xmvnClassLoader );
+- Resolver resolver = serviceLocator.getService( Resolver.class );
+-
+- xmvnWorkspaceReader = new XMvnWorkspaceReader( resolver );
++ xmvnWorkspaceReader = new XMvnWorkspaceReader();
+ }
+
+ public void configureRepositorySession( DefaultRepositorySystemSession session )
diff --git a/aether-ant-tasks.spec b/aether-ant-tasks.spec
index f10d043..d4cea3f 100644
--- a/aether-ant-tasks.spec
+++ b/aether-ant-tasks.spec
@@ -3,7 +3,7 @@
Name: aether-ant-tasks
Epoch: 1
Version: 1.0.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Ant tasks using Aether to resolve, install and deploy artifacts
Group: Development/Libraries
BuildArch: noarch
@@ -16,7 +16,10 @@ Source5: ant-classpath
# Partially forwarded upstream: http://bugs.eclipse.org/470696
Patch0001: 0001-Compatibility-with-Maven-3.4.0.patch
Patch0002: 0002-Add-support-for-XMvn-workspace-reader.patch
+# Fix code to work with xmvn 3.0.0 which has removed some classes
+Patch0003: 0003-Add-support-for-XMvn-3.patch
+BuildRequires: xmvn-api >= 3.0.0
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.ant:ant)
@@ -38,13 +41,11 @@ BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
BuildRequires: mvn(org.hamcrest:hamcrest-core)
BuildRequires: mvn(org.hamcrest:hamcrest-library)
BuildRequires: mvn(org.fedoraproject.xmvn:xmvn-api)
-BuildRequires: mvn(org.fedoraproject.xmvn:xmvn-launcher)
BuildRequires: mvn(org.fedoraproject.xmvn:xmvn-connector-aether)
Requires: ant
-Requires: xmvn-api
+Requires: xmvn-api >= 3.0.0
Requires: xmvn-core
-Requires: xmvn-launcher
Requires: xmvn-connector-aether
%description
@@ -62,6 +63,7 @@ This package contains the API documentation for %{name}.
%setup -q -n %{name}-%{version}.%{vertag}
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p0
# Use junit since junit-dep is obselete and equivilent to junit since 4.11
sed -i -e 's@junit-dep@junit@g' pom.xml
@@ -88,6 +90,10 @@ install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/ant.d/%{name}
%doc epl-v10.html notice.html
%changelog
+* Tue Aug 22 2017 Jeff Johnston - 1:1.0.1-8
+- Remove xmvn-launcher REQ which is now supplied by xmvn-api
+- Fix code to work with xmvn 3.0.0 which has removed some classes
+
* Wed Jul 26 2017 Fedora Release Engineering - 1:1.0.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/ant-classpath b/ant-classpath
index 788427e..941ffdc 100644
--- a/ant-classpath
+++ b/ant-classpath
@@ -27,4 +27,3 @@ plexus/plexus-sec-dispatcher
plexus/utils
xmvn/xmvn-connector-aether
xmvn/xmvn-api
-xmvn/xmvn-launcher