Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-doxia-sitetools for
openSUSE:Factory checked in at 2026-08-03 17:18:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-doxia-sitetools (Old)
and /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.16738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-doxia-sitetools"
Mon Aug 3 17:18:53 2026 rev:14 rq:1369195 version:2.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-doxia-sitetools/maven-doxia-sitetools.changes
2026-04-08 17:17:15.519690795 +0200
+++
/work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.16738/maven-doxia-sitetools.changes
2026-08-03 17:19:08.018576614 +0200
@@ -1,0 +2,7 @@
+Sun Aug 2 14:10:22 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Generate build.properties file for doxia-site-renderer and use it
+ to filter the maven-project.properties and copy it into the jar.
+ Fixes bsc#1273186
+
+-------------------------------------------------------------------
New:
----
pom_properties.py
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-doxia-sitetools.spec ++++++
--- /var/tmp/diff_new_pack.DRST6e/_old 2026-08-03 17:19:10.534664233 +0200
+++ /var/tmp/diff_new_pack.DRST6e/_new 2026-08-03 17:19:10.538664372 +0200
@@ -25,6 +25,7 @@
URL: https://maven.apache.org/doxia/
Source0: %{name}-%{version}.tar.xz
Source1: %{name}-build.tar.xz
+Source10: pom_properties.py
BuildRequires: ant
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3
@@ -68,6 +69,8 @@
%prep
%setup -q -a1
+# parse pom.xml to get properties to replace in resource files
+python3 %{SOURCE10} doxia-site-renderer/pom.xml
>doxia-site-renderer/build.properties
%build
mkdir -p lib
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.DRST6e/_old 2026-08-03 17:19:10.574665626 +0200
+++ /var/tmp/diff_new_pack.DRST6e/_new 2026-08-03 17:19:10.578665765 +0200
@@ -1,6 +1,6 @@
-mtime: 1775634946
-commit: 73d25abdeb663794615bf5534379a687d9c2aac4064ba3a1b62677dba776e649
-url: https://src.opensuse.org/java-packages/maven-doxia-sitetools.git
-revision: 73d25abdeb663794615bf5534379a687d9c2aac4064ba3a1b62677dba776e649
+mtime: 1785743510
+commit: 671e109a154794446f0b27d035db895263fa52c621b55782529f852cbaa2bcec
+url: https://src.opensuse.org/java-packages/maven-doxia-sitetools
+revision: 671e109a154794446f0b27d035db895263fa52c621b55782529f852cbaa2bcec
projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj
++++++ build.specials.obscpio ++++++
++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore 2026-08-03 09:51:50.000000000 +0200
@@ -0,0 +1 @@
+.osc
++++++ maven-doxia-sitetools-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/doxia-site-renderer/build.xml
new/doxia-site-renderer/build.xml
--- old/doxia-site-renderer/build.xml 2024-09-30 15:06:17.111399720 +0200
+++ new/doxia-site-renderer/build.xml 2026-08-02 15:55:14.683937194 +0200
@@ -17,6 +17,7 @@
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
+ <property name="build.resourceFilteredDir"
value="src/main/resources-filtered"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
@@ -65,6 +66,12 @@
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir}"/>
</copy>
+ <copy todir="${build.outputDir}">
+ <fileset dir="${build.resourceFilteredDir}"/>
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </copy>
</target>
<!-- ======================================================================
-->
++++++ pom_properties.py ++++++
from javapackages.maven.pom import POM, PomLoadingException
from javapackages.xmvn.xmvn_resolve import (XMvnResolve, ResolutionRequest,
XMvnResolveException)
from javapackages.common.exception import JavaPackagesToolsException
import sys
import os
def get_parent_pom(pom):
req = ResolutionRequest(pom.groupId, pom.artifactId,
extension="pom", version=pom.version)
result = XMvnResolve.process_raw_request([req])[0]
if not result:
raise XMvnResolveException("Unable to resolve parent POM
{g}:{a}:{e}:{v}"
.format(g=pom.groupId, a=pom.artifactId,
e="pom", v=pom.version))
return POM(result.artifactPath)
def gather_properties(pom_path):
pom = POM(pom_path)
props = pom.properties
curr_pom = pom
parent = pom.parent
while parent:
ppom = None
if hasattr(parent, "relativePath") and parent.relativePath != "":
try:
ppom_path = os.path.join(os.path.dirname(curr_pom._path),
parent.relativePath)
if os.path.isdir(ppom_path):
ppom_path = os.path.join(ppom_path, 'pom.xml')
ppom = POM(ppom_path)
except PomLoadingException:
pass
else:
try:
ppom_path = os.path.join(os.path.dirname(curr_pom._path), '..')
if os.path.isdir(ppom_path):
ppom_path = os.path.join(ppom_path, 'pom.xml')
ppom = POM(ppom_path)
except PomLoadingException:
pass
if not ppom:
try:
ppom = get_parent_pom(parent)
except XMvnResolveException:
break
parent = ppom.parent
pprops = ppom.properties
# merge "properties" sections
for pkey in pprops:
if pkey not in props:
props[pkey] = pprops[pkey]
curr_pom = ppom
return props
def _main():
if not os.path.exists(sys.argv[1]):
message = ("The first argument '{0}' doesn't point to an existing file
").format(sys.argv[1])
parser.error(message)
pom_path = sys.argv[1]
props = gather_properties(pom_path)
for key, value in props.items():
print(f"{key}={value}")
if __name__ == "__main__":
try:
_main()
except JavaPackagesToolsException as e:
sys.exit(e)
