From cf11b5fe426efaaccd2156a010c46468bc5f14c1 Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Tue, 16 Jan 2018 09:15:03 +0000
Subject: [PATCH 1/2] Added micro container

---
 pom.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6231da94f..9af49f798 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
             (these are downloaded and installed in these versions by Maven for the CI profiles)
          -->
         <payara.version>4.1.2.173</payara.version>
+        <payara.micro.version>5.Beta1</payara.micro.version>
         <glassfish.version>4.1.1</glassfish.version>
         <liberty.version>16.0.0.3</liberty.version>
         <wildfly.version>10.1.0.Final</wildfly.version>
@@ -421,6 +422,57 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>payara-micro-managed</id>
+            <dependencies>
+                <!-- The Arquillian connector -->
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>arquillian-payara-micro-4-managed</artifactId> 
+                    <version>1.0.Beta2</version> 
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <!-- Download Payara Micro and copy to target directory -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-test-classes</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>fish.payara.extras</groupId>
+                                            <artifactId>payara-micro</artifactId>
+                                            <version>${payara.micro.version}</version>
+                                            <overWrite>false</overWrite>
+                                            <outputDirectory>${session.executionRootDirectory}/target/</outputDirectory>
+                                            <destFileName>payara-micro-${payara.micro.version}.jar</destFileName>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Configure Payara Micro Runtime -->
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <environmentVariables>
+                                <MICRO_JAR>${session.executionRootDirectory}/target/payara-micro-${payara.micro.version}.jar</MICRO_JAR>
+                            </environmentVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         
         <profile>
             <id>payara-embedded</id>

From e974af6767ca83459428114a38441938b20c3f71 Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Tue, 16 Jan 2018 11:53:13 +0000
Subject: [PATCH 2/2] Added -DskipJMS flag. Defaults to true in Payara Micro
 profile and false otherwise.

---
 jms/pom.xml | 11 +++++++++++
 pom.xml     |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/jms/pom.xml b/jms/pom.xml
index c207414a8..8a11eabab 100644
--- a/jms/pom.xml
+++ b/jms/pom.xml
@@ -28,6 +28,17 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skipJMS}</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <profiles>
         <profile>
diff --git a/pom.xml b/pom.xml
index 9af49f798..897f27b1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
         <skipCDI>${skipTests}</skipCDI>
         <skipJSF>${skipTests}</skipJSF>
         <skipJACC>${skipTests}</skipJACC>
+        <skipJMS>${skipTests}</skipJMS>
         
         <!-- 
             Application Server versions 
@@ -425,6 +426,11 @@
 
         <profile>
             <id>payara-micro-managed</id>
+
+            <properties>
+                <skipJMS>true</skipJMS>
+            </properties>
+
             <dependencies>
                 <!-- The Arquillian connector -->
                 <dependency>
@@ -434,6 +440,7 @@
                     <scope>test</scope>
                 </dependency>
             </dependencies>
+
             <build>
                 <plugins>
                     <!-- Download Payara Micro and copy to target directory -->