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

Sync from SUSE:SLFO:Main maven-doxia-sitetools revision a6dd6ac37358f4200b84306b06236983

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

11
maven-doxia-sitetools.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Apr 2 17:22:48 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:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Sat Sep 23 18:10:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>

15
maven-doxia-sitetools.spec
View File

@ -1,7 +1,7 @@
#
# spec file
# spec file for package maven-doxia-sitetools
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -57,6 +57,7 @@ BuildRequires: plexus-interpolation
BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils
BuildRequires: plexus-velocity
BuildRequires: plexus-xml
BuildRequires: qdox
BuildRequires: sisu-inject
BuildRequires: sisu-plexus
@ -89,7 +90,7 @@ API documentation for %{name}.
%prep
%setup -q -n doxia-%{subproj}-%{version} -a1
%patch1 -p1
%patch -P 1 -p1
# migrate to maven 3
%pom_xpath_set //pom:mavenVersion 3.8.6 doxia-integration-tools
@ -103,14 +104,15 @@ API documentation for %{name}.
%pom_remove_dep net.sourceforge.htmlunit:htmlunit doxia-site-renderer/pom.xml
%pom_remove_dep -r :velocity-tools
%pom_xpath_inject "pom:plugin[pom:artifactId[text()='modello-maven-plugin']]/pom:configuration" \
"<useJava5>true</useJava5>" doxia-decoration-model
rm -rf $(find -type d -name itext)
%pom_remove_dep -r :doxia-module-itext
%pom_remove_dep -r :doxia-module-markdown
for i in doxia-decoration-model doxia-doc-renderer doxia-integration-tools doxia-site-renderer; do
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i}
done
%{mvn_alias} :doxia-integration-tools org.apache.maven.shared:maven-doxia-tools
%build
@ -145,6 +147,7 @@ build-jar-repository -s lib \
plexus/interpolation \
plexus-metadata-generator \
plexus/utils \
plexus/xml \
plexus-velocity/plexus-velocity \
qdox \
velocity \