SLFO-pool/maven-doxia
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main maven-doxia revision 46fa326ce56f33d05a7d6ee90455400b

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 14:49:03 +02:00
parent 0d383873ee
commit 83d160dc79
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
maven-doxia.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Apr 2 17:22:22 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
-------------------------------------------------------------------
Wed Feb 21 05:58:59 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 26 21:09:43 UTC 2023 - Fridrich Strba <fstrba@suse.com> Tue Sep 26 21:09:43 UTC 2023 - Fridrich Strba <fstrba@suse.com>

11
maven-doxia.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-doxia # spec file for package maven-doxia
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -49,6 +49,7 @@ BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-metadata-generator BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils BuildRequires: plexus-utils
BuildRequires: plexus-xml
BuildRequires: qdox BuildRequires: qdox
BuildRequires: sisu-inject BuildRequires: sisu-inject
BuildRequires: sisu-plexus BuildRequires: sisu-plexus
@ -185,7 +186,7 @@ API documentation for %{name}.
%prep %prep
%setup -q -n doxia-%{version} -a1 %setup -q -n doxia-%{version} -a1
%patch0 -p1 %patch -P 0 -p1
# we don't have clirr-maven-plugin # we don't have clirr-maven-plugin
%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml %pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml
@ -196,6 +197,11 @@ API documentation for %{name}.
# requires network # requires network
rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-core
for i in doxia-module-docbook-simple doxia-module-fml doxia-module-fo doxia-module-itext doxia-module-markdown doxia-module-xdoc doxia-module-xhtml doxia-module-xhtml5; do
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-modules/${i}
done
%pom_disable_module doxia-module-itext doxia-modules %pom_disable_module doxia-module-itext doxia-modules
%pom_disable_module doxia-module-markdown doxia-modules %pom_disable_module doxia-module-markdown doxia-modules
@ -226,6 +232,7 @@ build-jar-repository -s lib \
plexus-containers/plexus-component-annotations \ plexus-containers/plexus-component-annotations \
plexus-metadata-generator \ plexus-metadata-generator \
plexus/utils \ plexus/utils \
plexus/xml \
qdox \ qdox \
xbean/xbean-reflect \ xbean/xbean-reflect \
xmlgraphics-commons \ xmlgraphics-commons \