Merge pull request #788 from Pandrex247/PAYARA-753

PAYARA-753
payara · May 6, 2016 · 7875e6a · 7875e6a
2 parents 491c8b0 + f476b5c
commit 7875e6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nucleus/flashlight/framework/pom.xml b/nucleus/flashlight/framework/pom.xml
@@ -55,7 +55,7 @@
 
     <name>flashlight-framework</name>
 
-    <profiles>
+   <!--<profiles>
         <profile>
             <id>aix-jdk</id>
             <activation>
@@ -87,7 +87,7 @@
                 </plugins>
             </build>
         </profile>
-    </profiles>
+    </profiles>-->
 
     <dependencies>
         <dependency>

diff --git a/nucleus/pom.xml b/nucleus/pom.xml
@@ -230,7 +230,7 @@
         <mail.version>1.5.4</mail.version>
         <javax.annotation-api.version>1.2</javax.annotation-api.version>
         <copyright-plugin.version>1.39</copyright-plugin.version>
-        <jdk.version>1.7.0-09</jdk.version>
+        <jdk.version>1.7.0</jdk.version>
         <nucleus.install.dir.name>nucleus</nucleus.install.dir.name>
         <javadoc.skip>false</javadoc.skip>
         <deploy.skip>false</deploy.skip>