Update vCPE example for A&AI custom query

The change in policy-models to use custom queries means that the named
queries used in apex examples must be updated to use custom queries.
This review is the second of two reviews to implement this change.

This patch updates the policy and its associated tests to work with A&AI
custom queries.

Issue-ID: POLICY-2125
Change-Id: I6a5b90002e43272e3cf296158f09f91a0f6d6907
Signed-off-by: liamfallon <liam.fallon@est.tech>
diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml
index 16bae18..9f6c285 100644
--- a/examples/examples-onap-vcpe/pom.xml
+++ b/examples/examples-onap-vcpe/pom.xml
@@ -93,11 +93,11 @@
 
     <build>
         <plugins>
-            <!-- Generate the APEX Policy JSON from the APEX CLI command -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
                 <executions>
+                    <!-- Generate the APEX Policy JSON from the APEX CLI command -->
                     <execution>
                         <id>generate-policy</id>
                         <phase>compile</phase>
@@ -115,13 +115,7 @@
                             </arguments>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <!-- Generate the APEX ToscaPolicy JSON file-->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
+                    <!-- Generate the APEX ToscaPolicy JSON file-->
                     <execution>
                         <id>generate-tosca-policy</id>
                         <phase>compile</phase>