--- a/make/CreateJmods.gmk	Wed Dec 14 20:23:22 2016 +0000
+++ b/make/CreateJmods.gmk	Fri Dec 16 05:46:45 2016 +0000
@@ -79,6 +79,11 @@
   DEPS += $(call CacheFind, $(MAN_DIR))
 endif
 
+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)