Skip to content

Commit

Permalink
Merge pull request #31 from Kortanul/feature/13.5/upgrade-parent-pom
Browse files Browse the repository at this point in the history
[13.5] Upgrade to `wrensec-parent` 2.2.0 from 2.0.6
  • Loading branch information
Kortanul committed Jul 29, 2018
2 parents 581c340 + 5dfd641 commit 772b7a7
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .wren-deploy.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export MAVEN_PACKAGE="openam"
export QT_QPA_PLATFORM="offscreen"
24 changes: 21 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -48,9 +49,9 @@

<!-- Parent Project -->
<parent>
<groupId>org.forgerock</groupId>
<artifactId>forgerock-parent</artifactId>
<version>2.0.6</version>
<groupId>org.wrensecurity</groupId>
<artifactId>wrensec-parent</artifactId>
<version>2.2.0</version>
</parent>

<!-- Component Definition -->
Expand Down Expand Up @@ -195,6 +196,8 @@
<forgerock.license.artifactId>cddl-license</forgerock.license.artifactId>
<forgerock.license.version>1.0.0</forgerock.license.version>
<checkstyleFailOnError>false</checkstyleFailOnError>

<pgpWhitelistArtifact>org.wrensecurity:wrensec-pgp-whitelist:1.1.0</pgpWhitelistArtifact>
</properties>

<!-- Profiles -->
Expand Down Expand Up @@ -452,6 +455,21 @@
<enabled>true</enabled>
</releases>
</repository>

<!-- Needed to retrieve parent POM -->
<repository>
<id>wrensecurity-snapshots</id>
<name>Wren Security Snapshot Repository</name>
<url>https://wrensecurity.jfrog.io/wrensecurity/snapshots</url>

<snapshots>
<enabled>true</enabled>
</snapshots>

<releases>
<enabled>false</enabled>
</releases>
</repository>

<repository>
<id>oracle-repository</id>
Expand Down

0 comments on commit 772b7a7

Please sign in to comment.