NIFIREG-398: Updated versions to 0.7.0-SNAPSHOT instead of 1.0.0-SNAP… (#283)

* NIFIREG-398: Updated versions to 0.7.0-SNAPSHOT instead of 1.0.0-SNAPSHOT. Updated FlowClient to provide override for delete method in order to ensure backward compatibility. Updated VersionedProcessGroup to allow for FlowFile Concurrency and FlowFileOutboundPolicy and updated Flow Comparator to include these fields.

* NIFIREG-398: Updated BucketClient to allow for an override of delete() method that doesn't require RevisionInfo for backward compatibility
diff --git a/nifi-registry-assembly/pom.xml b/nifi-registry-assembly/pom.xml
index ec4bc07..d90e4da 100644
--- a/nifi-registry-assembly/pom.xml
+++ b/nifi-registry-assembly/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-assembly</artifactId>
     <packaging>pom</packaging>
@@ -114,7 +114,7 @@
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-web-docs</artifactId>
             <type>war</type>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-docs</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <classifier>resources</classifier>
             <scope>runtime</scope>
             <type>zip</type>
@@ -409,7 +409,7 @@
                 <dependency>
                     <groupId>org.apache.nifi.registry</groupId>
                     <artifactId>nifi-registry-ranger-assembly</artifactId>
-                    <version>1.0.0-SNAPSHOT</version>
+                    <version>0.7.0-SNAPSHOT</version>
                     <classifier>bin</classifier>
                     <scope>runtime</scope>
                     <type>zip</type>
@@ -452,7 +452,7 @@
                 <dependency>
                     <groupId>org.apache.nifi.registry</groupId>
                     <artifactId>nifi-registry-aws-assembly</artifactId>
-                    <version>1.0.0-SNAPSHOT</version>
+                    <version>0.7.0-SNAPSHOT</version>
                     <classifier>bin</classifier>
                     <scope>runtime</scope>
                     <type>zip</type>
diff --git a/nifi-registry-core/nifi-registry-bootstrap/pom.xml b/nifi-registry-core/nifi-registry-bootstrap/pom.xml
index aa3a8f3..af613ac 100644
--- a/nifi-registry-core/nifi-registry-bootstrap/pom.xml
+++ b/nifi-registry-core/nifi-registry-bootstrap/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-registry-bootstrap</artifactId>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/nifi-registry-core/nifi-registry-bundle-utils/pom.xml b/nifi-registry-core/nifi-registry-bundle-utils/pom.xml
index 810ea50..ea986fd 100644
--- a/nifi-registry-core/nifi-registry-bundle-utils/pom.xml
+++ b/nifi-registry-core/nifi-registry-bundle-utils/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-registry-bundle-utils</artifactId>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-data-model</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
diff --git a/nifi-registry-core/nifi-registry-client/pom.xml b/nifi-registry-core/nifi-registry-client/pom.xml
index a62feab..3ae832d 100644
--- a/nifi-registry-core/nifi-registry-client/pom.xml
+++ b/nifi-registry-core/nifi-registry-client/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-registry-client</artifactId>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-data-model</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-security-utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
diff --git a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/BucketClient.java b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/BucketClient.java
index 87a0592..7bc256a 100644
--- a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/BucketClient.java
+++ b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/BucketClient.java
@@ -56,6 +56,14 @@
      * Deletes the bucket with the given id.
      *
      * @param bucketId the id of the bucket to delete
+     * @return the deleted bucket
+     */
+    Bucket delete(String bucketId) throws NiFiRegistryException, IOException;
+
+    /**
+     * Deletes the bucket with the given id and revision
+     *
+     * @param bucketId the id of the bucket to delete
      * @param revision the revision info for the bucket being deleted
      * @return the deleted bucket
      */
diff --git a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/FlowClient.java b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/FlowClient.java
index 73f4e91..af8676f 100644
--- a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/FlowClient.java
+++ b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/FlowClient.java
@@ -80,6 +80,17 @@
      *
      * @param bucketId a bucket id
      * @param flowId the id of the flow to delete
+     * @return the deleted flow
+     * @throws NiFiRegistryException if an error is encountered other than IOException
+     * @throws IOException if an I/O error is encountered
+     */
+    VersionedFlow delete(String bucketId, String flowId) throws NiFiRegistryException, IOException;
+
+    /**
+     *  Deletes the flow with the given id in the given bucket.
+     *
+     * @param bucketId a bucket id
+     * @param flowId the id of the flow to delete
      * @param revision the revision information for the entity being deleted
      * @return the deleted flow
      * @throws NiFiRegistryException if an error is encountered other than IOException
diff --git a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/JerseyBucketClient.java b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/JerseyBucketClient.java
index 2be7b20..8c02e3a 100644
--- a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/JerseyBucketClient.java
+++ b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/JerseyBucketClient.java
@@ -106,15 +106,16 @@
     }
 
     @Override
+    public Bucket delete(final String bucketId) throws NiFiRegistryException, IOException {
+        return delete(bucketId, null);
+    }
+
+    @Override
     public Bucket delete(final String bucketId, final RevisionInfo revision) throws NiFiRegistryException, IOException {
         if (StringUtils.isBlank(bucketId)) {
             throw new IllegalArgumentException("Bucket ID cannot be blank");
         }
 
-        if (revision == null) {
-            throw new IllegalArgumentException("RevisionInfo cannot be null");
-        }
-
         return executeAction("Error deleting bucket", () -> {
             WebTarget target = bucketsTarget
                     .path("/{bucketId}")
diff --git a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/JerseyFlowClient.java b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/JerseyFlowClient.java
index 2e6d4e3..d17e27a 100644
--- a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/JerseyFlowClient.java
+++ b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/JerseyFlowClient.java
@@ -139,6 +139,11 @@
     }
 
     @Override
+    public VersionedFlow delete(final String bucketId, final String flowId) throws NiFiRegistryException, IOException {
+        return delete(bucketId, flowId, null);
+    }
+
+    @Override
     public VersionedFlow delete(final String bucketId, final String flowId, final RevisionInfo revision)
             throws NiFiRegistryException, IOException {
         if (StringUtils.isBlank(bucketId)) {
@@ -149,10 +154,6 @@
             throw new IllegalArgumentException("Flow Identifier cannot be blank");
         }
 
-        if (revision == null) {
-            throw new IllegalArgumentException("RevisionInfo cannot be null");
-        }
-
         return executeAction("Error deleting flow", () -> {
             WebTarget target = bucketFlowsTarget
                     .path("/{flowId}")
diff --git a/nifi-registry-core/nifi-registry-data-model/pom.xml b/nifi-registry-core/nifi-registry-data-model/pom.xml
index c404598..9522856 100644
--- a/nifi-registry-core/nifi-registry-data-model/pom.xml
+++ b/nifi-registry-core/nifi-registry-data-model/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-registry-data-model</artifactId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-revision-entity-model</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/FlowFileConcurrency.java b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/FlowFileConcurrency.java
new file mode 100644
index 0000000..fdd3f86
--- /dev/null
+++ b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/FlowFileConcurrency.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.nifi.registry.flow;
+
+public enum FlowFileConcurrency {
+    SINGLE_FLOWFILE_PER_NODE,
+    UNBOUNDED;
+}
diff --git a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/FlowFileOutboundPolicy.java b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/FlowFileOutboundPolicy.java
new file mode 100644
index 0000000..0b95936
--- /dev/null
+++ b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/FlowFileOutboundPolicy.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.nifi.registry.flow;
+
+public enum FlowFileOutboundPolicy {
+    STREAM_WHEN_AVAILABLE,
+    BATCH_OUTPUT;
+}
diff --git a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedProcessGroup.java b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedProcessGroup.java
index ef0d3fe..630cf33 100644
--- a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedProcessGroup.java
+++ b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedProcessGroup.java
@@ -42,6 +42,8 @@
     private Map<String, String> variables = new HashMap<>();
 
     private String parameterContextName;
+    private FlowFileConcurrency flowfileConcurrency;
+    private FlowFileOutboundPolicy flowfileOutboundPolicy;
 
     @ApiModelProperty("The child Process Groups")
     public Set<VersionedProcessGroup> getProcessGroups() {
@@ -156,4 +158,21 @@
         this.parameterContextName = parameterContextName;
     }
 
+    @ApiModelProperty(value = "The configured FlowFile Concurrency for the Process Group")
+    public FlowFileConcurrency getFlowFileConcurrency() {
+        return flowfileConcurrency;
+    }
+
+    public void setFlowFileConcurrency(final FlowFileConcurrency flowfileConcurrency) {
+        this.flowfileConcurrency = flowfileConcurrency;
+    }
+
+    @ApiModelProperty(value = "The FlowFile Outbound Policy for the Process Group")
+    public FlowFileOutboundPolicy getFlowFileOutboundPolicy() {
+        return flowfileOutboundPolicy;
+    }
+
+    public void setFlowFileOutboundPolicy(final FlowFileOutboundPolicy outboundPolicy) {
+        this.flowfileOutboundPolicy = outboundPolicy;
+    }
 }
diff --git a/nifi-registry-core/nifi-registry-docker/pom.xml b/nifi-registry-core/nifi-registry-docker/pom.xml
index 6d15988..cc91f3a 100644
--- a/nifi-registry-core/nifi-registry-docker/pom.xml
+++ b/nifi-registry-core/nifi-registry-docker/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-registry-core</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-registry-core/nifi-registry-docs/pom.xml b/nifi-registry-core/nifi-registry-docs/pom.xml
index 1a54f9c..c6aec1b 100644
--- a/nifi-registry-core/nifi-registry-docs/pom.xml
+++ b/nifi-registry-core/nifi-registry-docs/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <artifactId>nifi-registry-docs</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-web-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <type>war</type>
         </dependency>
     </dependencies>
diff --git a/nifi-registry-core/nifi-registry-flow-diff/pom.xml b/nifi-registry-core/nifi-registry-flow-diff/pom.xml
index a748cf8..68fb388 100644
--- a/nifi-registry-core/nifi-registry-flow-diff/pom.xml
+++ b/nifi-registry-core/nifi-registry-flow-diff/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-registry-flow-diff</artifactId>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-data-model</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
index 67c26ad..b4f29f7 100644
--- a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
+++ b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
@@ -258,11 +258,21 @@
     /**
      * The Process Group points to a different Versioned Flow in each of the flows
      */
-    VERSIONED_FLOW_COORDINATES_CHANGED("Versioned Flow Coordinates Changed");
+    VERSIONED_FLOW_COORDINATES_CHANGED("Versioned Flow Coordinates Changed"),
+
+    /**
+     * The Process Group's configured FlowFile Concurrency is different in each of the flows
+     */
+    FLOWFILE_CONCURRENCY_CHANGED("FlowFile Concurrency Changed"),
+
+    /**
+     * The Process Group's configured FlowFile Outbound Policy is different in each of the flows
+     */
+    FLOWFILE_OUTBOUND_POLICY_CHANGED("FlowFile Outbound Policy Changed");
 
     private final String description;
 
-    private DifferenceType(final String description) {
+    DifferenceType(final String description) {
         this.description = description;
     }
 
diff --git a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
index e4f5266..ce7373b 100644
--- a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
+++ b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
@@ -17,6 +17,8 @@
 
 package org.apache.nifi.registry.flow.diff;
 
+import org.apache.nifi.registry.flow.FlowFileConcurrency;
+import org.apache.nifi.registry.flow.FlowFileOutboundPolicy;
 import org.apache.nifi.registry.flow.VersionedComponent;
 import org.apache.nifi.registry.flow.VersionedConnection;
 import org.apache.nifi.registry.flow.VersionedControllerService;
@@ -331,6 +333,10 @@
         }
 
         addIfDifferent(differences, DifferenceType.VERSIONED_FLOW_COORDINATES_CHANGED, groupA, groupB, VersionedProcessGroup::getVersionedFlowCoordinates);
+        addIfDifferent(differences, DifferenceType.FLOWFILE_CONCURRENCY_CHANGED, groupA, groupB, VersionedProcessGroup::getFlowFileConcurrency,
+            true, FlowFileConcurrency.UNBOUNDED);
+        addIfDifferent(differences, DifferenceType.FLOWFILE_OUTBOUND_POLICY_CHANGED, groupA, groupB, VersionedProcessGroup::getFlowFileOutboundPolicy,
+            true, FlowFileOutboundPolicy.STREAM_WHEN_AVAILABLE);
 
         final VersionedFlowCoordinates groupACoordinates = groupA.getVersionedFlowCoordinates();
         final VersionedFlowCoordinates groupBCoordinates = groupB.getVersionedFlowCoordinates();
@@ -386,10 +392,22 @@
     }
 
     private <T extends VersionedComponent> void addIfDifferent(final Set<FlowDifference> differences, final DifferenceType type, final T componentA, final T componentB,
-        final Function<T, Object> transform, final boolean differentiateNullAndEmptyString) {
+                                                               final Function<T, Object> transform, final boolean differentiateNullAndEmptyString) {
+        addIfDifferent(differences, type, componentA, componentB, transform, differentiateNullAndEmptyString, null);
+    }
 
-        final Object valueA = transform.apply(componentA);
-        final Object valueB = transform.apply(componentB);
+    private <T extends VersionedComponent> void addIfDifferent(final Set<FlowDifference> differences, final DifferenceType type, final T componentA, final T componentB,
+        final Function<T, Object> transform, final boolean differentiateNullAndEmptyString, final Object defaultValue) {
+
+        Object valueA = transform.apply(componentA);
+        if (valueA == null) {
+            valueA = defaultValue;
+        }
+
+        Object valueB = transform.apply(componentB);
+        if (valueB == null) {
+            valueB = defaultValue;
+        }
 
         if (Objects.equals(valueA, valueB)) {
             return;
diff --git a/nifi-registry-core/nifi-registry-framework/pom.xml b/nifi-registry-core/nifi-registry-framework/pom.xml
index 9c9d82a..77173e6 100644
--- a/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>nifi-registry-framework</artifactId>
@@ -159,17 +159,17 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-data-model</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-properties</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <scope>provided</scope> <!-- will be in lib dir -->
         </dependency>
         <dependency>
@@ -185,17 +185,17 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-security-utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-bundle-utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-flow-diff</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -336,7 +336,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-test</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -393,7 +393,7 @@
 	    <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-flow-diff</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         </dependencies>
 
diff --git a/nifi-registry-core/nifi-registry-jetty/pom.xml b/nifi-registry-core/nifi-registry-jetty/pom.xml
index d88c610..19021aa 100644
--- a/nifi-registry-core/nifi-registry-jetty/pom.xml
+++ b/nifi-registry-core/nifi-registry-jetty/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-jetty</artifactId>
     <packaging>jar</packaging>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-properties</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
diff --git a/nifi-registry-core/nifi-registry-properties/pom.xml b/nifi-registry-core/nifi-registry-properties/pom.xml
index b596336..3c5ce2f 100644
--- a/nifi-registry-core/nifi-registry-properties/pom.xml
+++ b/nifi-registry-core/nifi-registry-properties/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-properties</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-registry-core/nifi-registry-provider-api/pom.xml b/nifi-registry-core/nifi-registry-provider-api/pom.xml
index 2f1737e..9114dac 100644
--- a/nifi-registry-core/nifi-registry-provider-api/pom.xml
+++ b/nifi-registry-core/nifi-registry-provider-api/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>nifi-registry-provider-api</artifactId>
diff --git a/nifi-registry-core/nifi-registry-resources/pom.xml b/nifi-registry-core/nifi-registry-resources/pom.xml
index a4c07a5..46cb528 100644
--- a/nifi-registry-core/nifi-registry-resources/pom.xml
+++ b/nifi-registry-core/nifi-registry-resources/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-resources</artifactId>
     <packaging>pom</packaging>
diff --git a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/pom.xml b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/pom.xml
index ef25285..19d904e 100644
--- a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/pom.xml
+++ b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-revision</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-revision-api</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-common/pom.xml b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-common/pom.xml
index 1618fee..ded7374 100644
--- a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-common/pom.xml
+++ b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-revision</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-revision-common</artifactId>
     <packaging>jar</packaging>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-revision-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-model/pom.xml b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-model/pom.xml
index 4c14487..2cde49b 100644
--- a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-model/pom.xml
+++ b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-model/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-revision</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-revision-entity-model</artifactId>
     <packaging>jar</packaging>
diff --git a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/pom.xml b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/pom.xml
index 53556de..2dfd15b 100644
--- a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/pom.xml
+++ b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-revision</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-revision-entity-service</artifactId>
     <packaging>jar</packaging>
@@ -27,12 +27,12 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-revision-entity-model</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-revision-common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <!-- Test dependencies -->
         <dependency>
diff --git a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
index a5807ad..85ca52b 100644
--- a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
+++ b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-revision</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-revision-spring-jdbc</artifactId>
     <packaging>jar</packaging>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-revision-common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-test</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-registry-core/nifi-registry-revision/pom.xml b/nifi-registry-core/nifi-registry-revision/pom.xml
index c3ce4d8..04b84fc 100644
--- a/nifi-registry-core/nifi-registry-revision/pom.xml
+++ b/nifi-registry-core/nifi-registry-revision/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-revision</artifactId>
     <packaging>pom</packaging>
diff --git a/nifi-registry-core/nifi-registry-runtime/pom.xml b/nifi-registry-core/nifi-registry-runtime/pom.xml
index 04740b2..f5159e5 100644
--- a/nifi-registry-core/nifi-registry-runtime/pom.xml
+++ b/nifi-registry-core/nifi-registry-runtime/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-runtime</artifactId>
     <packaging>jar</packaging>
@@ -26,17 +26,17 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-properties</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-jetty</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/nifi-registry-core/nifi-registry-security-api/pom.xml b/nifi-registry-core/nifi-registry-security-api/pom.xml
index 53f993c..a6c3204 100644
--- a/nifi-registry-core/nifi-registry-security-api/pom.xml
+++ b/nifi-registry-core/nifi-registry-security-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nifi-registry-core</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-registry-core/nifi-registry-security-utils/pom.xml b/nifi-registry-core/nifi-registry-security-utils/pom.xml
index 4a3b556..8b2e034 100644
--- a/nifi-registry-core/nifi-registry-security-utils/pom.xml
+++ b/nifi-registry-core/nifi-registry-security-utils/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-registry-security-utils</artifactId>
diff --git a/nifi-registry-core/nifi-registry-test/pom.xml b/nifi-registry-core/nifi-registry-test/pom.xml
index 6fac0d3..b2bc372 100644
--- a/nifi-registry-core/nifi-registry-test/pom.xml
+++ b/nifi-registry-core/nifi-registry-test/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-registry-test</artifactId>
diff --git a/nifi-registry-core/nifi-registry-utils/pom.xml b/nifi-registry-core/nifi-registry-utils/pom.xml
index 7c4b692..abf5ca1 100644
--- a/nifi-registry-core/nifi-registry-utils/pom.xml
+++ b/nifi-registry-core/nifi-registry-utils/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-registry-utils</artifactId>
diff --git a/nifi-registry-core/nifi-registry-web-api/pom.xml b/nifi-registry-core/nifi-registry-web-api/pom.xml
index a65a75a..456a0ad 100644
--- a/nifi-registry-core/nifi-registry-web-api/pom.xml
+++ b/nifi-registry-core/nifi-registry-web-api/pom.xml
@@ -19,10 +19,10 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-web-api</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <properties>
@@ -366,40 +366,40 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-framework</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-revision-spring-jdbc</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-revision-entity-service</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-properties</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <scope>provided</scope> <!-- This will be in the lib directory -->
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-security-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <scope>provided</scope> <!-- This will be in lib directory -->
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-provider-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <scope>provided</scope> <!-- This will be in lib directory -->
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-security-utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -427,13 +427,13 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-test</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-client</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-registry-core/nifi-registry-web-docs/pom.xml b/nifi-registry-core/nifi-registry-web-docs/pom.xml
index 5867215..52b45e4 100644
--- a/nifi-registry-core/nifi-registry-web-docs/pom.xml
+++ b/nifi-registry-core/nifi-registry-web-docs/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-web-docs</artifactId>
     <packaging>war</packaging>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/nifi-registry-core/nifi-registry-web-ui/pom.xml b/nifi-registry-core/nifi-registry-web-ui/pom.xml
index 656e69c..3dab0d3 100644
--- a/nifi-registry-core/nifi-registry-web-ui/pom.xml
+++ b/nifi-registry-core/nifi-registry-web-ui/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi.registry</groupId>
     <artifactId>nifi-registry-web-ui</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <properties>
         <frontend.source>${basedir}/src/main</frontend.source>
diff --git a/nifi-registry-core/pom.xml b/nifi-registry-core/pom.xml
index 98309fd..53235b7 100644
--- a/nifi-registry-core/pom.xml
+++ b/nifi-registry-core/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.nifi.registry</groupId>
     <artifactId>nifi-registry-core</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>The core modules of NiFi Registry.</description>
     <modules>
diff --git a/nifi-registry-docker-maven/dockermaven/pom.xml b/nifi-registry-docker-maven/dockermaven/pom.xml
index 4b00044..be8537c 100644
--- a/nifi-registry-docker-maven/dockermaven/pom.xml
+++ b/nifi-registry-docker-maven/dockermaven/pom.xml
@@ -15,9 +15,9 @@
     <parent>
         <artifactId>nifi-registry-docker-maven</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
 
     <artifactId>dockermaven</artifactId>
 
diff --git a/nifi-registry-docker-maven/pom.xml b/nifi-registry-docker-maven/pom.xml
index 3e9b405..a7c5d28 100644
--- a/nifi-registry-docker-maven/pom.xml
+++ b/nifi-registry-docker-maven/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -25,7 +25,7 @@
     
     <artifactId>nifi-registry-docker-maven</artifactId>
     <groupId>org.apache.nifi.registry</groupId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
 
     <modules>
         <module>dockermaven</module>
diff --git a/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/pom.xml b/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/pom.xml
index 5cee274..9117262 100644
--- a/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/pom.xml
+++ b/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-registry-aws</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-aws-extensions</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml b/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
index 8f5aab8..89da624 100644
--- a/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
+++ b/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-registry-aws</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-registry-extensions/nifi-registry-aws/pom.xml b/nifi-registry-extensions/nifi-registry-aws/pom.xml
index 3afc21e..7c3e26b 100644
--- a/nifi-registry-extensions/nifi-registry-aws/pom.xml
+++ b/nifi-registry-extensions/nifi-registry-aws/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-registry-extensions</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/pom.xml b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/pom.xml
index 0e896ac..a7e35c8 100644
--- a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/pom.xml
+++ b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-registry-ranger</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-ranger-plugin</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-jersey-bundle/pom.xml b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-jersey-bundle/pom.xml
index 6d62f59..b902495 100644
--- a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-jersey-bundle/pom.xml
+++ b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-jersey-bundle/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-registry-ranger</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
index df21832..bc556e9 100644
--- a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
+++ b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-registry-ranger</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-data-model</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <!--
             Since using the one in the war causes class loading issue between war and ranger/lib,
             this needs to be in ranger/lib.
@@ -42,21 +42,21 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-security-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <!-- The one in registry/lib can be used -->
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-properties</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <!-- The one in registry/lib can be used -->
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-ranger-jersey-bundle</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun.jersey</groupId>
diff --git a/nifi-registry-extensions/nifi-registry-ranger/pom.xml b/nifi-registry-extensions/nifi-registry-ranger/pom.xml
index 13fdf38..8cdefba 100644
--- a/nifi-registry-extensions/nifi-registry-ranger/pom.xml
+++ b/nifi-registry-extensions/nifi-registry-ranger/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-registry-extensions</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-registry-extensions/pom.xml b/nifi-registry-extensions/pom.xml
index 5f966f6..f88b51c 100644
--- a/nifi-registry-extensions/pom.xml
+++ b/nifi-registry-extensions/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nifi-registry</artifactId>
         <groupId>org.apache.nifi.registry</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nifi-registry-toolkit/nifi-registry-toolkit-assembly/pom.xml b/nifi-registry-toolkit/nifi-registry-toolkit-assembly/pom.xml
index 4175b87..1eac064 100644
--- a/nifi-registry-toolkit/nifi-registry-toolkit-assembly/pom.xml
+++ b/nifi-registry-toolkit/nifi-registry-toolkit-assembly/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-toolkit</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-toolkit-assembly</artifactId>
     <packaging>pom</packaging>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-toolkit-persistence</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/nifi-registry-toolkit/nifi-registry-toolkit-persistence/pom.xml b/nifi-registry-toolkit/nifi-registry-toolkit-persistence/pom.xml
index a97a186..53ce268 100644
--- a/nifi-registry-toolkit/nifi-registry-toolkit-persistence/pom.xml
+++ b/nifi-registry-toolkit/nifi-registry-toolkit-persistence/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry-toolkit</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     
     <artifactId>nifi-registry-toolkit-persistence</artifactId>
@@ -24,22 +24,22 @@
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-framework</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-provider-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-security-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-runtime</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
diff --git a/nifi-registry-toolkit/pom.xml b/nifi-registry-toolkit/pom.xml
index 03f2201..1f00e6c 100644
--- a/nifi-registry-toolkit/pom.xml
+++ b/nifi-registry-toolkit/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.nifi.registry</groupId>
         <artifactId>nifi-registry</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-registry-toolkit</artifactId>
     <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index ffc469d..4e5b44c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     </parent>
     <groupId>org.apache.nifi.registry</groupId>
     <artifactId>nifi-registry</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>Provides a central location for storage and management of shared resources across one or more instances
         of NiFi and/or MiNiFi.
@@ -228,44 +228,44 @@
             <dependency>
                 <groupId>org.apache.nifi.registry</groupId>
                 <artifactId>nifi-registry-utils</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>0.7.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.registry</groupId>
                 <artifactId>nifi-registry-bootstrap</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>0.7.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.registry</groupId>
                 <artifactId>nifi-registry-runtime</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>0.7.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.registry</groupId>
                 <artifactId>nifi-registry-security-api</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>0.7.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.registry</groupId>
                 <artifactId>nifi-registry-provider-api</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>0.7.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.registry</groupId>
                 <artifactId>nifi-registry-web-ui</artifactId>
                 <type>war</type>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>0.7.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.registry</groupId>
                 <artifactId>nifi-registry-web-api</artifactId>
                 <type>war</type>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>0.7.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.nifi.registry</groupId>
                 <artifactId>nifi-registry-resources</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>0.7.0-SNAPSHOT</version>
                 <classifier>resources</classifier>
                 <scope>runtime</scope>
                 <type>zip</type>