From 3fc3b55f3cdca3725744de72377d4acd85b179a8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Aug 24 2017 19:15:29 +0000 Subject: Aether was retired upstream, Ant tasks do not work with XMvn 3.0.0 (rhbz#1469356) and package is not needed by anything in Fedora. --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b3b2dca..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/epl-v10.html -/aether-ant.tar.xz -/aether-ant-tasks-0.9.0.M3.tar.bz2 -/aether-ant-tasks-0.9.0.M4.tar.bz2 -/aether-ant-tasks-0.9.0.v20140226.tar.bz2 -/aether-ant-tasks-1.0.0.v20140518.tar.bz2 -/aether-ant-tasks-1.0.1.v20141111.tar.bz2 diff --git a/0001-Compatibility-with-Maven-3.4.0.patch b/0001-Compatibility-with-Maven-3.4.0.patch deleted file mode 100644 index 979531b..0000000 --- a/0001-Compatibility-with-Maven-3.4.0.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 15873d368898c7f4f7d7673464ad59135024ea3b Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 7 Nov 2014 14:48:21 +0100 -Subject: [PATCH 1/2] Compatibility with Maven 3.4.0 - -This adds compatibility with latest Maven APIs by implementing new -interface methods introduced in Maven 3.4.0 (MNG-5663 and others). - -Signed-off-by: Mikolaj Izdebski ---- - .../aether/internal/ant/AntModelResolver.java | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java -index dc7ef72..a177b17 100644 ---- a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java -+++ b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java -@@ -16,6 +16,8 @@ import java.util.HashSet; - import java.util.List; - import java.util.Set; - -+import org.apache.maven.model.Dependency; -+import org.apache.maven.model.Parent; - import org.apache.maven.model.Repository; - import org.apache.maven.model.building.FileModelSource; - import org.apache.maven.model.building.ModelSource; -@@ -77,7 +79,13 @@ class AntModelResolver - public void addRepository( Repository repository ) - throws InvalidRepositoryException - { -- if ( !repositoryIds.add( repository.getId() ) ) -+ addRepository( repository, false ); -+ } -+ -+ public void addRepository( Repository repository, boolean replace ) -+ throws InvalidRepositoryException -+ { -+ if ( !repositoryIds.add( repository.getId() ) && !replace ) - { - return; - } -@@ -145,4 +153,16 @@ class AntModelResolver - return new FileModelSource( pomFile ); - } - -+ public ModelSource resolveModel( Parent parent ) -+ throws UnresolvableModelException -+ { -+ return resolveModel( parent.getGroupId(), parent.getArtifactId(), parent.getVersion() ); -+ } -+ -+ public ModelSource resolveModel( Dependency dependency ) -+ throws UnresolvableModelException -+ { -+ return resolveModel( dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() ); -+ } -+ - } --- -2.7.4 - diff --git a/0002-Add-support-for-XMvn-workspace-reader.patch b/0002-Add-support-for-XMvn-workspace-reader.patch deleted file mode 100644 index 9cc2bca..0000000 --- a/0002-Add-support-for-XMvn-workspace-reader.patch +++ /dev/null @@ -1,104 +0,0 @@ -From a1da8d0bfa8da4121a96aec2b3ff45983f1e9e9e Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 10 Oct 2016 21:28:25 +0200 -Subject: [PATCH 2/2] Add support for XMvn workspace reader - ---- - pom.xml | 18 +++++++++++ - .../eclipse/aether/internal/ant/AntRepoSys.java | 7 +++++ - .../eclipse/aether/internal/ant/XMvnRepoSys.java | 35 ++++++++++++++++++++++ - 3 files changed, 60 insertions(+) - create mode 100644 src/main/java/org/eclipse/aether/internal/ant/XMvnRepoSys.java - -diff --git a/pom.xml b/pom.xml -index 915ae45..3948cd3 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -262,6 +262,18 @@ - - - -+ org.fedoraproject.xmvn -+ xmvn-api -+ 2.5.0 -+ provided -+ -+ -+ org.fedoraproject.xmvn -+ xmvn-connector-aether -+ 2.5.0 -+ provided -+ -+ - junit - junit - 4.11 -diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java b/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java -index 76cc927..bdbd547 100644 ---- a/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java -+++ b/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java -@@ -109,6 +109,8 @@ public class AntRepoSys - - private static final SettingsDecrypter settingsDecrypter = new AntSettingsDecryptorFactory().newInstance(); - -+ private static final XMvnRepoSys xmvnRepoSys = new XMvnRepoSys(); -+ - private final Project project; - - private final DefaultServiceLocator locator; -@@ -234,6 +236,11 @@ public class AntRepoSys - - session.setWorkspaceReader( ProjectWorkspaceReader.getInstance() ); - -+ if ( project.getProperty( "xmvn.ant.enable" ) != null || System.getProperty( "xmvn.ant.enable" ) != null ) -+ { -+ xmvnRepoSys.configureRepositorySession( session ); -+ } -+ - return session; - } - -diff --git a/src/main/java/org/eclipse/aether/internal/ant/XMvnRepoSys.java b/src/main/java/org/eclipse/aether/internal/ant/XMvnRepoSys.java -new file mode 100644 -index 0000000..bdef3e2 ---- /dev/null -+++ b/src/main/java/org/eclipse/aether/internal/ant/XMvnRepoSys.java -@@ -0,0 +1,35 @@ -+package org.eclipse.aether.internal.ant; -+ -+import java.nio.file.Paths; -+ -+import org.eclipse.aether.DefaultRepositorySystemSession; -+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 -+{ -+ private final WorkspaceReader xmvnWorkspaceReader; -+ -+ 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 ); -+ } -+ -+ public void configureRepositorySession( DefaultRepositorySystemSession session ) -+ { -+ session.setWorkspaceReader( new ChainedWorkspaceReader( session.getWorkspaceReader(), xmvnWorkspaceReader ) ); -+ } -+} --- -2.7.4 - diff --git a/0003-Add-support-for-XMvn-3.patch b/0003-Add-support-for-XMvn-3.patch deleted file mode 100644 index 5dd349d..0000000 --- a/0003-Add-support-for-XMvn-3.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index d4cea3f..0000000 --- a/aether-ant-tasks.spec +++ /dev/null @@ -1,170 +0,0 @@ -%global vertag v20141111 - -Name: aether-ant-tasks -Epoch: 1 -Version: 1.0.1 -Release: 8%{?dist} -Summary: Ant tasks using Aether to resolve, install and deploy artifacts -Group: Development/Libraries -BuildArch: noarch - -License: EPL -URL: http://www.eclipse.org/aether -Source0: http://git.eclipse.org/c/aether/aether-ant.git/snapshot/%{name}-%{version}.%{vertag}.tar.bz2 -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) -BuildRequires: mvn(org.apache.ant:ant-launcher) -BuildRequires: mvn(org.apache.ant:ant-testutil) -BuildRequires: mvn(org.apache.maven:maven-aether-provider) >= 3.1.0 -BuildRequires: mvn(org.apache.maven:maven-settings-builder) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) -BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) -BuildRequires: mvn(org.eclipse.aether:aether-api) -BuildRequires: mvn(org.eclipse.aether:aether-connector-basic) -BuildRequires: mvn(org.eclipse.aether:aether-impl) -BuildRequires: mvn(org.eclipse.aether:aether-test-util) -BuildRequires: mvn(org.eclipse.aether:aether-transport-classpath) -BuildRequires: mvn(org.eclipse.aether:aether-transport-file) -BuildRequires: mvn(org.eclipse.aether:aether-transport-http) -BuildRequires: mvn(org.eclipse.aether:aether-util) -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-connector-aether) - -Requires: ant -Requires: xmvn-api >= 3.0.0 -Requires: xmvn-core -Requires: xmvn-connector-aether - -%description -The Aether Ant Tasks enable build scripts for Apache Ant 1.7+ to use Eclipse -Aether to resolve dependencies and install and deploy locally built artifacts. - -%package javadoc -Summary: Javadocs for %{name} -Group: Documentation - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%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 - -%pom_remove_plugin ":maven-shade-plugin" -%pom_remove_plugin ":maven-enforcer-plugin" - -%build -# Some tests require internet connectivity, so ignore failures -%mvn_build -- -Dmaven.test.failure.ignore=true - -%install -%mvn_install - -install -d -m 755 %{buildroot}/%{_sysconfdir}/ant.d -install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/ant.d/%{name} - -%files -f .mfiles -%config(noreplace) %{_sysconfdir}/ant.d/%{name} -%doc README.md -%doc epl-v10.html notice.html - -%files javadoc -f .mfiles-javadoc -%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 - -* Fri Feb 10 2017 Fedora Release Engineering - 1:1.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 10 2016 Mikolaj Izdebski - 1:1.0.1-5 -- Fix integration with XMvn - -* Wed Feb 03 2016 Fedora Release Engineering - 1:1.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jul 14 2015 Mat Booth - 1:1.0.1-3 -- Fix broken localrepo task due to missing builder-support from ant classpath - -* Tue Jun 16 2015 Fedora Release Engineering - 1:1.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Feb 4 2015 Mikolaj Izdebski - 1:1.0.1-1 -- Update to upstream version 1.0.1 - -* Fri Nov 7 2014 Mikolaj Izdebski - 1:1.0.0-3 -- Update to Maven 3.2.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 1:1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 20 2014 Mikolaj Izdebski - 1:1.0.0-1 -- Update to upstream version 1.0.0 - -* Thu Feb 27 2014 Mikolaj Izdebski - 1:0.9.0-1 -- Update to upstream version 0.9.0 - -* Tue Jan 7 2014 Mikolaj Izdebski - 1:0.9.0-0.4.M4 -- Update to upstream version 0.9.0.M4 -- Remove workaround for rhbz#996062 - -* Wed Sep 11 2013 Mikolaj Izdebski - 1:0.9.0-0.3.M3 -- Add support for resulving artifacts using XMvn -- Resolves: rhbz#1005971 - -* Mon Aug 12 2013 Mikolaj Izdebski - 1:0.9.0-0.2.M3 -- Update to upstream version 0.9.0.M3 - -* Mon Jul 29 2013 Mat Booth - 1:0.9-0.1.SNAPSHOT -- Upstream has moved to Eclipse, update to upstream 0.9-SNAPSHOT -- Run tests now all deps are in Fedora -- Migrate to Eclipse Aether, fixes rhbz #985700 - -* Tue May 14 2013 Mikolaj Izdebski - 1.0-0.8.SNAPSHOT -- Add missing BR: maven-shade-plugin - -* Tue May 7 2013 Mikolaj Izdebski - 1.0-0.7.SNAPSHOT -- Replace BR with mvn-style virtual packages -- Resolves: rhbz#958156 - -* Wed Feb 13 2013 Fedora Release Engineering - 1.0-0.6.SNAPSHOT -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.0-0.5.SNAPSHOT -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Wed Jan 9 2013 Mikolaj Izdebski - 1.0-0.4.SNAPSHOT -- Bump release tag - -* Tue Jan 8 2013 Mikolaj Izdebski - 1.0-0.3.SNAPSHOT -- Build with xmvn - -* Mon Sep 17 2012 Mikolaj Izdebski - 1.0-0.2.SNAPSHOT -- Install LICENSE files - -* Mon Apr 30 2012 Mikolaj Izdebski 1.0-0.1.SNAPSHOT -- Initial packaging. diff --git a/ant-classpath b/ant-classpath deleted file mode 100644 index 941ffdc..0000000 --- a/ant-classpath +++ /dev/null @@ -1,29 +0,0 @@ -aether -aether-ant-tasks -aopalliance -atinject -cglib -commons-lang3 -commons-logging -google-guice-no_aop -guava -httpcomponents/httpclient -httpcomponents/httpcore -maven/maven-aether-provider -maven/maven-artifact -maven/maven-model -maven/maven-model-builder -maven/maven-settings -maven/maven-settings-builder -maven/maven-builder-support -objectweb-asm -org.eclipse.sisu.inject -org.eclipse.sisu.plexus -plexus/classworlds -plexus/containers-component-annotations -plexus/interpolation -plexus/plexus-cipher -plexus/plexus-sec-dispatcher -plexus/utils -xmvn/xmvn-connector-aether -xmvn/xmvn-api diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5c6778a --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Aether was retired upstream, Ant tasks do not work with XMvn 3.0.0 (rhbz#1469356) and package is not needed by anything in Fedora. diff --git a/sources b/sources deleted file mode 100644 index 13c3363..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -37c2b83c5dd2ed2d23853a2e1e2cba5a aether-ant-tasks-1.0.1.v20141111.tar.bz2