Merge pull request #3321 from aloubyansky/WFCORE-3872

[WFCORE-3872] Upgrade to WildFly Galleon plugins 1.0.0.CR11 and fork e…
wildfly · May 24, 2018 · dd34d2b · dd34d2b
2 parents be3e037 + 096e4fd
commit dd34d2b
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 1 deletion.
diff --git a/build/pom.xml b/build/pom.xml
@@ -62,6 +62,7 @@
                             <install-dir>${project.build.directory}/${project.build.finalName}</install-dir>
                             <plugin-options>
                                 <jboss-maven-dist/>
+                                <jboss-fork-embedded/>
                             </plugin-options>
                             <feature-packs>
                                 <feature-pack>

diff --git a/core-galleon-pack/pom.xml b/core-galleon-pack/pom.xml
@@ -596,6 +596,7 @@
                         </goals>
                         <phase>compile</phase>
                         <configuration>
+                            <fork-embedded>true</fork-embedded>
                             <output-dir>${basedir}/target/resources/features</output-dir>
                             <standalone-extensions>
                                 <extension>org.jboss.as.deployment-scanner</extension>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -71,6 +71,9 @@
                                 </goals>
                                 <configuration>
                                     <install-dir>${basedir}/target/${project.build.finalName}</install-dir>
+                                    <plugin-options>
+                                        <jboss-fork-embedded/>
+                                    </plugin-options>
                                     <feature-packs>
                                         <feature-pack>
                                             <groupId>org.wildfly.core</groupId>

diff --git a/pom.xml b/pom.xml
@@ -104,7 +104,7 @@
         <version.org.jboss.galleon>1.0.0.CR3</version.org.jboss.galleon>
         <version.org.wildfly.build-tools>1.2.10.Final</version.org.wildfly.build-tools>
         <version.org.wildfly.checkstyle-config>1.0.5.Final</version.org.wildfly.checkstyle-config>
-        <version.org.wildfly.galleon-plugins>1.0.0.CR6</version.org.wildfly.galleon-plugins>
+        <version.org.wildfly.galleon-plugins>1.0.0.CR11</version.org.wildfly.galleon-plugins>
         <!-- wildfly plugin-->
         <version.org.wildfly.plugin>1.2.0.Final</version.org.wildfly.plugin>
         <!-- plugins related to wildfly build and tooling -->

diff --git a/testsuite/domain/pom.xml b/testsuite/domain/pom.xml
@@ -98,6 +98,9 @@
                         <phase>compile</phase>
                         <configuration>
                             <install-dir>${project.build.directory}/${server.output.dir.prefix}</install-dir>
+                            <plugin-options>
+                                <jboss-fork-embedded/>
+                            </plugin-options>
                             <feature-packs>
                                 <feature-pack>
                                     <groupId>org.wildfly.core</groupId>

diff --git a/testsuite/elytron/pom.xml b/testsuite/elytron/pom.xml
@@ -115,6 +115,9 @@
                             <phase>process-test-resources</phase>
                             <configuration>
                                 <install-dir>${project.build.directory}/${server.output.dir.prefix}</install-dir>
+                                <plugin-options>
+                                    <jboss-fork-embedded/>
+                                </plugin-options>
                                 <feature-packs>
                                     <feature-pack>
                                         <groupId>org.wildfly.core</groupId>

diff --git a/testsuite/manualmode/pom.xml b/testsuite/manualmode/pom.xml
@@ -127,6 +127,9 @@
                                 <phase>process-test-resources</phase>
                                 <configuration>
                                     <install-dir>${project.build.directory}/${server.output.dir.prefix}</install-dir>
+                                    <plugin-options>
+                                        <jboss-fork-embedded/>
+                                    </plugin-options>
                                     <feature-packs>
                                         <feature-pack>
                                             <groupId>org.wildfly.core</groupId>

diff --git a/testsuite/patching/pom.xml b/testsuite/patching/pom.xml
@@ -76,6 +76,9 @@
                         <phase>compile</phase>
                         <configuration>
                             <install-dir>${project.build.directory}/${server.output.dir.prefix}</install-dir>
+                            <plugin-options>
+                                <jboss-fork-embedded/>
+                            </plugin-options>
                             <feature-packs>
                                 <feature-pack>
                                     <groupId>org.wildfly.core</groupId>

diff --git a/testsuite/rbac/pom.xml b/testsuite/rbac/pom.xml
@@ -75,6 +75,9 @@
                         <phase>generate-test-resources</phase>
                         <configuration>
                             <install-dir>${project.build.directory}/${server.output.dir.prefix}</install-dir>
+                            <plugin-options>
+                                <jboss-fork-embedded/>
+                            </plugin-options>
                             <feature-packs>
                                 <feature-pack>
                                     <groupId>org.wildfly.core</groupId>

diff --git a/testsuite/standalone/pom.xml b/testsuite/standalone/pom.xml
@@ -121,6 +121,9 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <install-dir>${project.build.directory}/${server.output.dir.prefix}</install-dir>
+                            <plugin-options>
+                                <jboss-fork-embedded/>
+                            </plugin-options>
                             <feature-packs>
                                 <feature-pack>
                                     <groupId>org.wildfly.core</groupId>