# HG changeset patch
# User katleman
# Date 1323291754 28800
# Node ID 235fd08346cac15f1c0f2c83207261f57455fa84
# Parent  824eb0f6aa72af9f81a5940ab1b4ff58ab1c7402# Parent  81a28c8d731a31aa6f92d74b64f32d4b4c6169f4
Merge

diff -r 824eb0f6aa72 -r 235fd08346ca jaxp/build.properties
--- a/jaxp/build.properties	Thu Dec 01 10:33:22 2011 -0800
+++ b/jaxp/build.properties	Wed Dec 07 13:02:34 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 # Base locations where bundles are located
 slashjava=/java
-drops.dir=${slashjava}/devtools/share/jdk7-drops
+drops.dir=${slashjava}/devtools/share/jdk8-drops
 
 # This is the JDK used to build and run the bootstrap version of javac.
 # The bootstrap javac is used to compile both boostrap versions of the
diff -r 824eb0f6aa72 -r 235fd08346ca jaxp/make/Makefile
--- a/jaxp/make/Makefile	Thu Dec 01 10:33:22 2011 -0800
+++ b/jaxp/make/Makefile	Wed Dec 07 13:02:34 2011 -0800
@@ -99,9 +99,9 @@
   DROPS_DIR = $(ALT_DROPS_DIR)
 else
   ifdef ALT_JDK_DEVTOOLS_DIR
-    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
   else
-    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
   endif
 endif