diff --git a/.gitignore b/.gitignore index cc0152f..ddad417 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/plexus-containers-2.0.0.tar.gz +SOURCES/plexus-containers-2.2.0.tar.gz diff --git a/.plexus-containers.metadata b/.plexus-containers.metadata index f42b40c..6b12ec6 100644 --- a/.plexus-containers.metadata +++ b/.plexus-containers.metadata @@ -1 +1 @@ -62fe39da30dfb4e15e7dd5ecd9d4b5205895d32b SOURCES/plexus-containers-2.0.0.tar.gz +abf5e10f3df5d6f41ab16bd3639664951733bfc8 SOURCES/plexus-containers-2.2.0.tar.gz diff --git a/SPECS/plexus-containers.spec b/SPECS/plexus-containers.spec index c8ec729..647c338 100644 --- a/SPECS/plexus-containers.spec +++ b/SPECS/plexus-containers.spec @@ -1,35 +1,40 @@ +%bcond_with bootstrap + Name: plexus-containers -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.2.0 +Release: 10%{?dist} Summary: Containers for Plexus -# Most of the files are either under ASL 2.0 or MIT +# Most of the files are either under Apache-2.0 or MIT # The following files are under xpp: # plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java # plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java -License: ASL 2.0 and MIT and xpp +License: Apache-2.0 AND MIT AND xpp URL: https://github.com/codehaus-plexus/plexus-containers BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.thoughtworks.qdox:qdox) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.xbean:xbean-reflect) -BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) -BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +BuildRequires: mvn(org.codehaus.plexus:plexus-testing) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.jdom:jdom2) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.slf4j:slf4j-simple) +%endif %description The Plexus project seeks to create end-to-end developer tools for @@ -45,81 +50,143 @@ Summary: Component metadata from %{name} %description component-metadata %{summary}. -%package -n %{?module_prefix}%{name}-component-annotations +%package component-annotations Summary: Component API from %{name} -%description -n %{?module_prefix}%{name}-component-annotations +%description component-annotations %{summary}. -%package container-default -Summary: Default Container from %{name} +%package javadoc +Summary: API documentation for %{name} -%description container-default -%{summary}. - -%{?javadoc_package} +%description javadoc +API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} - +%autosetup -p1 -n %{name}-%{name}-%{version} cp %{SOURCE1} . cp %{SOURCE2} . %pom_remove_plugin -r :maven-site-plugin -%pom_change_dep -r :google-collections com.google.guava:guava +# remove some broken tests +rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/merge/ComponentsXmlMergerTest.java +rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriterTest.java -# Generate OSGI info -%pom_xpath_inject "pom:project" " - bundle - - - - org.apache.felix - maven-bundle-plugin - true - - - <_nouses>true - org.codehaus.plexus.component.annotations.* - - - - - " plexus-component-annotations - -# plexus-component-api has been merged into plexus-container-default -%mvn_alias ":plexus-container-default" "org.codehaus.plexus:containers-component-api" - -# keep compat symlink for maven's sake -%mvn_file ":plexus-component-annotations" %{name}/plexus-component-annotations plexus/containers-component-annotations +%mvn_package :plexus-containers __noinstall %build -%mvn_build -f -s +%mvn_build -s %install %mvn_install -# plexus-containers pom goes into main package -%files -f .mfiles-plexus-containers -%license LICENSE-2.0.txt LICENSE.MIT -%files -n %{?module_prefix}%{name}-component-annotations -f .mfiles-plexus-component-annotations -%license LICENSE-2.0.txt LICENSE.MIT -%files container-default -f .mfiles-plexus-container-default -%license LICENSE-2.0.txt LICENSE.MIT %files component-metadata -f .mfiles-plexus-component-metadata %license LICENSE-2.0.txt LICENSE.MIT +%files component-annotations -f .mfiles-plexus-component-annotations +%license LICENSE-2.0.txt LICENSE.MIT + +%files javadoc -f .mfiles-javadoc +%license LICENSE-2.0.txt LICENSE.MIT + %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 2.2.0-8 +- Update javapackages test plan to f42 + +* Fri Jul 19 2024 Fedora Release Engineering - 2.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 2.2.0-3 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.2.0-2 +- bump of release for for java-21-openjdk as system jdk + +* Sat Feb 03 2024 Mikolaj Izdebski - 2.2.0-1 +- Update to upstream version 2.2.0 +- Drop obsolete plexus-containers-container-default + +* Thu Jan 25 2024 Fedora Release Engineering - 2.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 2.1.1-7 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.1.1-6 +- Rebuild + +* Thu Aug 10 2023 Marian Koncek - 2.1.1-5 +- Use implicit maven toolchains + +* Fri Jul 21 2023 Fedora Release Engineering - 2.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Apr 29 2022 Mikolaj Izdebski - 2.1.1-1 +- Update to upstream version 2.1.1 + +* Sat Feb 05 2022 Jiri Vanek - 2.1.0-9 +- Rebuilt for java-17-openjdk as system jdk + +* Fri Jan 21 2022 Fedora Release Engineering - 2.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Fedora Release Engineering - 2.1.0-7 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 2.1.0-6 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 2.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 2.1.0-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jan 30 2020 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 25 2020 Mikolaj Izdebski - 2.1.0-2 +- Build with OpenJDK 8 + +* Wed Nov 20 2019 Marian Koncek - 2.1.0-1 +- Update to upstream version 2.1.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 2.0.0-2 - Mass rebuild for javapackages-tools 201902 +* Thu Oct 24 2019 Fabio Valentini - 2.1.0-1 +- Update to version 2.1.0. + +* Tue Aug 20 2019 Fabio Valentini - 2.0.0-1 +- Update to version 2.0.0. + +* Fri Jul 26 2019 Fedora Release Engineering - 1.7.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu May 30 2019 Marian Koncek - 2.0.0-1 - Update to upstream version 2.0.0 * Fri May 24 2019 Mikolaj Izdebski - 1.7.1-9 - Mass rebuild for javapackages-tools 201901 +* Sat Feb 02 2019 Fedora Release Engineering - 1.7.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 31 2018 Michael Simacek - 1.7.1-8 - Fix license tag - Include missing license files