From 7496a2095d8f0e8c0f0d531f32e21d07fdde84c3 Mon Sep 17 00:00:00 2001 From: Kortanul Date: Sat, 16 Jun 2018 23:10:52 -0400 Subject: [PATCH 1/4] Add support for SNAPSHOT Parent POMs This allows us to try out new versions of the `wrensec-parent` POM in the future. --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index e1306ffa51..29d956cbd7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,6 +3,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2011-2016 ForgeRock AS. All Rights Reserved +* Portions Copyright 2018 Wren Security. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -452,6 +453,21 @@ true + + + + wrensecurity-snapshots + Wren Security Snapshot Repository + https://wrensecurity.jfrog.io/wrensecurity/snapshots + + + true + + + + false + + oracle-repository From 65bd73ed35373a8e1064044dfd2f4e5692023dd3 Mon Sep 17 00:00:00 2001 From: Kortanul Date: Sat, 16 Jun 2018 23:11:14 -0400 Subject: [PATCH 2/4] Upgrade parent POM to 2.2.0 Fixes issues with PGP verification. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 29d956cbd7..5a9a6af84b 100644 --- a/pom.xml +++ b/pom.xml @@ -49,9 +49,9 @@ - org.forgerock - forgerock-parent - 2.0.6 + org.wrensecurity + wrensec-parent + 2.2.0 From f484377e6e272cc2674ecba2ac0a4a59e621affb Mon Sep 17 00:00:00 2001 From: Kortanul Date: Fri, 27 Jul 2018 00:30:07 -0400 Subject: [PATCH 3/4] Add Wren Deploy RC File `QT_QPA_PLATFORM=offscreen" is used to resolve the error "QXcbConnection: Could not connect to display" from PhantomJS, per https://github.com/ariya/phantomjs/issues/14376#issuecomment-236213526. --- .wren-deploy.rc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .wren-deploy.rc diff --git a/.wren-deploy.rc b/.wren-deploy.rc new file mode 100644 index 0000000000..1ae6273307 --- /dev/null +++ b/.wren-deploy.rc @@ -0,0 +1,2 @@ +export MAVEN_PACKAGE="openam" +export QT_QPA_PLATFORM="offscreen" From 5dfd641dd8d78723f61ab443254efa452af72eac Mon Sep 17 00:00:00 2001 From: Kortanul Date: Sun, 29 Jul 2018 01:58:55 -0400 Subject: [PATCH 4/4] Pin to Wren PGP Whitelist 1.1.0 This version of the whitelist contains PGP keys for AM 13.5.1 and should fix the build. --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 5a9a6af84b..1acc80cfae 100644 --- a/pom.xml +++ b/pom.xml @@ -196,6 +196,8 @@ cddl-license 1.0.0 false + + org.wrensecurity:wrensec-pgp-whitelist:1.1.0