From 2945acaffdea2b4a47ca50143f72ae3ec966c523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCnger?= Date: Fri, 15 May 2026 21:53:16 +0200 Subject: [PATCH 1/4] Update to parent 48, Maven 3.9.15 --- pom.xml | 7 +++++-- src/it/check-buildplan-info/pom.xml | 4 ++-- src/it/compare-flatten/pom.xml | 2 +- src/it/compare-mono/pom.xml | 2 +- src/it/git-mono/pom.xml | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 47ad2c0..bb65105 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,8 @@ org.apache.maven.plugins maven-plugins - 47 + + 48 @@ -35,6 +36,7 @@ Plugin to manage artifacts tasks + 3.6.3 @@ -60,11 +62,12 @@ - 3.9.14 + 3.9.15 1.9.27 2.1.0 8 2025-09-29T16:18:23Z + 1.7.3 diff --git a/src/it/check-buildplan-info/pom.xml b/src/it/check-buildplan-info/pom.xml index b01cf47..a78dd0b 100644 --- a/src/it/check-buildplan-info/pom.xml +++ b/src/it/check-buildplan-info/pom.xml @@ -22,7 +22,7 @@ org.apache.maven maven-parent - 39 + 48 org.apache.maven.plugins.it @@ -40,7 +40,7 @@ maven-remote-resources-plugin - 3.3.0 + @version.maven-resources-plugin@ diff --git a/src/it/compare-flatten/pom.xml b/src/it/compare-flatten/pom.xml index 0c3c784..f613b6e 100644 --- a/src/it/compare-flatten/pom.xml +++ b/src/it/compare-flatten/pom.xml @@ -69,7 +69,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.2 + @version.flatten-maven-plugin@ flattened-pom.xml diff --git a/src/it/compare-mono/pom.xml b/src/it/compare-mono/pom.xml index 7d86283..920231f 100644 --- a/src/it/compare-mono/pom.xml +++ b/src/it/compare-mono/pom.xml @@ -23,7 +23,7 @@ org.apache.maven maven-parent - 39 + 48 org.apache.maven.plugins.it.compare diff --git a/src/it/git-mono/pom.xml b/src/it/git-mono/pom.xml index ba73928..2578916 100644 --- a/src/it/git-mono/pom.xml +++ b/src/it/git-mono/pom.xml @@ -76,7 +76,7 @@ maven-jar-plugin - 3.4.1 + @version.maven-jar-plugin@ From 19b76e9c20ca1222d974216047129f545ea3de78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCnger?= Date: Fri, 5 Jun 2026 13:47:29 +0200 Subject: [PATCH 2/4] Add Guillaume's Key to list --- pgp-keys-map.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgp-keys-map.list b/pgp-keys-map.list index f713d66..86f9d12 100644 --- a/pgp-keys-map.list +++ b/pgp-keys-map.list @@ -34,7 +34,7 @@ org.apache.maven.* = 0xB920D295BF0E61CB4CF0896C33CD6733AF5EC452,0x6A814B1F869C2B org.apache.velocity.* = 0x7B9751FC3F01F134F476464CD0EB627D4885CED1, 0x6F9D10E747DC79485ABB4F72B709E61252F136DD, 0xCE4439C1BEF3DA83B1832F9DBEFEEF227A98B809 org.apache.xbean:xbean-reflect = 0x223D3A74B068ECA354DC385CE126833F9CF64915 org.apiguardian:apiguardian-api = 0xFF6E2C001948C5F2F38B0CC385911F425EC61B51 -org.codehaus.plexus = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1,0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A,0xB91AB7D2121DC6B0A61AA182D7742D58455ECC7C,0xF254B35617DC255D9344BCFA873A8E86B4372146,0x09A808E1930F779CC6C54807E4C753D85335E876,0x190D5A957FF22273E601F7A7C92C5FEC70161C62,0x073F7A9345756F3B40CDB99E6C70A3B7599C5736,0x32118CF76C9EC5D918E54967CA80D1F0EB6CA4BA +org.codehaus.plexus = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1,0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A,0xB91AB7D2121DC6B0A61AA182D7742D58455ECC7C,0xF254B35617DC255D9344BCFA873A8E86B4372146,0x09A808E1930F779CC6C54807E4C753D85335E876,0x190D5A957FF22273E601F7A7C92C5FEC70161C62,0x073F7A9345756F3B40CDB99E6C70A3B7599C5736,0x32118CF76C9EC5D918E54967CA80D1F0EB6CA4BA,0xEA23DB1360D9029481E7F2EFECDFEA3CB4493B94 org.codehaus.plexus:plexus-i18n:jar:1.0-beta-10 = noSig org.codehaus.plexus:plexus-i18n:pom:1.0-beta-10 = noSig org.eclipse.sisu = 0x88BE34F94BDB2B5357044E2E3A387D43964143E3 From 77867e669c8a0bc33ff91538f8c2f4112c09311d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCnger?= Date: Fri, 5 Jun 2026 14:24:07 +0200 Subject: [PATCH 3/4] Make IT to work with changing parent version --- src/it/check-buildplan-info/pom.xml | 2 +- src/it/check-buildplan-info/verify.groovy | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/it/check-buildplan-info/pom.xml b/src/it/check-buildplan-info/pom.xml index a78dd0b..d41e556 100644 --- a/src/it/check-buildplan-info/pom.xml +++ b/src/it/check-buildplan-info/pom.xml @@ -40,7 +40,7 @@ maven-remote-resources-plugin - @version.maven-resources-plugin@ + @version.maven-remote-resources-plugin@ diff --git a/src/it/check-buildplan-info/verify.groovy b/src/it/check-buildplan-info/verify.groovy index 9fca08d..7ebe779 100644 --- a/src/it/check-buildplan-info/verify.groovy +++ b/src/it/check-buildplan-info/verify.groovy @@ -21,4 +21,9 @@ def buildLog = new File(basedir, 'build.log').text // https://issues.apache.org/jira/browse/MARTIFACT-24 & MARTIFACT-53 & MARTIFACT-71 -assert buildLog.contains('[INFO] property (= 2022-12-11T20:07:23Z) is inherited, you can override in pom.xml') +//assert buildLog.contains('[INFO] property (= 2022-12-11T20:07:23Z) is inherited, you can override in pom.xml') +// Afaik it's not possible to get a property from a parent when the own project (here: maven-artifact-plugin) overwrites it. +// So it's not possible to pass the outputTimestamp property from maven-parent to the invoker-plugin as a script variable to be a checked here. +// Therefore the string to be checked is divided to not contain a fixed timestamp. +assert buildLog.contains("[INFO] property (= ") +assert buildLog.contains(" is inherited, you can override in pom.xml") \ No newline at end of file From 43b2cbaf793250e81e4285d2d84f6667878175ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCnger?= Date: Sat, 6 Jun 2026 11:44:59 +0200 Subject: [PATCH 4/4] 3.9.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb65105..06d660d 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ - 3.9.15 + 3.9.16 1.9.27 2.1.0 8