Merge pull request #1224 from fritze2/fixApiSpiJavadoc2

Fix apiSpiJavadoc skipping and kernel.embeddable buildpath

Author: garypicher

dev/cnf/gradle/scripts/tasks.gradle

@@ -130,7 +130,11 @@ subprojects {
   task apiSpiJavadoc(type: Javadoc) {
     dependsOn jar
     def publishSuffix = bnd('publish.wlp.jar.suffix', 'lib')
-    enabled publishSuffix.contains('api/ibm') || publishSuffix.contains('spi/ibm') && !new File(buildDir, "javadoc").exists()
+    enabled publishSuffix.contains('api/ibm') || publishSuffix.contains('spi/ibm')
+
+    onlyIf {
+      !new File(buildDir, "javadoc").exists()
+    }
 
     def sp = files()
     def cp = files()

dev/com.ibm.websphere.appserver.spi.kernel.embeddable/bnd.bnd

@@ -24,4 +24,6 @@ Export-Package: com.ibm.wsspi.kernel.embeddable,com.ibm.wsspi.kernel.security.th
 publish.wlp.jar.suffix: dev/spi/ibm
 
 -buildpath: \
-	com.ibm.ws.kernel.boot;version=latest
+	com.ibm.ws.kernel.boot;version=latest,\
+	com.ibm.ws.kernel.boot.core;version=latest,\
+	com.ibm.ws.kernel.security.thread;version=latest