From 2bcb206752e728d3698560ce0bfd3e8cbc0b1a77 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Mon, 31 Jul 2017 11:20:55 +0100
Subject: [PATCH] PAYARA-1875 (#1818)

* PAYARA-1875 First pass at JDK8 profile

* PAYARA-1875 Fix missing "profiles" tags
---
 .../payara-micro-distribution/pom.xml         | 40 +++++++++++--------
 .../pom.xml                                   | 40 +++++++++++--------
 appserver/featuresets/payara-web/pom.xml      | 27 +++++++++----
 appserver/packager/pom.xml                    | 13 +++++-
 appserver/payara-appserver-modules/pom.xml    | 13 +++++-
 nucleus/payara-modules/pom.xml                | 13 +++++-
 6 files changed, 103 insertions(+), 43 deletions(-)

diff --git a/appserver/extras/payara-micro/payara-micro-distribution/pom.xml b/appserver/extras/payara-micro/payara-micro-distribution/pom.xml
index 17f3fdbb7f8..6713de5b152 100644
--- a/appserver/extras/payara-micro/payara-micro-distribution/pom.xml
+++ b/appserver/extras/payara-micro/payara-micro-distribution/pom.xml
@@ -427,22 +427,6 @@
             <version>${jackson.version}</version>
             <optional>true</optional>
         </dependency>
-        <!-- Add Microprofile 1.1 apis -->
-        <dependency>
-            <groupId>org.eclipse.microprofile.config</groupId>
-            <artifactId>microprofile-config-api</artifactId>
-            <version>1.0-RC2</version>
-        </dependency>
-        <dependency>
-            <groupId>fish.payara.nucleus.microprofile.config</groupId>
-            <artifactId>microprofile-config-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>fish.payara.microprofile.config</groupId>
-            <artifactId>microprofile-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!-- JMS Annotation handlers -->
         <dependency>
             <groupId>org.glassfish.main.jms</groupId>
@@ -503,5 +487,29 @@
             </build>
         </profile>
         
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <dependencies>
+                <!-- Add Microprofile 1.1 apis -->
+                <dependency>
+                    <groupId>org.eclipse.microprofile.config</groupId>
+                    <artifactId>microprofile-config-api</artifactId>
+                    <version>1.0-RC2</version>
+                </dependency>
+                <dependency>
+                    <groupId>fish.payara.nucleus.microprofile.config</groupId>
+                    <artifactId>microprofile-config-service</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>fish.payara.microprofile.config</groupId>
+                    <artifactId>microprofile-config</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>
diff --git a/appserver/extras/payara-micro/payara-micro-microprofile-distribution/pom.xml b/appserver/extras/payara-micro/payara-micro-microprofile-distribution/pom.xml
index 932af66ed98..a8efe74ae88 100644
--- a/appserver/extras/payara-micro/payara-micro-microprofile-distribution/pom.xml
+++ b/appserver/extras/payara-micro/payara-micro-microprofile-distribution/pom.xml
@@ -979,22 +979,6 @@
             <version>${project.version}</version>
             <type>jar</type>
         </dependency> 
-        <!-- Add Microprofile 1.1 apis -->
-        <dependency>
-            <groupId>org.eclipse.microprofile.config</groupId>
-            <artifactId>microprofile-config-api</artifactId>
-            <version>1.0-RC2</version>
-        </dependency>
-        <dependency>
-            <groupId>fish.payara.nucleus.microprofile.config</groupId>
-            <artifactId>microprofile-config-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>fish.payara.microprofile.config</groupId>
-            <artifactId>microprofile-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <profiles>
         <profile>
@@ -1048,5 +1032,29 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <dependencies>
+                <!-- Add Microprofile 1.1 apis -->
+                <dependency>
+                    <groupId>org.eclipse.microprofile.config</groupId>
+                    <artifactId>microprofile-config-api</artifactId>
+                    <version>1.0-RC2</version>
+                </dependency>
+                <dependency>
+                    <groupId>fish.payara.nucleus.microprofile.config</groupId>
+                    <artifactId>microprofile-config-service</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>fish.payara.microprofile.config</groupId>
+                    <artifactId>microprofile-config</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>
diff --git a/appserver/featuresets/payara-web/pom.xml b/appserver/featuresets/payara-web/pom.xml
index 2ad8822e59a..e6befec33fd 100644
--- a/appserver/featuresets/payara-web/pom.xml
+++ b/appserver/featuresets/payara-web/pom.xml
@@ -254,12 +254,23 @@
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
-        <!-- Microprofile -->
-        <dependency>
-            <groupId>org.glassfish.main.packager</groupId>
-            <artifactId>microprofile-package</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+    
+    <profiles>
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <dependencies>
+                <!-- Microprofile -->
+                <dependency>
+                    <groupId>org.glassfish.main.packager</groupId>
+                    <artifactId>microprofile-package</artifactId>
+                    <version>${project.version}</version>
+                    <type>zip</type>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
diff --git a/appserver/packager/pom.xml b/appserver/packager/pom.xml
index 0fc240455b9..318b6f9a677 100644
--- a/appserver/packager/pom.xml
+++ b/appserver/packager/pom.xml
@@ -180,9 +180,20 @@
         <module>environment-warning</module>
         <module>payara-rest-endpoints</module>
         <module>payara-fang</module>
-        <module>microprofile-package</module>
     </modules>
 
+    <profiles>
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <modules>
+                <module>microprofile-package</module>
+            </modules>
+        </profile>
+    </profiles>
+    
     <build>
         <outputDirectory>${temp.dir}</outputDirectory>
         <pluginManagement>
diff --git a/appserver/payara-appserver-modules/pom.xml b/appserver/payara-appserver-modules/pom.xml
index 706cd9d894a..fb71f2d402b 100644
--- a/appserver/payara-appserver-modules/pom.xml
+++ b/appserver/payara-appserver-modules/pom.xml
@@ -69,6 +69,17 @@
         <module>environment-warning</module>
         <module>payara-rest-endpoints</module>
         <module>payara-fang</module>
-        <module>microprofile</module>
     </modules>
+    
+    <profiles>
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <modules>
+                <module>microprofile</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/nucleus/payara-modules/pom.xml b/nucleus/payara-modules/pom.xml
index 82cf77f6af3..446a856dd29 100755
--- a/nucleus/payara-modules/pom.xml
+++ b/nucleus/payara-modules/pom.xml
@@ -62,8 +62,19 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
         <module>asadmin-recorder</module>
         <module>service-exemplar</module>
         <module>notification-eventbus-core</module>
-        <module>nucleus-microprofile</module>
         <module>notification-cdi-eventbus-core</module>
         <module>jsr107-repackaged</module>
     </modules>
+    
+    <profiles>
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <modules>
+                <module>nucleus-microprofile</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>