diff --git a/plexus-containers-2.1.1.tar.gz b/plexus-containers-2.1.1.tar.gz deleted file mode 100644 index cca2f7c3a03712b82836adcc893fc53bf9e66e44..0000000000000000000000000000000000000000 Binary files a/plexus-containers-2.1.1.tar.gz and /dev/null differ diff --git a/plexus-containers-2.2.0.tar.gz b/plexus-containers-2.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..64e4359b371ea772fc7f1579fccd86e0e8d39906 Binary files /dev/null and b/plexus-containers-2.2.0.tar.gz differ diff --git a/plexus-containers.spec b/plexus-containers.spec index f2ea0811e1e45a11d323e0ddb0502042c2f8581b..6c535bb240a7c3d6af1b21180771655607072c8c 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -2,7 +2,7 @@ %bcond_without bootstrap Name: plexus-containers -Version: 2.1.1 +Version: 2.2.0 Release: %{anolis_release}%{?dist} Summary: Containers for Plexus # Most of the files are either under ASL 2.0 or MIT @@ -19,24 +19,22 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk8 -BuildRequires: mvn(com.google.guava:guava) +BuildRequires: maven-local 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 @@ -59,12 +57,6 @@ Summary: Component API from %{name} %description -n %{?module_prefix}%{name}-component-annotations %{summary}. -%package container-default -Summary: Default Container from %{name} - -%description container-default -%{summary}. - %{?javadoc_package} %prep @@ -75,54 +67,28 @@ cp %{SOURCE2} . %pom_remove_plugin -r :maven-site-plugin -# 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 - # 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 +%mvn_package :plexus-containers __noinstall + %build %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 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 %changelog +* Tue Apr 15 2025 Xiaoping Liu - 2.2.0-1 +- update to 2.2.0 from 2.1.1 +- Drop obsolete plexus-containers-container-default + * Sun Apr 16 2023 Funda Wang - 2.1.1-1 - Import package for anolis 23