1.1 --- a/remoting/build.sh	Thu Nov 03 17:35:21 2016 +0100
     1.2 +++ b/remoting/build.sh	Thu Nov 03 17:38:07 2016 +0100
     1.3 @@ -18,7 +18,7 @@
     1.4  (cd build; zip -r indexing-backend-shortened.zip `find indexing-backend -type f | grep -v indexing-backend/indexer/enterprise/ | grep -v indexing-backend/indexer/apisupport/  | grep -v indexing-backend/indexer/cnd/   | grep -v indexing-backend/indexer/dlight/   | grep -v indexing-backend/indexer/harness/   | grep -v indexing-backend/indexer/ide/   | grep -v indexing-backend/indexer/java   | grep -v indexing-backend/indexer/nb/   | grep -v indexing-backend/indexer/platform/   | grep -v indexing-backend/indexer/profiler/   | grep -v indexing-backend/indexer/websvccommon/`) || exit 1
     1.5  
     1.6  if [ "$JAVA6_HOME" != "" ] ; then
     1.7 -    (cd server/hudson; export JAVA_HOME=$JAVA6_HOME; export PATH=$JAVA_HOME/bin:$PATH; mvn $MAVEN_EXTRA_ARGS -Dmaven.test.skip=true clean package && (cp target/*.hpi ../../build || true)) || exit
     1.8 +    (cd server/hudson; export JAVA_HOME=$JAVA6_HOME; export PATH=$JAVA_HOME/bin:$PATH; mvn $MAVEN_EXTRA_ARGS -DskipTests=true -Dmaven.test.skip=true clean package && (cp target/*.hpi ../../build || true)) || exit
     1.9  fi;
    1.10  
    1.11  mkdir -p ide/local/release/index-server

     2.1 --- a/remoting/ide/downloadable/src/org/netbeans/modules/jackpot30/remoting/downloadable/DownloadedIndexPatcherImpl.java	Thu Nov 03 17:35:21 2016 +0100
     2.2 +++ b/remoting/ide/downloadable/src/org/netbeans/modules/jackpot30/remoting/downloadable/DownloadedIndexPatcherImpl.java	Thu Nov 03 17:38:07 2016 +0100
     2.3 @@ -34,7 +34,7 @@
     2.4      public boolean updateIndex(URL sourceRoot, URL indexFolder) {
     2.5          try {
     2.6              File cache = new File(indexFolder.toURI());
     2.7 -            File checksums = new File(cache, "java/14/checksums.properties");
     2.8 +            File checksums = new File(cache, "java/15/checksums.properties");
     2.9  
    2.10              if (!checksums.canRead()) return true; //nothing to fix
    2.11  
    2.12 @@ -68,7 +68,7 @@
    2.13              String newPrefix = srcFolderFO.toURL().toString();
    2.14  
    2.15              fixAbsolutePath(checksums, origPrefix, newPrefix);
    2.16 -            fixAbsolutePath(new File(cache, "java/14/fqn2files.properties"), origPrefix, newPrefix);
    2.17 +            fixAbsolutePath(new File(cache, "java/15/fqn2files.properties"), origPrefix, newPrefix);
    2.18  
    2.19              if (srcFolderFO != null) {
    2.20                  verifyAttributes(srcFolderFO, indexFolder, false);
    2.21 @@ -155,7 +155,7 @@
    2.22  
    2.23      public static boolean ensureAttributeValue(final URL root, final String attributeName, final String attributeValue, boolean checkOnly) throws IOException, URISyntaxException {
    2.24          File rootFile = new File(root.toURI());
    2.25 -        File attributes = new File(rootFile, "java/14/attributes.properties");
    2.26 +        File attributes = new File(rootFile, "java/15/attributes.properties");
    2.27          Properties p = loadProperties(attributes);
    2.28          final String current = p.getProperty(attributeName);
    2.29          if (current == null) {

     3.1 --- a/remoting/server/indexer/impl/nbproject/project.xml	Thu Nov 03 17:35:21 2016 +0100
     3.2 +++ b/remoting/server/indexer/impl/nbproject/project.xml	Thu Nov 03 17:38:07 2016 +0100
     3.3 @@ -89,7 +89,7 @@
     3.4                      <build-prerequisite/>
     3.5                      <compile-dependency/>
     3.6                      <run-dependency>
     3.7 -                        <specification-version>2.4.1.2.25.8.1</specification-version>
     3.8 +                        <implementation-version/>
     3.9                      </run-dependency>
    3.10                  </dependency>
    3.11                  <dependency>

     4.1 --- a/remoting/server/indexer/impl/src/org/netbeans/modules/jackpot30/backend/impl/OptionProcessorImpl.java	Thu Nov 03 17:35:21 2016 +0100
     4.2 +++ b/remoting/server/indexer/impl/src/org/netbeans/modules/jackpot30/backend/impl/OptionProcessorImpl.java	Thu Nov 03 17:38:07 2016 +0100
     4.3 @@ -78,6 +78,7 @@
     4.4  import org.netbeans.api.sendopts.CommandException;
     4.5  import org.netbeans.modules.jackpot30.backend.impl.spi.IndexAccessor;
     4.6  import org.netbeans.modules.jackpot30.backend.impl.spi.StatisticsGenerator;
     4.7 +import org.netbeans.modules.java.source.indexing.JavaIndex;
     4.8  import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
     4.9  import org.netbeans.spi.java.classpath.support.ClassPathSupport;
    4.10  import org.netbeans.spi.project.support.ant.PropertyUtils;
    4.11 @@ -466,7 +467,7 @@
    4.12              InputStream in = index.getInputStream();
    4.13  
    4.14              try {
    4.15 -                if (baseURL != null && ("java/14/checksums.properties".contentEquals(relPath) || "java/14/fqn2files.properties".contentEquals(relPath))) {
    4.16 +                if (baseURL != null && (("java/" + JavaIndex.VERSION + "/checksums.properties").contentEquals(relPath) || ("java/" + JavaIndex.VERSION + "/fqn2files.properties").contentEquals(relPath))) {
    4.17                      fixAbsolutePath(in, target, baseURL, "rel:/");
    4.18                  } else {
    4.19                      FileUtil.copy(in, target);

     5.1 --- a/remoting/server/web/base.web.api/src/org/netbeans/modules/jackpot30/backend/base/SourceRoot.java	Thu Nov 03 17:35:21 2016 +0100
     5.2 +++ b/remoting/server/web/base.web.api/src/org/netbeans/modules/jackpot30/backend/base/SourceRoot.java	Thu Nov 03 17:38:07 2016 +0100
     5.3 @@ -135,7 +135,7 @@
     5.4                      FileObject root = category.getEmbeddedJarRoot(entry);
     5.5  
     5.6                      if (!entry.endsWith(".jar")) {
     5.7 -                        root = root.getFileObject("java/14/classes");
     5.8 +                        root = root.getFileObject("java/15/classes");
     5.9                      }
    5.10  
    5.11                      if (root != null) {

     6.1 --- a/remoting/server/web/resolve.web.api/nbproject/project.properties	Thu Nov 03 17:35:21 2016 +0100
     6.2 +++ b/remoting/server/web/resolve.web.api/nbproject/project.properties	Thu Nov 03 17:38:07 2016 +0100
     6.3 @@ -29,7 +29,6 @@
     6.4  excludes=
     6.5  file.reference.org-netbeans-modules-java-lexer.jar=../../../../lib/org-netbeans-modules-java-lexer.jar
     6.6  file.reference.org-netbeans-modules-java-source-base.jar=../../../../lib/org-netbeans-modules-java-source-base.jar
     6.7 -file.reference.org-netbeans-modules-java-source.jar=../../../../lib/org-netbeans-modules-java-source.jar
     6.8  file.reference.org-netbeans-modules-lexer.jar=../../../../lib/org-netbeans-modules-lexer.jar
     6.9  file.reference.org-netbeans-modules-parsing-api.jar=../../../../lib/org-netbeans-modules-parsing-api.jar
    6.10  file.reference.org-netbeans-modules-parsing-lucene.jar=../../../../lib/org-netbeans-modules-parsing-lucene.jar
    6.11 @@ -48,7 +47,6 @@
    6.12      ${libs.lucene.classpath}:\
    6.13      ${libs.javac.classpath}:\
    6.14      ${reference.source_web_api.jar}:\
    6.15 -    ${file.reference.org-netbeans-modules-java-source.jar}:\
    6.16      ${file.reference.util-commons.jar}:\
    6.17      ${file.reference.util-pojson.jar}:\
    6.18      ${file.reference.org-netbeans-modules-lexer.jar}:\

     7.1 --- a/remoting/server/web/resolve.web.api/src/org/netbeans/modules/jackpot30/resolve/api/ResolveService.java	Thu Nov 03 17:35:21 2016 +0100
     7.2 +++ b/remoting/server/web/resolve.web.api/src/org/netbeans/modules/jackpot30/resolve/api/ResolveService.java	Thu Nov 03 17:38:07 2016 +0100
     7.3 @@ -66,6 +66,7 @@
     7.4  import org.netbeans.api.lexer.TokenSequence;
     7.5  import org.netbeans.modules.jackpot30.backend.base.CategoryStorage;
     7.6  import org.netbeans.modules.jackpot30.backend.base.SourceRoot;
     7.7 +import org.netbeans.modules.java.source.indexing.JavaIndex;
     7.8  import org.openide.filesystems.FileObject;
     7.9  
    7.10  /**
    7.11 @@ -146,7 +147,7 @@
    7.12  
    7.13      private static String fileForFQN(CategoryStorage category, String code, String fqn) throws IOException {
    7.14          FileObject root = category.getEmbeddedJarRoot(code);
    7.15 -        FileObject fqn2files = root != null ? root.getFileObject("java/14/fqn2files.properties") : null;
    7.16 +        FileObject fqn2files = root != null ? root.getFileObject("java/" + JavaIndex.VERSION + "/fqn2files.properties") : null;
    7.17  
    7.18          if (fqn2files == null) return null;
    7.19