From 4a3272319c52c05f67e798eb90fd93e55542044c Mon Sep 17 00:00:00 2001
From: Kortanul <kortanul@protonmail.com>
Date: Tue, 21 Aug 2018 22:32:02 -0400
Subject: [PATCH 1/6] [4.3.2-SNAPSHOT] Prepare for next dev iteration

---
 persistit-core/pom.xml | 2 +-
 persistit-ui/pom.xml   | 2 +-
 pom.xml                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/persistit-core/pom.xml b/persistit-core/pom.xml
index c90dd846..e49fca58 100644
--- a/persistit-core/pom.xml
+++ b/persistit-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.forgerock.commons</groupId>
     <artifactId>forgerock-persistit</artifactId>
-    <version>4.3.1</version>
+    <version>4.3.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>forgerock-persistit-core</artifactId>
diff --git a/persistit-ui/pom.xml b/persistit-ui/pom.xml
index 007a27b8..35989b84 100644
--- a/persistit-ui/pom.xml
+++ b/persistit-ui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.forgerock.commons</groupId>
     <artifactId>forgerock-persistit</artifactId>
-    <version>4.3.1</version>
+    <version>4.3.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>forgerock-persistit-ui</artifactId>
diff --git a/pom.xml b/pom.xml
index 52281c85..95bd1d0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.forgerock.commons</groupId>
   <artifactId>forgerock-persistit</artifactId>
-  <version>4.3.1</version>
+  <version>4.3.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Wren Persistit</name>

From 0aeb2edd99f7eb5b6784734c4e8550f21b4fefef Mon Sep 17 00:00:00 2001
From: Kortanul <kortanul@protonmail.com>
Date: Tue, 21 Aug 2018 22:33:51 -0400
Subject: [PATCH 2/6] OCD Changes to Spacing

---
 persistit-core/pom.xml |  9 +++++++--
 pom.xml                | 14 +++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/persistit-core/pom.xml b/persistit-core/pom.xml
index e49fca58..ab4632d5 100644
--- a/persistit-core/pom.xml
+++ b/persistit-core/pom.xml
@@ -18,12 +18,12 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -40,6 +40,7 @@
           <include>LICENSE.txt</include>
         </includes>
       </resource>
+
       <resource>
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
@@ -47,6 +48,7 @@
           <include>com/persistit/persistit_version</include>
         </includes>
       </resource>
+
       <resource>
         <directory>src/main/resources</directory>
         <filtering>false</filtering>
@@ -61,15 +63,18 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>rmic-maven-plugin</artifactId>
       </plugin>
+
       <!-- check copyright/license headers -->
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 95bd1d0c..c41326e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
       <url>${forgerockDistMgmtReleasesUrl}</url>
     </repository>
   </distributionManagement>
-  
+
   <repositories>
     <!-- Needed to retrieve parent POM -->
     <repository>
@@ -89,14 +89,14 @@
         <artifactId>slf4j-api</artifactId>
         <version>1.7.7</version>
       </dependency>
-      
+
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.11</version>
         <scope>test</scope>
       </dependency>
-      
+
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
@@ -132,7 +132,7 @@
             </execution>
           </executions>
         </plugin>
-        
+
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
@@ -152,7 +152,7 @@
             </execution>
           </executions>
         </plugin>
-        
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -168,7 +168,7 @@
             </includes>
           </configuration>
         </plugin>
-        
+
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>rmic-maven-plugin</artifactId>
@@ -185,7 +185,7 @@
             </execution>
           </executions>
         </plugin>
-        
+
         <!-- check copyright/license headers -->
         <plugin>
           <groupId>com.mycila</groupId>

From 08c6bc06e0143ed19d81d729d6586fc158f86602 Mon Sep 17 00:00:00 2001
From: Kortanul <kortanul@protonmail.com>
Date: Tue, 21 Aug 2018 22:34:33 -0400
Subject: [PATCH 3/6] Upgrade to `wrensec-parent` 2.2.0

This gives us the ability to use the new PGP signing artifact. Version 1.2.0 contains the whitelist entries we need for Persistit.
---
 pom.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c41326e6..d7b29212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.forgerock</groupId>
-    <artifactId>forgerock-parent</artifactId>
-    <version>2.0.3</version>
+    <groupId>org.wrensecurity</groupId>
+    <artifactId>wrensec-parent</artifactId>
+    <version>2.2.0</version>
   </parent>
 
   <groupId>org.forgerock.commons</groupId>
@@ -80,6 +80,8 @@
     <animal-sniffer.signature.version>1.0</animal-sniffer.signature.version>
     <version.animal-sniffer.plugin>1.11</version.animal-sniffer.plugin>
     <version.maven-license.plugin>2.6</version.maven-license.plugin>
+
+    <pgpWhitelistArtifact>org.wrensecurity:wrensec-pgp-whitelist:1.2.0</pgpWhitelistArtifact>
   </properties>
 
   <dependencyManagement>

From 8bd17da7379258831aed653b2900dc2057f8d12e Mon Sep 17 00:00:00 2001
From: Kortanul <kortanul@protonmail.com>
Date: Tue, 21 Aug 2018 22:36:30 -0400
Subject: [PATCH 4/6] [OPENDJ-2753] Fix PDB Backend Version Reporting

Previously, version was being reported as:
```
dn: cn=userRoot PDB Database,cn=monitor
objectClass: top
objectClass: ds-monitor-entry
objectClass: extensibleObject
cn: userRoot PDB Database
PDBVersion: 4.3.1.${BZR_REVISION}
```

Now:
```
dn: cn=userRoot PDB Database,cn=monitor
objectClass: top
objectClass: ds-monitor-entry
objectClass: extensibleObject
cn: userRoot PDB Database
PDBVersion: 4.3.2-SNAPSHOT (rev f85144f52d4)
```
---
 persistit-core/pom.xml                        | 22 +++++++++++++++++++
 .../resources/com/persistit/persistit_version |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/persistit-core/pom.xml b/persistit-core/pom.xml
index ab4632d5..3c77ec6b 100644
--- a/persistit-core/pom.xml
+++ b/persistit-core/pom.xml
@@ -79,6 +79,28 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
       </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>buildnumber-maven-plugin</artifactId>
+        <version>1.4</version>
+
+        <executions>
+          <execution>
+            <id>generate-buildnumber</id>
+
+            <goals>
+              <goal>create</goal>
+            </goals>
+
+            <configuration>
+              <buildNumberPropertyName>buildRevision</buildNumberPropertyName>
+              <shortRevisionLength>11</shortRevisionLength>
+              <revisionOnScmFailure>-1</revisionOnScmFailure>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/persistit-core/src/main/resources/com/persistit/persistit_version b/persistit-core/src/main/resources/com/persistit/persistit_version
index aee0230f..9123ee1e 100644
--- a/persistit-core/src/main/resources/com/persistit/persistit_version
+++ b/persistit-core/src/main/resources/com/persistit/persistit_version
@@ -1 +1 @@
-${project.version}.${BZR_REVISION}
+${project.version} (rev ${buildRevision})

From 0fd3862711084836e25d475a69e5d5f54d29b5d2 Mon Sep 17 00:00:00 2001
From: Kortanul <kortanul@protonmail.com>
Date: Tue, 21 Aug 2018 22:41:28 -0400
Subject: [PATCH 5/6] Remove deprecated Wren Deploy properties

---
 .wren-deploy.rc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.wren-deploy.rc b/.wren-deploy.rc
index 83c55f34..fa7e9d83 100644
--- a/.wren-deploy.rc
+++ b/.wren-deploy.rc
@@ -1,6 +1,4 @@
 export MAVEN_PACKAGE="forgerock-persistit"
-export BINTRAY_PACKAGE="wrensec-persistit"
-export JFROG_PACKAGE="org/forgerock/commons/forgerock-persistit"
 
 # Per Peter Major: "The actual release was built with -DskipTests too..."
 # Source: https://gist.github.com/aldaris/fe234d76f3940c42ae9bb5aa69b8e98e

From ef4b38b30ba240e6db0ec90bc40cd167f08294bb Mon Sep 17 00:00:00 2001
From: Kortanul <kortanul@protonmail.com>
Date: Tue, 21 Aug 2018 22:43:41 -0400
Subject: [PATCH 6/6] Remove Wren Deploy Branch Filters

We're no longer building branches / tags for this project in bulk.
---
 .wren-deploy.rc | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.wren-deploy.rc b/.wren-deploy.rc
index fa7e9d83..888051c2 100644
--- a/.wren-deploy.rc
+++ b/.wren-deploy.rc
@@ -3,14 +3,3 @@ export MAVEN_PACKAGE="forgerock-persistit"
 # Per Peter Major: "The actual release was built with -DskipTests too..."
 # Source: https://gist.github.com/aldaris/fe234d76f3940c42ae9bb5aa69b8e98e
 export MVN_COMPILE_ARGS="${WREN_DEFAULT_MVN_COMPILE_ARGS:-} -DskipTests"
-
-package_accept_release_tag() {
-  local tag_name="${1}"
-
-  if [ "${tag_name}" != "4.3.1" ]; then
-    echo "Skipping ${tag_name} since we only want to build 4.3.1 right now."
-    return -1
-  else
-    return 0
-  fi
-}