Merge modular branch
This commit is contained in:
		
						commit
						846ea99ed2
					
				| @ -1,3 +1,5 @@ | |||||||
|  | %bcond_with bootstrap | ||||||
|  | 
 | ||||||
| Name:           plexus-classworlds | Name:           plexus-classworlds | ||||||
| Version:        2.6.0 | Version:        2.6.0 | ||||||
| Release:        6%{?dist} | Release:        6%{?dist} | ||||||
| @ -8,17 +10,13 @@ BuildArch:      noarch | |||||||
| 
 | 
 | ||||||
| Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz | Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz | ||||||
| 
 | 
 | ||||||
| BuildRequires:  maven-local | BuildRequires:  maven-local-openjdk8 | ||||||
|  | %if %{with bootstrap} | ||||||
|  | BuildRequires:  javapackages-bootstrap | ||||||
|  | %else | ||||||
| BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin) | BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin) | ||||||
| BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin) |  | ||||||
| BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin) |  | ||||||
| BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:) | BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:) | ||||||
| 
 | %endif | ||||||
| # test deps missed by builddep |  | ||||||
| BuildRequires:  mvn(org.apache.ant:ant) |  | ||||||
| BuildRequires:  mvn(commons-logging:commons-logging) |  | ||||||
| BuildRequires:  mvn(xml-apis:xml-apis) |  | ||||||
| 
 |  | ||||||
| 
 | 
 | ||||||
| %description | %description | ||||||
| Classworlds is a framework for container developers | Classworlds is a framework for container developers | ||||||
| @ -30,17 +28,20 @@ loading of components or otherwise represent a 'container' | |||||||
| can benefit from the classloading control provided by | can benefit from the classloading control provided by | ||||||
| classworlds. | classworlds. | ||||||
| 
 | 
 | ||||||
| %package javadoc | %{?javadoc_package} | ||||||
| Summary:        Javadoc for %{name} |  | ||||||
| 
 |  | ||||||
| %description javadoc |  | ||||||
| API documentation for %{name}. |  | ||||||
| 
 | 
 | ||||||
| %prep | %prep | ||||||
| %setup -q -n %{name}-%{name}-%{version} | %setup -q -n %{name}-%{name}-%{version} | ||||||
| %mvn_file : %{name} plexus/classworlds | %mvn_file : %{name} plexus/classworlds | ||||||
| %mvn_alias : classworlds:classworlds | %mvn_alias : classworlds:classworlds | ||||||
| 
 | 
 | ||||||
|  | %pom_remove_plugin :maven-enforcer-plugin | ||||||
|  | %pom_remove_plugin :maven-dependency-plugin | ||||||
|  | 
 | ||||||
|  | # These tests depend on artifacts that are not packaged | ||||||
|  | sed -i /testConfigure_Valid/s/./@org.junit.Ignore/ $(find -name ConfiguratorTest.java) | ||||||
|  | sed -i /testConfigure_Optionally_Existent/s/./@org.junit.Ignore/ $(find -name ConfiguratorTest.java) | ||||||
|  | 
 | ||||||
| %build | %build | ||||||
| %mvn_build | %mvn_build | ||||||
| 
 | 
 | ||||||
| @ -48,10 +49,7 @@ API documentation for %{name}. | |||||||
| %mvn_install | %mvn_install | ||||||
| 
 | 
 | ||||||
| %files -f .mfiles | %files -f .mfiles | ||||||
| %doc LICENSE.txt LICENSE-2.0.txt | %license LICENSE.txt LICENSE-2.0.txt | ||||||
| 
 |  | ||||||
| %files javadoc -f .mfiles-javadoc |  | ||||||
| %doc LICENSE.txt LICENSE-2.0.txt |  | ||||||
| 
 | 
 | ||||||
| %changelog | %changelog | ||||||
| * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-6 | * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-6 | ||||||
| @ -66,9 +64,18 @@ API documentation for %{name}. | |||||||
| * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-3 | * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-3 | ||||||
| - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild | - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild | ||||||
| 
 | 
 | ||||||
|  | * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-4 | ||||||
|  | - Build with OpenJDK 8 | ||||||
|  | 
 | ||||||
|  | * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-3 | ||||||
|  | - Mass rebuild for javapackages-tools 201902 | ||||||
|  | 
 | ||||||
| * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-2 | * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-2 | ||||||
| - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild | - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild | ||||||
| 
 | 
 | ||||||
|  | * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-2 | ||||||
|  | - Mass rebuild for javapackages-tools 201901 | ||||||
|  | 
 | ||||||
| * Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-1 | * Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-1 | ||||||
| - Update to upstream version 2.6.0 | - Update to upstream version 2.6.0 | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user