From 66fd8aed49d0d2338cff4c1f3a4d5e0b3f933ce1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Jun 2021 15:36:06 +0000 Subject: [PATCH 1/2] Bump parent from 2.12.1 to 2.13.0 Bumps [parent](https://github.com/s4u/parent) from 2.12.1 to 2.13.0. - [Release notes](https://github.com/s4u/parent/releases) - [Commits](https://github.com/s4u/parent/compare/v2.12.1...v2.13.0) --- updated-dependencies: - dependency-name: org.simplify4u:parent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6de6be59..6541ff2e 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.simplify4u parent - 2.12.1 + 2.13.0 From 4855fd722ea19185a741161584e82632af5bbfd0 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 28 Jun 2021 19:09:15 +0200 Subject: [PATCH 2/2] fix after parent upgrade --- pom.xml | 2 ++ src/it/sigOkKeysMapWithPluginDependencies/keysmap.list | 8 +++++--- .../sigOkKeysMapWithPluginDependencies/postbuild.groovy | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6541ff2e..8fc896ca 100644 --- a/pom.xml +++ b/pom.xml @@ -577,6 +577,8 @@ org.apache.maven.plugins maven-dependency-plugin + + 3.1.2 diff --git a/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list b/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list index cccccd16..fb959bc7 100644 --- a/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list +++ b/src/it/sigOkKeysMapWithPluginDependencies/keysmap.list @@ -61,6 +61,7 @@ com.google.googlejavaformat:google-java-format:1.4 = 0xE77417AC194160A3FABD04969 com.google.guava = \ 0x56ED3B4843DAACC79DE555557457CA33C3CE9E15, \ + 0xBDC48EDEC8DE14B04EEEDCB000ECB0B904931A76, \ 0xBDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE com.google.gwt:gwt-user:2.8.2 = 0x1B2EF680A6214A56D6058515F6B09AEF9CC998B1 @@ -158,6 +159,7 @@ org.apache.bcel:bcel:6.2 = 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB org.apache.commons:commons-compress = 0xCE8075A251547BEE249BC151A2115AE15F6B8B72 org.apache.commons:commons-lang3 = 0xCD5464315F0B98C77E6E8ECD9DAADC1C9FCC82D0, 0xB6E73D84EA4FCC47166087253FAAD2CD5ECBB314, 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB org.apache.commons:commons-text = 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB +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 @@ -229,6 +231,7 @@ org.apache.maven.scm:*:1.10.0 = 0x6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688 org.apache.maven.shared = \ 0x0CDE80149711EB46DFF17AE421A24B3F8B0F594A, \ 0x190D5A957FF22273E601F7A7C92C5FEC70161C62, \ + 0x32118CF76C9EC5D918E54967CA80D1F0EB6CA4BA, \ 0x6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688, \ 0x82C9EC0E52C47A936A849E0113D979595E6D01E1, \ 0x849FB4F1AF3D17CDE4DE5E710704ADDF1D821345, \ @@ -236,6 +239,7 @@ org.apache.maven.shared = \ 0xB02137D875D833D9B23392ECAE5A7FB608A0221C, \ 0xB920D295BF0E61CB4CF0896C33CD6733AF5EC452, \ 0xBA926F64CA647B6D853A38672E2010F8A7FF4A41, \ + 0xCA491704D613780D2BEE00F2C6FC46EB51CF569C, \ 0xF254B35617DC255D9344BCFA873A8E86B4372146 org.apache.maven.wagon:wagon-http-lightweight:3.1.0 = 0x6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688 @@ -316,11 +320,9 @@ org.netbeans.lib:cvsclient:20060125 = noSig org.nibor.autolink:autolink:0.6.0 = 0x624B96CEB9896889C97B258F7DC3076FE22D4F88 org.objenesis = 0xE85AED155021AF8A6C6B7A4A7C7D8456294423BA org.opentest4j:opentest4j:1.0.0 = 0x58E79B6ABC762159DC0B1591164BD2247B936711 -org.ow2.asm:asm:5.0.3 = 0xA5BD02B93E7A40482EB1D66A5F69AD087600B22C -org.ow2.asm:asm:5.0.4 = 0xA5BD02B93E7A40482EB1D66A5F69AD087600B22C +org.ow2.asm:asm: = 0xA5BD02B93E7A40482EB1D66A5F69AD087600B22C org.ow2.asm:asm:6.1.1 = noSig org.ow2.asm:asm:6.2 = noSig -org.ow2.asm:asm:7.3.1 = 0xA5BD02B93E7A40482EB1D66A5F69AD087600B22C org.pcollections:pcollections:2.1.2 = 0x908366594E746BF3C449F5622BE5D98F751F4136 org.reactivestreams:reactive-streams:1.0.0 = 0xA5B2DDE7843E7CA3E8CAABD02383163BC40844FD org.skyscreamer:jsonassert:1.5.0 = 0xC89074FC8BE681B7C7EAAB6E4C5EED3C53B75933 diff --git a/src/it/sigOkKeysMapWithPluginDependencies/postbuild.groovy b/src/it/sigOkKeysMapWithPluginDependencies/postbuild.groovy index 99af5de2..cb56d312 100644 --- a/src/it/sigOkKeysMapWithPluginDependencies/postbuild.groovy +++ b/src/it/sigOkKeysMapWithPluginDependencies/postbuild.groovy @@ -31,7 +31,6 @@ assert buildLog.matches('(?ms).*^\\[INFO\\] commons-digester:commons-digester:ja assert buildLog.matches('(?ms).*^\\[INFO\\] org.apache.velocity:velocity-tools:jar:.* PGP Signature OK$.*') assert buildLog.matches('(?ms).*^\\[INFO\\] org.codehaus.plexus:plexus-io:jar:.* PGP Signature OK$.*') assert buildLog.matches('(?ms).*^\\[INFO\\] org.iq80.snappy:snappy:jar:.* PGP Signature OK$.*') -assert buildLog.matches('(?ms).*^\\[INFO\\] org.apache.maven:maven-compat:jar:.* PGP Signature OK$.*') assert buildLog.matches('(?ms).*^\\[INFO\\] org.apache.maven.shared:maven-dependency-tree:jar:.* PGP Signature OK$.*') assert buildLog.matches('(?ms).*^\\[INFO\\] org.sonatype.plexus:plexus-sec-dispatcher:jar:.* PGP Signature OK$.*') assert buildLog.matches('(?ms).*^\\[INFO\\] org.codehaus.mojo:animal-sniffer-annotations:jar:.* PGP Signature OK$.*')