commit 7b3606bb4c85c0be636677c6850b9158c5696a4e
author ondrejm <ondrej.mihalyi@gmail.com> Tue Jul 12 08:51:50 2016 +0200
committer John D. Ament <johndament@apache.org> Tue Jul 12 23:53:18 2016 -0400
tree 2c7c006e51c2e687cabff3530f17410a830c37f1
parent 92da915acc848ced9222ac7d3a9cdcfd52d2673c

DELTASPIKE-1181 Fixes for payara-build-managed-4 profile
https://issues.apache.org/jira/browse/DELTASPIKE-1181
 - Fix of failing CDI test
 - Fix of missing profile for Payara in data module
 - Fix of Java 8 test

This closes #58

deltaspike/modules/data/impl/pom.xml

diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml
index c05e9c8..f35aa59 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -262,6 +262,19 @@
             </build>
         </profile>
         <profile>
+            <id>payara-build-managed-4</id>
+            <build>
+                <testResources>
+                    <testResource>
+                        <directory>src/test/resources</directory>
+                    </testResource>
+                    <testResource>
+                        <directory>src/test/resources-glassfish</directory>
+                    </testResource>
+                </testResources>
+            </build>
+        </profile>
+        <profile>
             <id>tomee-build-managed</id>
             <build>
                 <testResources>

deltaspike/modules/data/test-java8/pom.xml

diff --git a/deltaspike/modules/data/test-java8/pom.xml b/deltaspike/modules/data/test-java8/pom.xml
index b154f1a..038cb75 100644
--- a/deltaspike/modules/data/test-java8/pom.xml
+++ b/deltaspike/modules/data/test-java8/pom.xml
@@ -81,6 +81,15 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -226,6 +235,19 @@
             </build>
         </profile>
         <profile>
+            <id>payara-build-managed-4</id>
+            <build>
+                <testResources>
+                    <testResource>
+                        <directory>src/test/resources</directory>
+                    </testResource>
+                    <testResource>
+                        <directory>src/test/resources-glassfish</directory>
+                    </testResource>
+                </testResources>
+            </build>
+        </profile>
+        <profile>
             <id>wls-remote-12c</id>
             <build>
                 <testResources>

deltaspike/modules/data/test-java8/src/test/java/org/apache/deltaspike/data/test/java8/test/Java8Test.java

diff --git a/deltaspike/modules/data/test-java8/src/test/java/org/apache/deltaspike/data/test/java8/test/Java8Test.java b/deltaspike/modules/data/test-java8/src/test/java/org/apache/deltaspike/data/test/java8/test/Java8Test.java
index 6708319..ec3b9ff 100644
--- a/deltaspike/modules/data/test-java8/src/test/java/org/apache/deltaspike/data/test/java8/test/Java8Test.java
+++ b/deltaspike/modules/data/test-java8/src/test/java/org/apache/deltaspike/data/test/java8/test/Java8Test.java
@@ -43,6 +43,8 @@
 import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
+import java.util.Collections;
+import java.util.List;
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
 import static org.apache.deltaspike.data.test.java8.util.TestDeployments.initDeployment;
@@ -156,7 +158,9 @@
         entityManager.persist(new Simple("b"));
 
         Stream<String> names = simpleRepository2.findSimpleNames();
+        final List<String> actualSorted = names.collect(toList());
+        Collections.sort(actualSorted);
 
-        Assert.assertEquals(asList("a","b"), names.collect(toList()));
+        Assert.assertEquals(asList("a","b"), actualSorted);
     }
 }