src/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java

*** 103,113 ****
--- 103,115 ----
          // Log the options to be used.
          StringBuilder options = new StringBuilder();
          for (String s : args) {
              options.append(">").append(s).append("< ");
          }
+         if (javacServer != null) {
              javacServer.log(protocolId+" <"+invocationId+"> options "+options.toString());
+         }
  
          forcedExit.set(false);
          // Create a new logger.
          StringWriter stdoutLog = new StringWriter();
          StringWriter stderrLog = new StringWriter();
*** 118,128 ****
              if (compilationUnits.size() > 0) {
                  smartFileManager.setVisibleSources(visibleSources);
                  smartFileManager.cleanArtifacts();
                  smartFileManager.setLog(stdout);
  
- 
                  // Do the compilation!
                  CompilationTask task = compiler.getTask(stderr, smartFileManager, null, Arrays.asList(args), null, compilationUnits, context);
                  rc = ((JavacTaskImpl) task).doCall();
                  smartFileManager.flush();
              }
--- 120,129 ----
*** 132,143 ****
          }
  
          compilationResult.packageArtifacts = smartFileManager.getPackageArtifacts();
  
          Dependencies deps = Dependencies.instance(context);
!         compilationResult.packageDependencies = deps.getDependencies();
!         compilationResult.packagePubapis = deps.getPubapis();
  
          compilationResult.stdout = stdoutLog.toString();
          compilationResult.stderr = stderrLog.toString();
          compilationResult.returnCode = rc.exitCode == 0 && forcedExit.get() ? -1 : rc.exitCode;
  
--- 133,145 ----
          }
  
          compilationResult.packageArtifacts = smartFileManager.getPackageArtifacts();
  
          Dependencies deps = Dependencies.instance(context);
!         compilationResult.packageDependencies = deps.getSourcefileDependencies();
!         compilationResult.classpathPackageDependencies = deps.getClasspathDependencies();
!         compilationResult.packagePublicApis = deps.getPublicApis();
  
          compilationResult.stdout = stdoutLog.toString();
          compilationResult.stderr = stderrLog.toString();
          compilationResult.returnCode = rc.exitCode == 0 && forcedExit.get() ? -1 : rc.exitCode;