Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorherrick
Fri, 18 Nov 2011 06:35:36 -0500
changeset 11219 1be63f9eae0a
parent 11218 214d7b804fd4 (diff)
parent 11005 69c7122561ec (current diff)
child 11220 f86053235ede
Merge
hotspot/src/share/vm/precompiled.hpp file | annotate | diff | comparison | revisions
jdk/make/sun/rmi/rmi/mapfile-vers file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/security/pkcs/EncodingException.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/security/pkcs/PKCS10.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/security/pkcs/PKCS10Attribute.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/security/pkcs/PKCS10Attributes.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/security/util/BigInt.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/security/util/PathList.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/security/x509/CertAndKeyGen.java file | annotate | diff | comparison | revisions
jdk/src/share/native/sun/rmi/server/MarshalInputStream.c file | annotate | diff | comparison | revisions
jdk/test/java/net/DatagramSocket/ChangingAddress.java file | annotate | diff | comparison | revisions
jdk/test/sun/security/util/BigInt/BigIntEqualsHashCode.java file | annotate | diff | comparison | revisions
langtools/src/share/classes/com/sun/tools/javac/file/Paths.java file | annotate | diff | comparison | revisions
langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java file | annotate | diff | comparison | revisions
langtools/src/share/classes/com/sun/tools/javac/parser/Keywords.java file | annotate | diff | comparison | revisions
langtools/src/share/classes/com/sun/tools/javac/parser/Token.java file | annotate | diff | comparison | revisions 
--- a/jdk/make/common/shared/Sanity.gmk	Thu Nov 17 10:46:02 2011 -0800
+++ b/jdk/make/common/shared/Sanity.gmk	Fri Nov 18 06:35:36 2011 -0500
@@ -1555,60 +1555,6 @@
   endif
 endif
 
-
-######################################################
-# SECURITY_BASELINE_131 test
-######################################################
-security_baseline_131:
-ifeq ($(PLATFORM), windows)
-	@if [ -z "$(SECURITY_BASELINE_131)" ]; then \
-	    $(ECHO) "WARNING: Your SECURITY_BASELINE_131 setting is empty.\n" \
-		"        Setting it to the default value of 1.3.1_20.\n" \
-		"        It is recommended to set SECURITY_BASELINE_131.\n" \
-		"" >> $(WARNING_FILE) ; \
-	fi
-endif
-
-######################################################
-# SECURITY_BASELINE_142 test
-######################################################
-security_baseline_142:
-ifeq ($(PLATFORM), windows)
-	@if [ -z "$(SECURITY_BASELINE_142)" ]; then \
-	    $(ECHO) "WARNING: Your SECURITY_BASELINE_142 setting is empty.\n" \
-		"        Setting it to the default value of 1.4.2_10.\n" \
-		"        It is recommended to set SECURITY_BASELINE_142.\n" \
-		"" >> $(WARNING_FILE) ; \
-	fi
-endif
-
-######################################################
-# SECURITY_BASELINE_150 test
-######################################################
-security_baseline_150:
-ifeq ($(PLATFORM), windows)
-	@if [ -z "$(SECURITY_BASELINE_150)" ]; then \
-	    $(ECHO) "WARNING: Your SECURITY_BASELINE_150 setting is empty.\n" \
-		"        Setting it to the default value of 1.5.0_07.\n" \
-		"        It is recommended to set SECURITY_BASELINE_150.\n" \
-		"" >> $(WARNING_FILE) ; \
-	fi
-endif
-
-######################################################
-# SECURITY_BASELINE_160 test
-######################################################
-security_baseline_160:
-ifeq ($(PLATFORM), windows)
-	@if [ -z "$(SECURITY_BASELINE_160)" ]; then \
-	    $(ECHO) "WARNING: Your SECURITY_BASELINE_160 setting is empty.\n" \
-		"        Setting it to the default value of 1.6.0_11.\n" \
-		"        It is recommended to set SECURITY_BASELINE_160.\n" \
-		"" >> $(WARNING_FILE) ; \
-	fi
-endif
-
-
 ######################################################
 # this should be the last rule in any target's sanity rule.
 ######################################################
jdk-sandbox