# HG changeset patch
# User lana
# Date 1324686995 28800
# Node ID 3bf50beb6cfb2122ef35a664836dc2d063422886
# Parent  7903d924508c9e7a49bb3fa22c6d684c64bd2630# Parent  58454f7a9bfa13c28268a42e1aeb6d79729bd5c8
Merge

diff -r 7903d924508c -r 3bf50beb6cfb jaxws/build.xml
--- a/jaxws/build.xml	Thu Dec 22 19:00:27 2011 -0800
+++ b/jaxws/build.xml	Fri Dec 23 16:36:35 2011 -0800
@@ -43,14 +43,6 @@
       Run 'make help' for help using the Makefile.
     </description>
 
-    <!-- Mac is special, need to downgrade these before build.properties. -->
-    <condition property="javac.source" value="1.5">
-        <os family="mac"/>
-    </condition>
-    <condition property="javac.target" value="1.5">
-        <os family="mac"/>
-    </condition>
-
     <!-- Project build properties. -->
     <property file="build.properties"/>
 
diff -r 7903d924508c -r 3bf50beb6cfb jaxws/make/jprt.properties
--- a/jaxws/make/jprt.properties	Thu Dec 22 19:00:27 2011 -0800
+++ b/jaxws/make/jprt.properties	Fri Dec 23 16:36:35 2011 -0800
@@ -25,21 +25,21 @@
 
 # Properties for jprt
 
-# The release to build
+# Locked down to jdk8
 jprt.tools.default.release=jdk8
 
 # The different build flavors we want, we override here so we just get these 2
 jprt.build.flavors=product,fastdebug
 
 # Standard list of jprt build targets for this source tree
-jprt.build.targets= 						\
-    solaris_sparc_5.10-{product|fastdebug}, 			\
-    solaris_sparcv9_5.10-{product|fastdebug}, 			\
-    solaris_i586_5.10-{product|fastdebug}, 			\
-    solaris_x64_5.10-{product|fastdebug}, 			\
-    linux_i586_2.6-{product|fastdebug}, 			\
-    linux_x64_2.6-{product|fastdebug}, 				\
-    windows_i586_5.1-{product|fastdebug}, 			\
+jprt.build.targets=                                             \
+    solaris_sparc_5.10-{product|fastdebug},                     \
+    solaris_sparcv9_5.10-{product|fastdebug},                   \
+    solaris_i586_5.10-{product|fastdebug},                      \
+    solaris_x64_5.10-{product|fastdebug},                       \
+    linux_i586_2.6-{product|fastdebug},                         \
+    linux_x64_2.6-{product|fastdebug},                          \
+    windows_i586_5.1-{product|fastdebug},                       \
     windows_x64_5.2-{product|fastdebug}
 
 # Directories to be excluded from the source bundles