1.1 --- a/openide.filesystems/nbproject/project.properties
     1.2 +++ b/openide.filesystems/nbproject/project.properties
     1.3 @@ -40,7 +40,7 @@
     1.4  javac.compilerargs=-Xlint -Xlint:-serial
     1.5  javac.source=1.5
     1.6  module.jar.dir=core
     1.7 -cp.extra=${nb_all}/libs.javacapi/external/javac-api-nb-7.0-b07.jar
     1.8 +cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-6-b12.jar
     1.9  javadoc.main.page=org/openide/filesystems/doc-files/api.html
    1.10  javadoc.arch=${basedir}/arch.xml
    1.11  javadoc.apichanges=${basedir}/apichanges.xml

     2.1 --- a/openide.util/nbproject/project.properties
     2.2 +++ b/openide.util/nbproject/project.properties
     2.3 @@ -40,8 +40,7 @@
     2.4  javac.compilerargs=-Xlint -Xlint:-serial
     2.5  javac.source=1.5
     2.6  module.jar.dir=lib
     2.7 -cp.extra=${nb_all}/libs.javacapi/external/javac-api-nb-7.0-b07.jar
     2.8 -test.unit.run.cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-impl-6-b12.jar
     2.9 +cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-6-b12.jar
    2.10  
    2.11  spec.version.base=7.20.0
    2.12  

     3.1 --- a/openide.util/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java
     3.2 +++ b/openide.util/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java
     3.3 @@ -122,7 +122,7 @@
     3.4          scan(args, src, srcIncludes);
     3.5          JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
     3.6          Assert.assertNotNull("no JSR 199 compiler impl found; try e.g.: " +
     3.7 -                "test.unit.run.cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-impl-6-b12.jar", compiler);
     3.8 +                "test.unit.run.cp.extra=${nb_all}/apisupport.harness/external/openjdk-javac-6-b12.jar", compiler);
     3.9          //System.err.println("running javac with args: " + args);
    3.10          return compiler.run(null, null, stderr, args.toArray(new String[args.size()])) == 0;
    3.11      }