diff --git a/buildSrc/src/main/java/com/blackduck/integration/detect/docs/GenerateDocsTask.java b/buildSrc/src/main/java/com/blackduck/integration/detect/docs/GenerateDocsTask.java index 66e724a9e5..b3a079fa19 100644 --- a/buildSrc/src/main/java/com/blackduck/integration/detect/docs/GenerateDocsTask.java +++ b/buildSrc/src/main/java/com/blackduck/integration/detect/docs/GenerateDocsTask.java @@ -65,10 +65,6 @@ public void generateDocs() throws IOException, TemplateException, IntegrationExc FileUtils.deleteDirectory(outputDir); troubleshootingDir.mkdirs(); - // Metadata that Zoomin needs - FileUtils.copyFileToDirectory(new File(docsProjectDir, "custom.properties"), outputDir); - FileUtils.copyFileToDirectory(new File(docsProjectDir, "classification.xml"), outputDir); - File templatesDir = new File(docsSrcMainResourcesDir, "templates"); TemplateProvider templateProvider = new TemplateProvider(templatesDir, docsProject.getVersion().toString()); @@ -80,8 +76,7 @@ public void generateDocs() throws IOException, TemplateException, IntegrationExc FileUtils.copyDirectory(sourceMarkdownDir, outputDir); createMarkdownFromFreemarker(templateProvider, troubleshootingDir, "exit-codes", new ExitCodePage(helpJson.getExitCodes())); createMarkdownFromFreemarker(templateProvider, runningDir, "status-file", new DetectorStatusCodes(helpJson.getDetectorStatusCodes())); - // Commenting out in 9.4 to manually create detectors table - // handleDetectors(templateProvider, outputDir, helpJson); + handleProperties(templateProvider, outputDir, helpJson); createFromFreemarker(templateProvider, "downloadlocations.ftl", new File(installDir, "downloadlocations.md")); } @@ -101,33 +96,6 @@ private void createFromFreemarker(TemplateProvider templateProvider, String temp template.process(data, writer); } } - // Commenting out in 9.4 to manually create detectors table - /* private void handleDetectors(TemplateProvider templateProvider, File baseOutputDir, HelpJsonData helpJson) throws IOException, TemplateException { - File outputDir = new File(baseOutputDir, "components"); - List detectorTypes = new ArrayList<>(); - helpJson.getDetectors().stream() - .sorted(Comparator.comparing(HelpJsonDetectorRule::getDetectorType)) - .forEach(detectorRule -> { - List entryPointsForRule = new ArrayList<>(); - detectorRule.getEntryPoints().forEach(entry -> { - List detectables = entry.getDetectables().stream() - .map(detectable -> new Detectable( - detectable.getDetectableName(), - detectable.getDetectableLanguage(), - detectable.getDetectableForge(), - detectable.getDetectableRequirementsMarkdown(), - detectable.getDetectableAccuracy() - )) - .collect(Collectors.toList()); - DetectorEntryPoint entryPoint = new DetectorEntryPoint(entry.getName(), detectables); - entryPointsForRule.add(entryPoint); - }); - DetectorType detectorType = new DetectorType(detectorRule.getDetectorType(), entryPointsForRule); - detectorTypes.add(detectorType); - }); - - createMarkdownFromFreemarker(templateProvider, outputDir, "detectors", new DetectorCascadePage(detectorTypes)); - } */ private String encodePropertyLocation(String propertyName) { if (!propertyName.equals(propertyName.trim())) { diff --git a/documentation/FluidTopicsControlFile.xml b/documentation/FluidTopicsControlFile.xml new file mode 100644 index 0000000000..a9d143f50b --- /dev/null +++ b/documentation/FluidTopicsControlFile.xml @@ -0,0 +1,21 @@ + + + + + detect.ditamap + bd_detect-latest + bd_detect + + + detect + + + latest + + + access_all + + + + + diff --git a/documentation/classification.xml b/documentation/classification.xml deleted file mode 100644 index df1b4b662e..0000000000 --- a/documentation/classification.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Black Duck - Black Duck - 2021-03-18T05:43:42Z - 2021-03-26T01:40:29Z - 16.00 - - - - - - 7455 - 21570 - 32767 - 32767 - False - False - - - - - - - - - - - - - Filename - Title - Product - Role - Document Type - Access - - - MAP - detect - role_developer - doctype_userguide - access_all - - - apply-ALL - detect - role_developer - doctype_userguide - access_all - - - default - -
- - -
-