1.1 --- a/duplicates/ide/impl/nbproject/genfiles.properties	Sat Jun 06 13:22:04 2015 +0200
     1.2 +++ b/duplicates/ide/impl/nbproject/genfiles.properties	Sat Jun 06 17:44:46 2015 +0200
     1.3 @@ -3,6 +3,6 @@
     1.4  build.xml.stylesheet.CRC32=a56c6a5b@2.49
     1.5  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     1.6  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     1.7 -nbproject/build-impl.xml.data.CRC32=8cb9ba5d
     1.8 +nbproject/build-impl.xml.data.CRC32=dc435aa7
     1.9  nbproject/build-impl.xml.script.CRC32=5fd8da83
    1.10  nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70

     2.1 --- a/duplicates/ide/impl/nbproject/project.xml	Sat Jun 06 13:22:04 2015 +0200
     2.2 +++ b/duplicates/ide/impl/nbproject/project.xml	Sat Jun 06 17:44:46 2015 +0200
     2.3 @@ -401,10 +401,22 @@
     2.4                          <compile-dependency/>
     2.5                      </test-dependency>
     2.6                      <test-dependency>
     2.7 +                        <code-name-base>org.netbeans.modules.java.hints</code-name-base>
     2.8 +                        <compile-dependency/>
     2.9 +                    </test-dependency>
    2.10 +                    <test-dependency>
    2.11                          <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
    2.12                          <recursive/>
    2.13                          <compile-dependency/>
    2.14                      </test-dependency>
    2.15 +                    <test-dependency>
    2.16 +                        <code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
    2.17 +                        <compile-dependency/>
    2.18 +                    </test-dependency>
    2.19 +                    <test-dependency>
    2.20 +                        <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
    2.21 +                        <compile-dependency/>
    2.22 +                    </test-dependency>
    2.23                  </test-type>
    2.24              </test-dependencies>
    2.25              <public-packages/>

     3.1 --- a/java.hints/spi.java.hints/nbproject/genfiles.properties	Sat Jun 06 13:22:04 2015 +0200
     3.2 +++ b/java.hints/spi.java.hints/nbproject/genfiles.properties	Sat Jun 06 17:44:46 2015 +0200
     3.3 @@ -1,8 +1,8 @@
     3.4 -build.xml.data.CRC32=5b0c5014
     3.5 +build.xml.data.CRC32=1b4fb019
     3.6  build.xml.script.CRC32=caab83d9
     3.7  build.xml.stylesheet.CRC32=a56c6a5b@2.70
     3.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     3.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    3.10 -nbproject/build-impl.xml.data.CRC32=5b0c5014
    3.11 +nbproject/build-impl.xml.data.CRC32=1b4fb019
    3.12  nbproject/build-impl.xml.script.CRC32=7438bc77
    3.13  nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70

     4.1 --- a/java.hints/spi.java.hints/nbproject/project.xml	Sat Jun 06 13:22:04 2015 +0200
     4.2 +++ b/java.hints/spi.java.hints/nbproject/project.xml	Sat Jun 06 17:44:46 2015 +0200
     4.3 @@ -444,9 +444,17 @@
     4.4                          <test/>
     4.5                      </test-dependency>
     4.6                      <test-dependency>
     4.7 +                        <code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
     4.8 +                        <compile-dependency/>
     4.9 +                    </test-dependency>
    4.10 +                    <test-dependency>
    4.11                          <code-name-base>org.netbeans.modules.progress.ui</code-name-base>
    4.12                      </test-dependency>
    4.13                      <test-dependency>
    4.14 +                        <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
    4.15 +                        <compile-dependency/>
    4.16 +                    </test-dependency>
    4.17 +                    <test-dependency>
    4.18                          <code-name-base>org.netbeans.modules.projectui</code-name-base>
    4.19                      </test-dependency>
    4.20                      <test-dependency>

     5.1 --- a/language/ide/ui/nbproject/genfiles.properties	Sat Jun 06 13:22:04 2015 +0200
     5.2 +++ b/language/ide/ui/nbproject/genfiles.properties	Sat Jun 06 17:44:46 2015 +0200
     5.3 @@ -3,6 +3,6 @@
     5.4  build.xml.stylesheet.CRC32=a56c6a5b@2.49
     5.5  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     5.6  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     5.7 -nbproject/build-impl.xml.data.CRC32=f546dedb
     5.8 +nbproject/build-impl.xml.data.CRC32=98db8493
     5.9  nbproject/build-impl.xml.script.CRC32=e59dabeb
    5.10  nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70

     6.1 --- a/language/ide/ui/nbproject/project.xml	Sat Jun 06 13:22:04 2015 +0200
     6.2 +++ b/language/ide/ui/nbproject/project.xml	Sat Jun 06 17:44:46 2015 +0200
     6.3 @@ -166,6 +166,14 @@
     6.4                          <compile-dependency/>
     6.5                      </test-dependency>
     6.6                      <test-dependency>
     6.7 +                        <code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
     6.8 +                        <compile-dependency/>
     6.9 +                    </test-dependency>
    6.10 +                    <test-dependency>
    6.11 +                        <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
    6.12 +                        <compile-dependency/>
    6.13 +                    </test-dependency>
    6.14 +                    <test-dependency>
    6.15                          <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
    6.16                          <compile-dependency/>
    6.17                      </test-dependency>

     7.1 --- a/remoting/common/test/nbproject/genfiles.properties	Sat Jun 06 13:22:04 2015 +0200
     7.2 +++ b/remoting/common/test/nbproject/genfiles.properties	Sat Jun 06 17:44:46 2015 +0200
     7.3 @@ -3,6 +3,6 @@
     7.4  build.xml.stylesheet.CRC32=a56c6a5b@2.49
     7.5  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     7.6  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     7.7 -nbproject/build-impl.xml.data.CRC32=fac33e2d
     7.8 +nbproject/build-impl.xml.data.CRC32=43b6ada6
     7.9  nbproject/build-impl.xml.script.CRC32=4e8c4baf
    7.10  nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70

     8.1 --- a/remoting/common/test/nbproject/project.xml	Sat Jun 06 13:22:04 2015 +0200
     8.2 +++ b/remoting/common/test/nbproject/project.xml	Sat Jun 06 17:44:46 2015 +0200
     8.3 @@ -269,6 +269,14 @@
     8.4                      </run-dependency>
     8.5                  </dependency>
     8.6                  <dependency>
     8.7 +                    <code-name-base>org.netbeans.spi.java.hints</code-name-base>
     8.8 +                    <build-prerequisite/>
     8.9 +                    <compile-dependency/>
    8.10 +                    <run-dependency>
    8.11 +                        <implementation-version/>
    8.12 +                    </run-dependency>
    8.13 +                </dependency>
    8.14 +                <dependency>
    8.15                      <code-name-base>org.openide.actions</code-name-base>
    8.16                      <build-prerequisite/>
    8.17                      <compile-dependency/>
    8.18 @@ -358,6 +366,11 @@
    8.19                      </run-dependency>
    8.20                  </dependency>
    8.21              </module-dependencies>
    8.22 +            <test-dependencies>
    8.23 +                <test-type>
    8.24 +                    <name>unit</name>
    8.25 +                </test-type>
    8.26 +            </test-dependencies>
    8.27              <public-packages/>
    8.28          </data>
    8.29      </configuration>

     9.1 --- a/remoting/common/test/src/org/netbeans/modules/jackpot30/common/test/IndexTestBase.java	Sat Jun 06 13:22:04 2015 +0200
     9.2 +++ b/remoting/common/test/src/org/netbeans/modules/jackpot30/common/test/IndexTestBase.java	Sat Jun 06 17:44:46 2015 +0200
     9.3 @@ -49,6 +49,7 @@
     9.4  import org.netbeans.api.java.source.TestUtilities;
     9.5  import org.netbeans.core.startup.Main;
     9.6  import org.netbeans.junit.NbTestCase;
     9.7 +import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings.GlobalSettingsProvider;
     9.8  import org.netbeans.modules.java.source.indexing.JavaCustomIndexer;
     9.9  import org.netbeans.modules.parsing.impl.indexing.MimeTypes;
    9.10  import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
    9.11 @@ -140,7 +141,7 @@
    9.12      @ServiceProvider(service=MimeDataProvider.class)
    9.13      public static final class MimeDataProviderImpl implements MimeDataProvider {
    9.14  
    9.15 -        private static final Lookup L = Lookups.fixed(new JavaCustomIndexer.Factory());
    9.16 +        private static final Lookup L = Lookups.fixed(new JavaCustomIndexer.Factory(), new GlobalSettingsProvider());
    9.17          
    9.18          @Override
    9.19          public Lookup getLookup(MimePath mp) {