--- a/jdk/make/common/Sanity.gmk	Wed Sep 10 09:31:16 2008 -0700
+++ b/jdk/make/common/Sanity.gmk	Wed Sep 10 09:48:41 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2001-2008 Sun Microsystems, Inc.  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
@@ -70,7 +70,6 @@
     sane-compiler \
     sane-cacerts \
     sane-ant_version \
-    sane-findbugs_version \
     sane-zip_version \
     sane-msvcrt_path
 

--- a/jdk/make/common/shared/Defs.gmk	Wed Sep 10 09:31:16 2008 -0700
+++ b/jdk/make/common/shared/Defs.gmk	Wed Sep 10 09:48:41 2008 -0700
@@ -549,14 +549,6 @@
 else
   ANT = $(ANT_HOME)/bin/ant
 endif
-ifeq ($(FINDBUGS_HOME),)
-  FINDBUGS_HOME := $(call DirExists,/usr/share/findbugs,$(JDK_DEVTOOLS_DIR)/share/findbugs/latest,)
-endif
-ifeq ($(FINDBUGS_HOME),)
-  FINDBUGS = findbugs
-else
-  FINDBUGS = $(FINDBUGS_HOME)/bin/findbugs
-endif
 
 ifdef ALT_COPYRIGHT_YEAR
   COPYRIGHT_YEAR = $(ALT_COPYRIGHT_YEAR)

--- a/jdk/make/common/shared/Sanity-Settings.gmk	Wed Sep 10 09:31:16 2008 -0700
+++ b/jdk/make/common/shared/Sanity-Settings.gmk	Wed Sep 10 09:48:41 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc.  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
@@ -79,7 +79,6 @@
 ALL_SETTINGS+=$(call addRequiredSetting,VARIANT)
 ALL_SETTINGS+=$(call addAltSetting,JDK_DEVTOOLS_DIR)
 ALL_SETTINGS+=$(call addOptionalSetting,ANT_HOME)
-ALL_SETTINGS+=$(call addOptionalSetting,FINDBUGS_HOME)
 ALL_SETTINGS+=$(call addAltSetting,UNIXCOMMAND_PATH)
 ALL_SETTINGS+=$(call addAltSetting,COMPILER_PATH)
 ALL_SETTINGS+=$(call addAltSetting,DEVTOOLS_PATH)
@@ -119,7 +118,6 @@
   ALL_SETTINGS+=$(call addRequiredVersionSetting,LINK_VER)
 endif
 ALL_SETTINGS+=$(call addRequiredVersionSetting,ANT_VER)
-ALL_SETTINGS+=$(call addRequiredVersionSetting,FINDBUGS_VER)
 ALL_SETTINGS+=$(call addRequiredSetting,TEMPDIR)
 
 

--- a/jdk/make/common/shared/Sanity.gmk	Wed Sep 10 09:31:16 2008 -0700
+++ b/jdk/make/common/shared/Sanity.gmk	Wed Sep 10 09:48:41 2008 -0700
@@ -114,14 +114,6 @@
 endif
 ANT_VER:=$(call GetVersion,"$(_ANT_VER)")
 
-REQUIRED_FINDBUGS_VER := 1.2
-ifeq ($(FINDBUGS_HOME),)
-  _FINDBUGS_VER:=$(shell $(FINDBUGS) -javahome "$(BOOTDIR)" -textui -version 2>&1 )
-else
-  _FINDBUGS_VER:=$(shell FINDBUGS_HOME="$(FINDBUGS_HOME)" $(FINDBUGS) -javahome "$(BOOTDIR)" -textui -version 2>&1 )
-endif
-FINDBUGS_VER:=$(call GetVersion,"$(_FINDBUGS_VER)")
-
 ifdef ALT_BINDIR
   ALT_BINDIR_VERSION := $(shell $(ALT_BINDIR)/java$(EXE_SUFFIX) -version 2>&1  | $(NAWK) -F'"' '{ print $$2 }')
   ALT_BINDIR_OK := $(shell $(ECHO) $(ALT_BINDIR_VERSION) | $(EGREP) -c '^$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)')
@@ -182,7 +174,6 @@
 	sane-alsa-versioncheck \
 	sane-alsa-headers \
 	sane-ant_version \
-	sane-findbugs_version \
 	sane-zip_version \
 	sane-unzip_version \
  	sane-msvcrt_path \
@@ -1217,19 +1208,6 @@
 	fi
 
 ######################################################
-# Check the findbugs version
-######################################################
-FINDBUGS_CHECK :=$(call CheckVersions,$(FINDBUGS_VER),$(REQUIRED_FINDBUGS_VER))
-sane-findbugs_version:
-	@if [ "$(FINDBUGS_CHECK)" != "same" \
-	      -a "$(FINDBUGS_CHECK)" != "newer" ]; then \
-	  $(ECHO) "WARNING: The version of findbugs being used is older than \n" \
-	    "      the required version of '$(REQUIRED_FINDBUGS_VER)'. \n" \
-	    "      The version of findbugs found was '$(FINDBUGS_VER)'. \n" \
-	    "" >> $(WARNING_FILE) ; \
-	fi
-
-######################################################
 # Check the zip file version
 ######################################################
 ZIP_CHECK :=$(call CheckVersions,$(ZIP_VER),$(REQUIRED_ZIP_VER))

--- a/jdk/make/jprt.config	Wed Sep 10 09:31:16 2008 -0700
+++ b/jdk/make/jprt.config	Wed Sep 10 09:48:41 2008 -0700
@@ -100,20 +100,16 @@
 # Needed for langtools, maybe other parts of the build
 ANT_HOME="${share}/ant/latest"
 export ANT_HOME
-FINDBUGS_HOME="${share}/findbugs/latest"
-export FINDBUGS_HOME
 
 # The 3 bin directories in common to all platforms
 sharebin="${share}/bin"
 antbin="${ANT_HOME}/bin"
-findbugsbin="${FINDBUGS_HOME}/bin"
 
 # Check input
 dirMustExist "${bootdir}"         ALT_BOOTDIR
 dirMustExist "${slashjava}"       ALT_SLASH_JAVA
 dirMustExist "${jdk_import}"      ALT_JDK_IMPORT_PATH
 dirMustExist "${ANT_HOME}"        ANT_HOME
-dirMustExist "${FINDBUGS_HOME}"   FINDBUGS_HOME
 
 # Use the JDK import for now (FIXME: use the binary plugs?)
 if [ "${OPENJDK}" = true ] ; then
@@ -143,7 +139,7 @@
     ALT_COMPILER_PATH="${compiler_path}"
     export ALT_COMPILER_PATH
     dirMustExist "${compiler_path}" ALT_COMPILER_PATH
-    path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin}
+    path4sdk=${compiler_path}:${sharebin}:${antbin}
 
     # Add basic solaris system paths
     path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
@@ -180,7 +176,7 @@
     ALT_COMPILER_PATH="${compiler_path}"
     export ALT_COMPILER_PATH
     dirMustExist "${compiler_path}" ALT_COMPILER_PATH
-    path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin}
+    path4sdk=${compiler_path}:${sharebin}:${antbin}
     
     # Add basic paths
     path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin
@@ -228,7 +224,7 @@
 	dosname="${mkshome}/mksnt/dosname -s"
         # Most unix utilities are in the mksnt directory of ROOTDIR
         unixcommand_path="${mkshome}/mksnt"
-        path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}"
+        path4sdk="${sharebin};${antbin};${unixcommand_path}"
         dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
 	devtools_path="${jdk_devtools}/win32/bin"
 	path4sdk="${devtools_path};${path4sdk}"
@@ -246,7 +242,7 @@
 	dosname="/usr/bin/cygpath -a -m -s"
         # Most unix utilities are in the /usr/bin
         unixcommand_path="/usr/bin"
-        path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}"
+        path4sdk="${sharebin};${antbin};${unixcommand_path}"
         dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
         # Find GNU make
         make="${unixcommand_path}/make.exe"