Skip to content

Commit

Permalink
Merge pull request #267 from s4u/deprecate-failNoSignature
Browse files Browse the repository at this point in the history
Deprecate failNoSignature option
  • Loading branch information
slawekjaranowski authored Apr 15, 2021
2 parents 48c9bbf + a4146b6 commit 8c68189
Show file tree
Hide file tree
Showing 30 changed files with 93 additions and 244 deletions.
10 changes: 6 additions & 4 deletions src/it/noSigFail/postbuild.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Slawomir Jaranowski
* Copyright 2019-2021 Slawomir Jaranowski
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
def buildLog = new File( basedir, 'build.log' )
def buildLog = new File( basedir, 'build.log' ).text

assert buildLog.text.contains('[ERROR] No signature for junit:junit:jar:3.8')
assert buildLog.text.contains('[INFO] BUILD FAILURE')
assert buildLog.contains('[ERROR] Unsigned artifact is listed with key in keys map: junit:junit:jar:3.8')
assert buildLog.contains('[ERROR] Unsigned artifact is listed with key in keys map: junit:junit:pom:3.8')

assert buildLog.contains('[INFO] BUILD FAILURE')
16 changes: 0 additions & 16 deletions src/it/providedProcess/invoker.properties

This file was deleted.

3 changes: 1 addition & 2 deletions src/it/providedProcess/pom-test.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2015 Slawomir Jaranowski
~ Copyright 2015-2021 Slawomir Jaranowski
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -45,7 +45,6 @@
<artifactId>pgpverify-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<failNoSignature>true</failNoSignature>
<verifyProvidedDependencies>true</verifyProvidedDependencies>
</configuration>
<executions>
Expand Down
10 changes: 6 additions & 4 deletions src/it/providedProcess/postbuild.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Slawomir Jaranowski
* Copyright 2019-2021 Slawomir Jaranowski
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
def buildLog = new File( basedir, 'build.log' )
def buildLog = new File( basedir, 'build.log' ).text

assert buildLog.text.contains('[ERROR] No signature for junit:junit:jar:3.8')
assert buildLog.text.contains('[INFO] BUILD FAILURE')
assert buildLog.contains('[WARNING] No signature for junit:junit:jar:3.8')
assert buildLog.contains('[WARNING] No signature for junit:junit:pom:3.8')

assert buildLog.contains('[INFO] BUILD SUCCESS')
3 changes: 1 addition & 2 deletions src/it/providedSkip/pom-test.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2015 Slawomir Jaranowski
~ Copyright 2015-2021 Slawomir Jaranowski
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -45,7 +45,6 @@
<artifactId>pgpverify-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<failNoSignature>true</failNoSignature>
<verifyProvidedDependencies>false</verifyProvidedDependencies>
</configuration>
<executions>
Expand Down
16 changes: 0 additions & 16 deletions src/it/reactorProcessBundle/invoker.properties

This file was deleted.

10 changes: 6 additions & 4 deletions src/it/reactorProcessBundle/postbuild.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Slawomir Jaranowski
* Copyright 2019-2021 Slawomir Jaranowski
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
def buildLog = new File( basedir, 'build.log' )
def buildLog = new File( basedir, 'build.log' ).text

assert buildLog.text.contains('ERROR] No signature for test:project-bundle:jar:0.0.1')
assert buildLog.text.contains('[INFO] BUILD FAILURE')
assert buildLog.contains('[WARNING] No signature for test:project-bundle:jar:0.0.1')
assert buildLog.contains('[WARNING] No signature for test:project-bundle:pom:0.0.1')

assert buildLog.contains('[INFO] BUILD SUCCESS')
2 changes: 1 addition & 1 deletion src/it/reactorProcessBundle/project-verifier/pom-test.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2018 Wren Security
~ Copyright 2021 Slawomir Jaranowski
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -43,7 +44,6 @@
<artifactId>pgpverify-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<failNoSignature>true</failNoSignature>
<verifyReactorDependencies>true</verifyReactorDependencies>
</configuration>
<executions>
Expand Down
16 changes: 0 additions & 16 deletions src/it/reactorProcessJar/invoker.properties

This file was deleted.

10 changes: 6 additions & 4 deletions src/it/reactorProcessJar/postbuild.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Slawomir Jaranowski
* Copyright 2019-2021 Slawomir Jaranowski
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
def buildLog = new File( basedir, 'build.log' )
def buildLog = new File( basedir, 'build.log' ).text

assert buildLog.text.contains('[ERROR] No signature for test:project-jar:jar:0.0.1')
assert buildLog.text.contains('[INFO] BUILD FAILURE')
assert buildLog.contains('[WARNING] No signature for test:project-jar:jar:0.0.1')
assert buildLog.contains('[WARNING] No signature for test:project-jar:pom:0.0.1')

assert buildLog.contains('[INFO] BUILD SUCCESS')
2 changes: 1 addition & 1 deletion src/it/reactorProcessJar/project-verifier/pom-test.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2018 Wren Security
~ Copyright 2021 Slawomir Jaranowski
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -43,7 +44,6 @@
<artifactId>pgpverify-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<failNoSignature>true</failNoSignature>
<verifyReactorDependencies>true</verifyReactorDependencies>
</configuration>
<executions>
Expand Down
16 changes: 0 additions & 16 deletions src/it/reactorProcessPom/invoker.properties

This file was deleted.

8 changes: 4 additions & 4 deletions src/it/reactorProcessPom/postbuild.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Slawomir Jaranowski
* Copyright 2019-2021 Slawomir Jaranowski
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
def buildLog = new File( basedir, 'build.log' )
def buildLog = new File( basedir, 'build.log' ).text

assert buildLog.text.contains('[ERROR] No signature for test:project-pom:pom:0.0.1')
assert buildLog.text.contains('[INFO] BUILD FAILURE')
assert buildLog.contains('[WARNING] No signature for test:project-pom:pom:0.0.1')
assert buildLog.contains('[INFO] BUILD SUCCESS')
2 changes: 1 addition & 1 deletion src/it/reactorProcessPom/project-verifier/pom-test.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2018 Wren Security
~ Copyright 2021 Slawomir Jaranowski
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -44,7 +45,6 @@
<artifactId>pgpverify-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<failNoSignature>true</failNoSignature>
<verifyReactorDependencies>true</verifyReactorDependencies>
</configuration>
<executions>
Expand Down
16 changes: 0 additions & 16 deletions src/it/reactorProcessTestJar/invoker.properties

This file was deleted.

10 changes: 6 additions & 4 deletions src/it/reactorProcessTestJar/postbuild.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Slawomir Jaranowski
* Copyright 2019-2021 Slawomir Jaranowski
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
def buildLog = new File( basedir, 'build.log' )
def buildLog = new File( basedir, 'build.log' ).text

assert buildLog.text.contains('[ERROR] No signature for test:project-test-jar:test-jar:tests:0.0.1')
assert buildLog.text.contains('[INFO] BUILD FAILURE')
assert buildLog.contains('[WARNING] No signature for test:project-test-jar:test-jar:tests:0.0.1')
assert buildLog.contains('[WARNING] No signature for test:project-test-jar:pom:0.0.1')

assert buildLog.contains('[INFO] BUILD SUCCESS')
2 changes: 1 addition & 1 deletion src/it/reactorProcessTestJar/project-verifier/pom-test.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2018 Wren Security
~ Copyright 2021 Slawomir Jaranowski
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -44,7 +45,6 @@
<artifactId>pgpverify-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<failNoSignature>true</failNoSignature>
<verifyReactorDependencies>true</verifyReactorDependencies>
</configuration>
<executions>
Expand Down
16 changes: 0 additions & 16 deletions src/it/snapshotProcess/invoker.properties

This file was deleted.

3 changes: 1 addition & 2 deletions src/it/snapshotProcess/pom-test.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2015 Slawomir Jaranowski
~ Copyright 2015-2021 Slawomir Jaranowski
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -61,7 +61,6 @@
<artifactId>pgpverify-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<failNoSignature>true</failNoSignature>
<verifySnapshots>true</verifySnapshots>
</configuration>
<executions>
Expand Down
8 changes: 4 additions & 4 deletions src/it/snapshotProcess/postbuild.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Slawomir Jaranowski
* Copyright 2019-2021 Slawomir Jaranowski
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
def buildLog = new File( basedir, 'build.log' )
def buildLog = new File( basedir, 'build.log' ).text

assert buildLog.text.contains('[ERROR] No signature for org.apache.maven:maven-parent:pom:32-SNAPSHOT')
assert buildLog.text.contains('[INFO] BUILD FAILURE')
assert buildLog.contains('[WARNING] No signature for org.apache.maven:maven-parent:pom:32-SNAPSHOT')
assert buildLog.contains('[INFO] BUILD SUCCESS')
16 changes: 0 additions & 16 deletions src/it/systemProcess/invoker.properties

This file was deleted.

3 changes: 1 addition & 2 deletions src/it/systemProcess/pom-test.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2015 Slawomir Jaranowski
~ Copyright 2015-2021 Slawomir Jaranowski
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -48,7 +48,6 @@
<artifactId>pgpverify-maven-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<failNoSignature>true</failNoSignature>
<verifySystemDependencies>true</verifySystemDependencies>
</configuration>
<executions>
Expand Down
Loading

0 comments on commit 8c68189

Please sign in to comment.