--- a/make/CreateJmods.gmk	Thu Dec 15 22:00:30 2016 +0530
+++ b/make/CreateJmods.gmk	Fri Dec 16 08:17:37 2016 +0000
@@ -89,6 +89,11 @@
 
 JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)
 
+ifeq ($(filter-out jdk.incubator.%, $(MODULE)), )
+  JMOD_FLAGS += --do-not-resolve-by-default
+  JMOD_FLAGS += --warn-if-resolved=incubating
+endif
+
 # Add dependencies on other jmod files. Only java.base needs access to other
 # jmods.
 ifeq ($(MODULE), java.base)