diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..367c0a4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-dependency-tree-2.0-source-release.zip diff --git a/.rh-maven33-maven-dependency-tree.metadata b/.rh-maven33-maven-dependency-tree.metadata new file mode 100644 index 0000000..d9cf2d3 --- /dev/null +++ b/.rh-maven33-maven-dependency-tree.metadata @@ -0,0 +1 @@ +aa4bc91af300a9a265bea54736c9985a68ad0122 SOURCES/maven-dependency-tree-2.0-source-release.zip diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Port-to-Maven-3.1.0-and-Eclipse-Aether.patch b/SOURCES/0001-Port-to-Maven-3.1.0-and-Eclipse-Aether.patch new file mode 100644 index 0000000..8e80029 --- /dev/null +++ b/SOURCES/0001-Port-to-Maven-3.1.0-and-Eclipse-Aether.patch @@ -0,0 +1,90 @@ +diff --git a/pom.xml b/pom.xml +index 31f4600..2f149da 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -56,7 +56,7 @@ + + org.apache.maven + maven-core +- 3.0.4 ++ 3.1.0 + provided + + +@@ -65,10 +65,21 @@ + 1.5.5 + + +- org.sonatype.aether ++ org.eclipse.aether + aether-api +- 1.13.1 + true ++ 0.9.0.M2 ++ ++ ++ org.eclipse.aether ++ aether-util ++ 0.9.0.M2 ++ ++ ++ org.eclipse.aether ++ aether-api ++ ++ + + + +diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java +index 9527f72..8b7b025 100644 +--- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java ++++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java +@@ -40,8 +40,8 @@ import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; + import org.apache.maven.shared.dependency.graph.DependencyNode; + import org.codehaus.plexus.component.annotations.Component; + import org.codehaus.plexus.component.annotations.Requirement; +-import org.sonatype.aether.graph.Dependency; +-import org.sonatype.aether.version.VersionConstraint; ++import org.eclipse.aether.graph.Dependency; ++import org.eclipse.aether.version.VersionConstraint; + + /** + * Wrapper around Maven 3 dependency resolver. +@@ -101,7 +101,7 @@ public class Maven3DependencyGraphBuilder + + private Artifact getDependencyArtifact( Dependency dep ) + { +- org.sonatype.aether.artifact.Artifact artifact = dep.getArtifact(); ++ org.eclipse.aether.artifact.Artifact artifact = dep.getArtifact(); + + return factory.createDependencyArtifact( artifact.getGroupId(), artifact.getArtifactId(), + VersionRange.createFromVersion( artifact.getVersion() ), +@@ -109,15 +109,15 @@ public class Maven3DependencyGraphBuilder + dep.isOptional() ); + } + +- private DependencyNode buildDependencyNode( DependencyNode parent, org.sonatype.aether.graph.DependencyNode node, ++ private DependencyNode buildDependencyNode( DependencyNode parent, org.eclipse.aether.graph.DependencyNode node, + Artifact artifact, ArtifactFilter filter ) + { + DefaultDependencyNode current = +- new DefaultDependencyNode( parent, artifact, node.getPremanagedVersion(), node.getPremanagedScope(), ++ new DefaultDependencyNode( parent, artifact, null /*node.getPremanagedVersion()*/, null /*node.getPremanagedScope()*/, + getVersionSelectedFromRange( node.getVersionConstraint() ) ); + + List nodes = new ArrayList( node.getChildren().size() ); +- for ( org.sonatype.aether.graph.DependencyNode child : node.getChildren() ) ++ for ( org.eclipse.aether.graph.DependencyNode child : node.getChildren() ) + { + Artifact childArtifact = getDependencyArtifact( child.getDependency() ); + +@@ -140,7 +140,8 @@ public class Maven3DependencyGraphBuilder + } + + StringBuilder sb = new StringBuilder(); +- for ( org.sonatype.aether.version.VersionRange range : constraint.getRanges() ) ++ org.eclipse.aether.version.VersionRange range = constraint.getRange(); ++ if ( range != null ) + { + if ( sb.length() > 0 ) + { diff --git a/SPECS/maven-dependency-tree.spec b/SPECS/maven-dependency-tree.spec new file mode 100644 index 0000000..8813875 --- /dev/null +++ b/SPECS/maven-dependency-tree.spec @@ -0,0 +1,120 @@ +%global pkg_name maven-dependency-tree +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + + +Name: %{?scl_prefix}%{pkg_name} +Version: 2.0 +Release: 6.13%{?dist} +Summary: Maven dependency tree artifact +License: ASL 2.0 +Url: http://maven.apache.org/ +Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip +Patch0: 0001-Port-to-Maven-3.1.0-and-Eclipse-Aether.patch +BuildArch: noarch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}maven-shared +BuildRequires: %{?scl_prefix}plexus-containers-component-metadata +BuildRequires: %{?scl_prefix}plexus-containers-component-annotations + + +%description +Apache Maven dependency tree artifact. Originally part of maven-shared. + +%package javadoc +Summary: Javadoc for %{pkg_name} + +%description javadoc +This package contains javadoc for %{pkg_name}. + +%prep +%setup -q -n %{pkg_name}-%{version} +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%patch0 -p1 +%pom_add_dep org.apache.maven:maven-compat:3.0.4 +%pom_add_dep org.apache.maven:maven-artifact:2.2.1 +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +# we have no jmock yet +%mvn_build -f +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_install +%{?scl:EOF} + +%files -f .mfiles +%{_javadir}/%{pkg_name} +%dir %{_mavenpomdir}/%{pkg_name} +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Mon Feb 08 2016 Michal Srb - 2.0-6.13 +- Fix BR on maven-local & co. + +* Mon Jan 18 2016 Michal Srb - 2.0-6.12 +- Remove dependency on Sonatype Aether + +* Mon Jan 11 2016 Michal Srb - 2.0-6.11 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 2.0-6.10 +- maven33 rebuild + +* Thu Jan 15 2015 Mikolaj Izdebski - 2.0-6.9 +- Add directory ownership on %%{_mavenpomdir} subdir + +* Tue Jan 13 2015 Michael Simacek - 2.0-6.8 +- Mass rebuild 2015-01-13 + +* Tue Jan 06 2015 Michael Simacek - 2.0-6.7 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 2.0-6.6 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 2.0-6.5 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 2.0-6.4 +- Mass rebuild 2014-02-18 +- Add missing BR: maven-shared + +* Mon Feb 17 2014 Michal Srb - 2.0-6.3 +- SCL-ize BR/R + +* Thu Feb 13 2014 Mikolaj Izdebski - 2.0-6.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 2.0-6.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 2.0-6 +- Mass rebuild 2013-12-27 + +* Fri Jun 28 2013 Mikolaj Izdebski - 2.0-5 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Thu Feb 14 2013 Fedora Release Engineering - 2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 2.0-3 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Jan 10 2013 Mikolaj Izdebski - 2.0-2 +- Build with xmvn + +* Wed Oct 24 2012 Stanislav Ochotnicky - 2.0-1 +- Initial package