From f1e54455e7849fce02449740bce4fb5bb66fd91c Mon Sep 17 00:00:00 2001
From: vramik <vramik@redhat.com>
Date: Thu, 27 Feb 2020 09:38:45 +0100
Subject: [PATCH] KEYCLOAK-13111 Move execution of db-allocator-plugin to jpa
 profile

---
 testsuite/integration-arquillian/pom.xml      | 36 +++++++++++--------
 .../integration-arquillian/tests/base/pom.xml | 36 +++++++++++--------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index e65a80195b..e8f2fe06e9 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -276,21 +276,7 @@
             </plugins>
         </pluginManagement>
 
-        <!-- Just allocate the DB now. It will be released after the tests, so the "release" is declared in the base-tests module -->
         <plugins>
-            <plugin>
-                <groupId>org.keycloak</groupId>
-                <artifactId>db-allocator-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>allocate-db</id>
-                        <goals>
-                            <goal>allocate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -336,6 +322,28 @@
     </modules>
     
     <profiles>
+        <profile>
+            <id>jpa</id>
+            <build>
+                <plugins>
+                    <!-- Just allocate the DB now. It will be released after the tests, so the "release" is declared in the base-tests module -->
+                    <plugin>
+                        <groupId>org.keycloak</groupId>
+                        <artifactId>db-allocator-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>allocate-db</id>
+                                <goals>
+                                    <goal>allocate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
         <profile>
             <id>test-70-migration</id>
             <properties>
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index 5389136e50..304f0d61f7 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -350,26 +350,32 @@
                 </executions>
             </plugin>
 
-            <!-- DB will be released after the test -->
-            <plugin>
-                <groupId>org.keycloak</groupId>
-                <artifactId>db-allocator-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>release-db</id>
-                        <goals>
-                            <goal>release</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
 
     </build>
 
     <profiles>
+        <profile>
+            <id>jpa</id>
+            <build>
+                <plugins>
+                    <!-- DB will be released after the test -->
+                    <plugin>
+                        <groupId>org.keycloak</groupId>
+                        <artifactId>db-allocator-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>release-db</id>
+                                <goals>
+                                    <goal>release</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>product</id>
             <activation>