From 4042dbdeca7d5249507d28959ee0aca4e9859160 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Sat, 23 Mar 2024 21:23:41 +0100 Subject: [PATCH] Fix build --- src/it/sigOkKeysMapWithPluginDependencies/keysmap.list | 9 ++++++--- src/it/sigOkKeysMapWithPlugins/postbuild.groovy | 3 +-- src/it/snapshotProcess/pom-test.xml | 1 + src/it/snapshotSkip/pom-test.xml | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list b/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list index 6e82a8ec..2b9efad6 100644 --- a/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list +++ b/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list @@ -124,8 +124,7 @@ commons-validator:commons-validator:1.3.1 = 0xD196A5E3E70732EEB2E5007F1861C322C5 commons-validator:commons-validator:1.6 = 0xD6F1BC78607808EC8E9F69437A8860944FAD5F62 com.squareup:javapoet:1.7.0 = 0x9E84765A7AA3E3D3D5598A408E3F0DE7AE354651 com.sun.mail:mailapi:1.6.1 = 0x4F7E32D440EF90A83011A8FC6425559C47CC79C4 -com.thoughtworks.qdox:qdox:2.0-M9 = 0xB02137D875D833D9B23392ECAE5A7FB608A0221C -com.thoughtworks.qdox:qdox:2.0.1 = 0xB02137D875D833D9B23392ECAE5A7FB608A0221C +com.thoughtworks.qdox = 0xB02137D875D833D9B23392ECAE5A7FB608A0221C com.vaadin.external.google:android-json:0.0.20131108.vaadin1 = 0xCC57399D74CD7E4768ED6FA4CA62973FBF0451C0 com.vladsch.flexmark = 0x4008F9DFF7DBC968F35F9E712642156411CCE8B3 dom4j:dom4j:1.1 = noSig @@ -168,11 +167,12 @@ net.sf.jopt-simple:jopt-simple:5.0.3 = 0x517B94F8D0A46317A28D8AB30DA8A5EC02D11EA NullAway:test-java-lib:unspecified = noSig NullAway:test-library-models:unspecified = noSig org.apache.bcel:bcel:6.2 = 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB -org.apache.commons:commons-compress = 0xCE8075A251547BEE249BC151A2115AE15F6B8B72 +org.apache.commons:commons-compress = 0xCE8075A251547BEE249BC151A2115AE15F6B8B72, 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB, 0x8378BFAAD82FE5AA602AC356031EE010CA15D1EE org.apache.commons:commons-lang3 = 0xCD5464315F0B98C77E6E8ECD9DAADC1C9FCC82D0, 0xB6E73D84EA4FCC47166087253FAAD2CD5ECBB314, 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB org.apache.commons:commons-text = 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB org.apache.commons:commons-text:1.3 = 0xB6E73D84EA4FCC47166087253FAAD2CD5ECBB314 org.apache.commons:commons-collections4 = 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB + org.apache.httpcomponents = 0x0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5 org.apache.maven.doxia:doxia-core:1.2 = 0xB920D295BF0E61CB4CF0896C33CD6733AF5EC452 org.apache.maven.doxia:doxia-core:1.8 = 0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A @@ -287,16 +287,19 @@ org.codehaus.mojo:animal-sniffer-annotations:1.14 = 0x82F833963889D7ED06F1E4DC65 org.codehaus.mojo:animal-sniffer-annotations:1.17 = 0xF254B35617DC255D9344BCFA873A8E86B4372146 org.codehaus.plexus = \ + 0x09A808E1930F779CC6C54807E4C753D85335E876, \ 0x190D5A957FF22273E601F7A7C92C5FEC70161C62, \ 0x250EC75D1D52E967CE132C548B0378A57CD8E243, \ 0x32118CF76C9EC5D918E54967CA80D1F0EB6CA4BA, \ 0x47063E8BA7A6450E4A52E7AE466CAED6E0747D50, \ 0x4E532BB2FF51BCE63B39A33AA43EC0D4271F7981, \ 0x6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688, \ + 0x84789D24DF77A32433CE1F079EB80E92EB2135B1, \ 0x906E5E684729C006267DDD4B105DE36038D8C6C5, \ 0xAE9E53FC28FF2AB1012273D0BF1518E0160788A2, \ 0xB02137D875D833D9B23392ECAE5A7FB608A0221C, \ 0xBA926F64CA647B6D853A38672E2010F8A7FF4A41, \ + 0xEA23DB1360D9029481E7F2EFECDFEA3CB4493B94, \ 0xF254B35617DC255D9344BCFA873A8E86B4372146, \ 0xF404C15F367293CCCC0AF7B244146BCAA1F1E051, \ 0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A, \ diff --git a/src/it/sigOkKeysMapWithPlugins/postbuild.groovy b/src/it/sigOkKeysMapWithPlugins/postbuild.groovy index 96d68a0a..2603b685 100644 --- a/src/it/sigOkKeysMapWithPlugins/postbuild.groovy +++ b/src/it/sigOkKeysMapWithPlugins/postbuild.groovy @@ -30,8 +30,7 @@ assert buildLog.matches('(?ms).*^\\[INFO\\] org.apache.maven.plugins:maven-deplo assert buildLog.matches('(?ms).*^\\[INFO\\] org.apache.maven.plugins:maven-deploy-plugin:pom:.* PGP Signature OK$.*') assert buildLog.matches('(?ms).*^\\[INFO\\] org.apache.maven.plugins:maven-site-plugin:maven-plugin:.* PGP Signature OK$.*') assert buildLog.matches('(?ms).*^\\[INFO\\] org.apache.maven.plugins:maven-site-plugin:pom:.* PGP Signature OK$.*') -assert buildLog.contains('[INFO] org.apache.maven.plugins:maven-clean-plugin:maven-plugin:3.2.0 PGP Signature OK') -assert buildLog.contains('[INFO] org.apache.maven.plugins:maven-clean-plugin:pom:3.2.0 PGP Signature OK') +assert buildLog.matches('(?ms).*^\\[INFO\\] org.apache.maven.plugins:maven-clean-plugin:pom:.* PGP Signature OK$.*') assert buildLog.contains('[INFO] org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.12.0 PGP Signature OK') assert buildLog.contains('[INFO] org.apache.maven.plugins:maven-pmd-plugin:pom:3.12.0 PGP Signature OK') assert buildLog.contains('[INFO] net.sourceforge.pmd:pmd-java:jar:6.15.0 PGP Signature OK') diff --git a/src/it/snapshotProcess/pom-test.xml b/src/it/snapshotProcess/pom-test.xml index 2f2c0c1d..44197757 100644 --- a/src/it/snapshotProcess/pom-test.xml +++ b/src/it/snapshotProcess/pom-test.xml @@ -46,6 +46,7 @@ true + ignore diff --git a/src/it/snapshotSkip/pom-test.xml b/src/it/snapshotSkip/pom-test.xml index d80c9451..c69a6fa9 100644 --- a/src/it/snapshotSkip/pom-test.xml +++ b/src/it/snapshotSkip/pom-test.xml @@ -46,6 +46,7 @@ true + ignore