pool/plexus-containers
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 1164199 from Java:packages:test

Browse Source 
Depend on plexus-xml

OBS-URL: https://build.opensuse.org/request/show/1164199
OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=45
This commit is contained in:
Fridrich Strba 2024-04-02 17:38:12 +00:00 committed by Git OBS Bridge
parent 8dcf9b670f
commit 928aeeed5d
6 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plexus-component-metadata.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 2 17:33:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Add dependency on plexus-xml where relevant
* this will be needed for smooth upgrade to plexus-utils 4.0.0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 14:46:35 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Feb 20 14:46:35 UTC 2024 - Fridrich Strba <fstrba@suse.com>

4
plexus-component-metadata.spec
View File

@ -44,6 +44,7 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus-xml)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.jdom:jdom2)
BuildRequires: mvn(org.ow2.asm:asm) >= 7 BuildRequires: mvn(org.ow2.asm:asm) >= 7
@ -87,6 +88,9 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
# Generate OSGI info # Generate OSGI info
%pom_xpath_inject "pom:project" " %pom_xpath_inject "pom:project" "
<packaging>bundle</packaging> <packaging>bundle</packaging>

6
plexus-containers.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 2 17:33:09 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Add dependency on plexus-xml where relevant
* this will be needed for smooth upgrade to plexus-utils 4.0.0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 14:46:18 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Feb 20 14:46:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>

8
plexus-containers.spec
View File

@ -35,10 +35,11 @@ Source100: %{name}-build.tar.xz
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: guava BuildRequires: guava
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: junit BuildRequires: junit
BuildRequires: plexus-classworlds BuildRequires: plexus-classworlds
BuildRequires: plexus-utils BuildRequires: plexus-utils
BuildRequires: plexus-xml
BuildRequires: xbean BuildRequires: xbean
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
@ -78,7 +79,7 @@ Group: Documentation/HTML
%setup -q -n %{name}-%{name}-%{version} -a100 %setup -q -n %{name}-%{name}-%{version} -a100
mkdir -p lib mkdir -p lib
build-jar-repository -s lib plexus/classworlds plexus/utils guava/guava junit xbean/xbean-reflect build-jar-repository -s lib plexus/classworlds plexus/utils plexus/xml guava/guava junit xbean/xbean-reflect
%if %{with tests} %if %{with tests}
build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest/core build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest/core
%endif %endif
@ -97,6 +98,9 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
# Generate OSGI info # Generate OSGI info
%pom_xpath_inject "pom:project" " %pom_xpath_inject "pom:project" "
<packaging>bundle</packaging> <packaging>bundle</packaging>

6
plexus-metadata-generator.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 2 17:33:15 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Add dependency on plexus-xml where relevant
* this will be needed for smooth upgrade to plexus-utils 4.0.0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 14:45:18 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Feb 20 14:45:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>

11
plexus-metadata-generator.spec
View File

@ -39,7 +39,7 @@ Patch1000: %{name}-nomojo.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-cli BuildRequires: apache-commons-cli
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: jdom2 BuildRequires: jdom2
BuildRequires: junit BuildRequires: junit
BuildRequires: objectweb-asm >= 7 BuildRequires: objectweb-asm >= 7
@ -48,6 +48,7 @@ BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-containers-container-default BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils BuildRequires: plexus-utils
BuildRequires: plexus-xml
BuildRequires: qdox >= 2 BuildRequires: qdox >= 2
BuildRequires: xbean BuildRequires: xbean
Requires: apache-commons-cli Requires: apache-commons-cli
@ -58,6 +59,7 @@ Requires: plexus-cli
Requires: plexus-containers-component-annotations = %{version} Requires: plexus-containers-component-annotations = %{version}
Requires: plexus-containers-container-default = %{version} Requires: plexus-containers-container-default = %{version}
Requires: plexus-utils Requires: plexus-utils
Requires: plexus-xml
Requires: qdox >= 2 Requires: qdox >= 2
Requires: xbean Requires: xbean
BuildArch: noarch BuildArch: noarch
@ -83,7 +85,7 @@ Group: Documentation/HTML
%setup -q -n %{base_name}-%{base_name}-%{version} -a100 %setup -q -n %{base_name}-%{base_name}-%{version} -a100
mkdir -p lib mkdir -p lib
build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils jdom2/jdom2 commons-cli qdox plexus/cli build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli
%if %{with tests} %if %{with tests}
build-jar-repository -s lib hamcrest/core xbean/xbean-reflect build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
%endif %endif
@ -106,6 +108,9 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-%{comp_name}
# Generate OSGI info # Generate OSGI info
%pom_xpath_inject "pom:project" " %pom_xpath_inject "pom:project" "
<packaging>bundle</packaging> <packaging>bundle</packaging>
@ -160,7 +165,7 @@ install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir} %fdupes -s %{buildroot}%{_javadocdir}
# script # script
%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name} %jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
%files -f .mfiles %files -f .mfiles
%license LICENSE-2.0.txt LICENSE.MIT %license LICENSE-2.0.txt LICENSE.MIT