Compare commits

...

No commits in common. "stream-javapackages-tools-202201-rhel-9.1.0" and "c8-stream-201902" have entirely different histories.

4 changed files with 8 additions and 63 deletions

7
.gitignore vendored
View File

@ -1,6 +1 @@
/maven-dependency-tree-2.0-source-release.zip
/maven-dependency-tree-2.1-source-release.zip
/maven-dependency-tree-2.2-source-release.zip
/maven-dependency-tree-3.0-source-release.zip
/maven-dependency-tree-3.0.1-source-release.zip
/maven-dependency-tree-3.1.0-source-release.zip
SOURCES/maven-dependency-tree-3.0.1-source-release.zip

View File

@ -0,0 +1 @@
a70e2240a7abf6be044788704140c0ac61238c23 SOURCES/maven-dependency-tree-3.0.1-source-release.zip

View File

@ -1,29 +1,22 @@
%bcond_with bootstrap
Name: maven-dependency-tree
Version: 3.1.0
Release: 2%{?dist}
Version: 3.0.1
Release: 3%{?dist}
Summary: Maven dependency tree artifact
License: ASL 2.0
URL: https://maven.apache.org/
Url: http://maven.apache.org/
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven:maven-compat)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness)
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.eclipse.aether:aether-api)
BuildRequires: mvn(org.eclipse.aether:aether-util)
%endif
Provides: maven-shared-dependency-tree = %{version}-%{release}
@ -39,13 +32,10 @@ This package contains javadoc for %{name}.
%prep
%setup -q
rm -R src/main/java/org/apache/maven/shared/dependency/graph/internal/maven30
rm src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
rm src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyCollectorBuilder.java
find -name Maven3DependencyGraphBuilder.java -delete
%pom_remove_dep org.sonatype.aether:
%pom_remove_plugin :apache-rat-plugin
%pom_remove_plugin :maven-invoker-plugin
%build
# Incompatible version of jMock (Fedora has 2.x, upstream uses 1.x)
@ -61,55 +51,15 @@ rm src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3Depende
%doc LICENSE NOTICE
%changelog
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-1
- Update to upstream version 3.1.0
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.0.1-10
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-7
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.0.1-4
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-3
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-2
- Mass rebuild for javapackages-tools 201901
* Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-1
- Update to upstream version 3.0.1
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1 +0,0 @@
SHA512 (maven-dependency-tree-3.1.0-source-release.zip) = a34df4748ed28dcf0224abd1ff7c2ebe228c90e95afa01b0a9590770392a9642c3b716cd09847c30f6a58492b5e08015f2ffa0e498f0351a85a97c6dc089e6c4