Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven4 for openSUSE:Factory checked in at 2026-05-16 19:25:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven4 (Old) and /work/SRC/openSUSE:Factory/.maven4.new.1966 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven4" Sat May 16 19:25:02 2026 rev:10 rq:1353472 version:4.0.0~rc5 Changes: -------- --- /work/SRC/openSUSE:Factory/maven4/maven4-bootstrap.changes 2026-05-12 19:27:19.540721860 +0200 +++ /work/SRC/openSUSE:Factory/.maven4.new.1966/maven4-bootstrap.changes 2026-05-16 19:26:29.134856025 +0200 @@ -1,0 +2,6 @@ +Fri May 15 23:37:49 UTC 2026 - Fridrich Strba <[email protected]> + +- Generate the build.propertis file containing properties needed for + resources filtering dynamically during the build + +------------------------------------------------------------------- maven4-testing.changes: same change maven4.changes: same change New: ---- pom_properties.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven4-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.lPpoBB/_old 2026-05-16 19:26:29.938888992 +0200 +++ /var/tmp/diff_new_pack.lPpoBB/_new 2026-05-16 19:26:29.942889156 +0200 @@ -95,14 +95,6 @@ # Disable plugins which are not useful for us %pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :buildnumber-maven-plugin -sed -i " -/buildNumber=/ d -/timestamp=/ d -" `find -name build.properties` -sed -i "s/version=.*/version=%{file_version}/" `find -name build.properties` -sed -i "s/distributionId=.*/distributionId=apache-maven/" `find -name build.properties` -sed -i "s/distributionShortName=.*/distributionShortName=Maven/" `find -name build.properties` -sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build.properties` %{mvn_package} :apache-maven __noinstall %{mvn_package} ::mdo: __noinstall ++++++ maven4-testing.spec ++++++ --- /var/tmp/diff_new_pack.lPpoBB/_old 2026-05-16 19:26:29.982890796 +0200 +++ /var/tmp/diff_new_pack.lPpoBB/_new 2026-05-16 19:26:29.982890796 +0200 @@ -87,6 +87,7 @@ %pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4 %pom_xpath_set pom:project/pom:properties/pom:resolverVersion 2 +%pom_xpath_set pom:project/pom:properties/pom:slf4jVersion 2 %pom_remove_dep -r :junit-bom %pom_remove_dep -r :mockito-bom @@ -118,14 +119,6 @@ # Disable plugins which are not useful for us %pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :buildnumber-maven-plugin -sed -i " -/buildNumber=/ d -/timestamp=/ d -" `find -name build.properties` -sed -i "s/version=.*/version=%{file_version}/" `find -name build.properties` -sed -i "s/distributionId=.*/distributionId=apache-maven/" `find -name build.properties` -sed -i "s/distributionShortName=.*/distributionShortName=Maven/" `find -name build.properties` -sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build.properties` %{mvn_package} :apache-maven __noinstall %{mvn_package} ::mdo: __noinstall ++++++ maven4.spec ++++++ --- /var/tmp/diff_new_pack.lPpoBB/_old 2026-05-16 19:26:30.018892273 +0200 +++ /var/tmp/diff_new_pack.lPpoBB/_new 2026-05-16 19:26:30.018892273 +0200 @@ -34,6 +34,7 @@ Source1: maven-bash-completion Source2: mvn.1 Source10: apache-%{base_name}-build.tar.xz +Source100: pom_properties.py Patch1: 0001-Adapt-mvn-script.patch # Downstream-specific, avoids dependency on logback Patch2: 0002-Invoke-logback-via-reflection.patch @@ -94,6 +95,7 @@ BuildRequires: plexus-sec-dispatcher4 BuildRequires: plexus-utils BuildRequires: plexus-xml4 +BuildRequires: python3 BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: slf4j2 @@ -196,6 +198,7 @@ %pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4 %pom_xpath_set pom:project/pom:properties/pom:resolverVersion 2 +%pom_xpath_set pom:project/pom:properties/pom:slf4jVersion 2 %pom_remove_dep -r :junit-bom %pom_remove_dep -r :mockito-bom @@ -227,14 +230,6 @@ # Disable plugins which are not useful for us %pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :buildnumber-maven-plugin -sed -i " -/buildNumber=/ d -/timestamp=/ d -" `find -name build.properties` -sed -i "s/version=.*/version=%{file_version}/" `find -name build.properties` -sed -i "s/distributionId=.*/distributionId=apache-maven/" `find -name build.properties` -sed -i "s/distributionShortName=.*/distributionShortName=Maven/" `find -name build.properties` -sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build.properties` %{mvn_package} :apache-maven __noinstall %{mvn_package} ::mdo: __noinstall @@ -260,6 +255,7 @@ %{mvn_file} :{*} %{base_name}/@1 %build +(cd impl/maven-core && python3 %{SOURCE100} pom.xml >build.properties) mkdir -p lib build-jar-repository -s lib \ @@ -301,7 +297,9 @@ stax2-api \ woodstox-core -ant package javadoc +ant \ + -DbuildNumber= \ + package javadoc %{mvn_artifact} pom.xml %{mvn_artifact} api/pom.xml ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.lPpoBB/_old 2026-05-16 19:26:30.098895553 +0200 +++ /var/tmp/diff_new_pack.lPpoBB/_new 2026-05-16 19:26:30.102895717 +0200 @@ -1,6 +1,6 @@ -mtime: 1778443304 -commit: f722c90e569e762e21ec1e0962ce0ede536ed4d82703e5b9a970634131b81f3b +mtime: 1778888382 +commit: cf5dab42f22f8e8622c478ca8a016009e7781af470ad8b7977361b9b9045a338 url: https://src.opensuse.org/java-packages/maven4 -revision: f722c90e569e762e21ec1e0962ce0ede536ed4d82703e5b9a970634131b81f3b +revision: cf5dab42f22f8e8622c478ca8a016009e7781af470ad8b7977361b9b9045a338 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ apache-maven-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/impl/maven-core/build.xml new/impl/maven-core/build.xml --- old/impl/maven-core/build.xml 2025-11-03 10:17:01.573384232 +0100 +++ new/impl/maven-core/build.xml 2026-05-16 01:18:23.819043366 +0200 @@ -85,6 +85,9 @@ </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> + <filterchain> + <expandproperties/> + </filterchain> </copy> <mkdir dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/> <propertyfile file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties"> ++++++ 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-05-16 01:39:42.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ 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)
