diff --git a/Jenkinsfile b/Jenkinsfile index 3548c1a322..e5e27068d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { os = 'mac' def jdkMacFolder = os + jre downloader.downloadTemurinJDK17(jdkMacFolder, os) - + os = 'mac-aarch64' def jdkMacSiliconFolder = os + jre downloader.downloadTemurinJDK17(jdkMacSiliconFolder, os) @@ -82,7 +82,8 @@ pipeline { deployer.capellaNightlyProduct("${WORKSPACE}/releng/plugins/org.polarsys.capella.rcp.product/target/products/capella-*.zip", deploymentDirName) deployer.capellaNightlyProduct("${WORKSPACE}/releng/plugins/org.polarsys.capella.rcp.product/target/products/capella-*.gz", deploymentDirName) - + deployer.capellaNightlyProduct("${WORKSPACE}/releng/plugins/org.polarsys.capella.rcp.product/target/bom.json", "${deploymentDirName}/bom") + deployer.capellaNightlyUpdateSite("${WORKSPACE}/releng/plugins/org.polarsys.capella.test.site/target/repository/**", "${deploymentDirName}/org.polarsys.capella.test.site") deployer.capellaNightlyUpdateSite("${WORKSPACE}/releng/plugins/org.polarsys.capella.egf.site/target/repository/**", "${deploymentDirName}/org.polarsys.capella.egf.site") deployer.capellaNightlyUpdateSite("${WORKSPACE}/releng/plugins/org.polarsys.capella.rcp.site/target/repository/**", "${deploymentDirName}/org.polarsys.capella.rcp.site") @@ -108,12 +109,13 @@ pipeline { deployer.capellaNightlyProduct("${WORKSPACE}/releng/plugins/org.polarsys.capella.rcp.product/target/products/capella-*.zip", deploymentDirName) deployer.capellaNightlyProduct("${WORKSPACE}/releng/plugins/org.polarsys.capella.rcp.product/target/products/capella-*.gz", deploymentDirName) - + deployer.capellaNightlyProduct("${WORKSPACE}/releng/plugins/org.polarsys.capella.rcp.product/target/bom.json", "${deploymentDirName}/bom") + deployer.capellaNightlyUpdateSite("${WORKSPACE}/releng/plugins/org.polarsys.capella.test.site/target/repository/**", "${deploymentDirName}/org.polarsys.capella.test.site") deployer.capellaNightlyUpdateSite("${WORKSPACE}/releng/plugins/org.polarsys.capella.egf.site/target/repository/**", "${deploymentDirName}/org.polarsys.capella.egf.site") deployer.capellaNightlyUpdateSite("${WORKSPACE}/releng/plugins/org.polarsys.capella.rcp.site/target/repository/**", "${deploymentDirName}/org.polarsys.capella.rcp.site") deployer.capellaNightlyUpdateSite("${WORKSPACE}/releng/plugins/org.polarsys.capella.targets/full/*", "${deploymentDirName}/targets") - + currentBuild.description = "${BUILD_KEY} - build - product" } } } @@ -210,7 +212,7 @@ pipeline { post { always { - archiveArtifacts artifacts: '**/*.log, *.log, *.xml, **/*.layout, *.exec' + archiveArtifacts artifacts: '**/*.log, *.log, *.xml, **/*.json, **/*.layout, *.exec' script { github.removeBuildStartedLabel() diff --git a/releng/plugins/org.polarsys.capella.rcp.product/pom.xml b/releng/plugins/org.polarsys.capella.rcp.product/pom.xml index efd95a812c..e8ad5df1ef 100644 --- a/releng/plugins/org.polarsys.capella.rcp.product/pom.xml +++ b/releng/plugins/org.polarsys.capella.rcp.product/pom.xml @@ -232,6 +232,36 @@ + + org.cyclonedx + cyclonedx-maven-plugin + 2.8.1 + + 1.5 + library + true + true + true + true + true + false + + + + org.eclipse.tycho + tycho-sbom + ${tycho-version} + + + + + package + + makeBom + + + +