diff --git a/Jenkinsfile b/Jenkinsfile index c313265fbe..f4c83e18a5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -182,7 +182,7 @@ pipeline { // Generate the driver documentation. sh './mvnw -P${JENKINS_PROFILE},with-java,skip-prerequisite-check site -X -pl :plc4j-driver-all' // Build the actual website. - sh './mvnw -P${JENKINS_PROFILE},skip-prerequisite-check site -X -pl .' + sh './mvnw -P${JENKINS_PROFILE},skip-prerequisite-check site -X -pl . -pl website' } } @@ -196,7 +196,7 @@ pipeline { //sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check,with-proxies site:stage' sh './mvnw -B -P${JENKINS_PROFILE},skip-prerequisite-check site:stage -pl .' // Make sure the script is executable. - sh 'chmod +x tools/clean-site.sh' + //sh 'chmod +x tools/clean-site.sh' // Remove some redundant resources, which shouldn't be required. //sh 'tools/clean-site.sh' // Stash the generated site so we can publish it on the 'git-website' node. diff --git a/website/asciidoc/modules/developers/pages/tutorials/writing-driver.adoc b/website/asciidoc/modules/developers/pages/tutorials/writing-driver.adoc index 94c1977bb3..d43439c0ea 100644 --- a/website/asciidoc/modules/developers/pages/tutorials/writing-driver.adoc +++ b/website/asciidoc/modules/developers/pages/tutorials/writing-driver.adoc @@ -22,7 +22,7 @@ include::partial$pom.adoc[] The general pipeline for a Protocol looks like the following: -[ditaa,driver-anatomy] +[ditaa] .... +-------------------------------------+ | Upstream (e.g. PLC4X API : diff --git a/website/package-lock.json b/website/package-lock.json index 25f3c9de18..e0104ad558 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -7,7 +7,6 @@ "dependencies": { "@antora/lunr-extension": "^1.0.0-alpha.8", "asciidoctor-kroki": "0.15.4", - "asciidoctor-plantuml": "^1.5.0", "target": "^0.0.2" }, "devDependencies": { @@ -466,35 +465,6 @@ "node": ">=8.11" } }, - "node_modules/asciidoctor-plantuml": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/asciidoctor-plantuml/-/asciidoctor-plantuml-1.5.0.tgz", - "integrity": "sha512-YsiDyrr0iBkFrDkqSXujbZNS1YkhiKl6sIo3OB6yydSozrahXYX2LdU7pmQPUwe8kYeCy3L2G39O4kQc68mCew==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "license": "ISC", - "dependencies": { - "asciidoctor.js": "^1.5.9", - "mkdirp": "^0.5.1", - "plantuml-encoder": "^1.2.5", - "rusha": "^0.8.13", - "unxhr": "1.0.1" - } - }, - "node_modules/asciidoctor.js": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/asciidoctor.js/-/asciidoctor.js-1.5.9.tgz", - "integrity": "sha512-k5JgwyV82TsiCpnYbDPReuHhzf/vRUt6NaZ+OGywkDDGeGG/CPfvN2Gd1MJ0iIZKDyuk4iJHOdY/2x1KBrWMzA==", - "deprecated": "Package no longer supported. Replaced by @asciidoctor/core", - "license": "MIT", - "dependencies": { - "opal-runtime": "1.0.11" - }, - "engines": { - "node": ">=8.11", - "npm": ">=5.0.0", - "yarn": ">=1.1.0" - } - }, "node_modules/async-lock": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.4.1.tgz", @@ -1328,6 +1298,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -1343,18 +1314,6 @@ "minimist": "^1.2.5" } }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "license": "MIT", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/multi-progress": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/multi-progress/-/multi-progress-4.0.0.tgz", @@ -1403,36 +1362,6 @@ "wrappy": "1" } }, - "node_modules/opal-runtime": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/opal-runtime/-/opal-runtime-1.0.11.tgz", - "integrity": "sha512-L+6pnRvXPlDtbamBRnJAnB9mEMXmsIQ/b+0r/2xJ5/n/nxheEkLo+Pm5QNQ08LEbEN9TI6/kedhIspqRRu6tXA==", - "license": "MIT", - "dependencies": { - "glob": "6.0.4", - "xmlhttprequest": "1.8.0" - }, - "engines": { - "node": ">=8.11" - } - }, - "node_modules/opal-runtime/node_modules/glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "license": "ISC", - "dependencies": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, "node_modules/pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", @@ -1595,12 +1524,6 @@ "dev": true, "license": "MIT" }, - "node_modules/plantuml-encoder": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/plantuml-encoder/-/plantuml-encoder-1.4.0.tgz", - "integrity": "sha512-sxMwpDw/ySY1WB2CE3+IdMuEcWibJ72DDOsXLkSmEaSzwEUaYBT6DWgOfBiHGCux4q433X6+OEFWjlVqp7gL6g==", - "license": "MIT" - }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -2066,15 +1989,6 @@ "node": ">=4" } }, - "node_modules/xmlhttprequest": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", - "integrity": "sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA==", - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/yargs-parser": { "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", diff --git a/website/package.json b/website/package.json index 94f7322916..1904a8f2c9 100644 --- a/website/package.json +++ b/website/package.json @@ -4,7 +4,6 @@ }, "dependencies": { "@antora/lunr-extension": "^1.0.0-alpha.8", - "asciidoctor-plantuml": "^1.5.0", "asciidoctor-kroki": "0.15.4", "target": "^0.0.2" }