Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#266 Generate BOM #267

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+68 −23
Open

#266 Generate BOM #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63bce24
#266 Update to Tycho 4.0.9
pdulth Oct 7, 2024
7b92f41
#266 Generate BOM
pdulth Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ pipeline {

deployer.addonNightlyDropins("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/*-dropins-*.zip", deploymentDirName)
deployer.addonNightlyUpdateSite("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/repository/*", deploymentDirName)
deployer.addonNightlyUpdateSite("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/*-updateSite-*.zip", deploymentDirName)
deployer.addonNightlyUpdateSite("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/*-updateSite-*.zip", deploymentDirName)
deployer.addonNightlyUpdateSite("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/bom.json", deploymentDirName)

currentBuild.description = "${deploymentDirName} - <a href=\"https://download.eclipse.org/capella/addons/xhtmldocgen/dropins/nightly/${deploymentDirName}\">drop-in</a> - <a href=\"https://download.eclipse.org/capella/addons/xhtmldocgen/updates/nightly/${deploymentDirName}\">update-site</a>"
}
Expand Down
54 changes: 43 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<packaging>pom</packaging>

<properties>
<tycho-version>2.7.5</tycho-version>
<tycho-extras-version>2.7.5</tycho-extras-version>
<tycho-version>4.0.9</tycho-version>
<tycho-extras-version>4.0.9</tycho-extras-version>
<tycho.scmUrl>scm:git:http://git.polarsys.org/c/capella/capella-xhtml-docgen.git</tycho.scmUrl>
<antrun-version>1.7</antrun-version>
<jacoco-version>0.8.10</jacoco-version>
Expand Down Expand Up @@ -223,9 +223,9 @@
</dependencies>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-extras-version}</version>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
Expand All @@ -237,10 +237,10 @@
</configuration>
<executions>
<execution>
<id>source-feature</id>
<id>feature-source</id>
<phase>${sourcePhase}</phase>
<goals>
<goal>source-feature</goal>
<goal>feature-source</goal>
</goals>
</execution>
</executions>
Expand Down Expand Up @@ -284,9 +284,9 @@

<!-- plugins only called if a descendant need them -->
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-eclipse-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<repositories>
<repository>
Expand Down Expand Up @@ -322,7 +322,14 @@
<goal>eclipse-run</goal>
</goals>
<configuration>
<appArgLine>-application org.eclipse.equinox.p2.repository.repo2runnable -source file:${project.build.directory}/repository -destination ${project.build.directory}/${packagedAddonName}/eclipse</appArgLine>
<applicationArgs>
<arg>-application</arg>
<arg>org.eclipse.equinox.p2.repository.repo2runnable</arg>
<arg>-source</arg>
<arg>file:${project.build.directory}/repository</arg>
<arg>-destination</arg>
<arg>${project.build.directory}/${packagedAddonName}/eclipse</arg>
</applicationArgs>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -379,6 +386,31 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<schemaVersion>1.5</schemaVersion>
</configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-sbom</artifactId>
<version>${tycho-version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>create-bom</id>
<phase>package</phase>
<goals>
<goal>makeBom</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
14 changes: 12 additions & 2 deletions releng/org.polarsys.capella.docgen.site/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-eclipse-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
Expand All @@ -46,6 +46,16 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
<executions>
<execution>
<id>create-bom</id>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
18 changes: 10 additions & 8 deletions releng/org.polarsys.capella.docgen.target/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</licenses>

<properties>
<tycho-version>2.7.5</tycho-version>
<tycho-extras-version>2.7.5</tycho-extras-version>
<tycho-version>4.0.9</tycho-version>
<tycho-extras-version>4.0.9</tycho-extras-version>
<platform-name>2023-03</platform-name>
<targetPlatform.repository>https://download.eclipse.org/cbi/updates/tpd/nightly/latest</targetPlatform.repository>
<targetPlatform.name>capella.target-definition.targetplatform</targetPlatform.name>
Expand All @@ -44,9 +44,9 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-eclipse-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<repositories>
<repository>
Expand Down Expand Up @@ -78,10 +78,12 @@
<id>generate.target</id>
<phase>validate</phase>
<configuration>
<applicationArgs>
<arg>-application</arg>
<arg>${converterApplication.name}</arg>
<arg>tp/${targetPlatform.name}</arg>
</applicationArgs>
<executionEnvironment>JavaSE-17</executionEnvironment>
<applicationsArgs>
<args>-application ${converterApplication.name} tp/${targetPlatform.name}</args>
</applicationsArgs>
</configuration>
<goals>
<goal>eclipse-run</goal>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ location capella-master "https://download.eclipse.org/capella/core/updates/relea
org.polarsys.capella.rcp.feature.group lazy
}

location kitalpha-docgen-master "https://download.eclipse.org/kitalpha/updates/nightly/sdk/master" {
location kitalpha-sdk-7.0 "https://download.eclipse.org/kitalpha/updates/stable/sdk/7.0.0.20240612" {
org.polarsys.kitalpha.doc.gen.business.core.feature.feature.group lazy
org.polarsys.kitalpha.doc.gen.business.core.feature.source.feature.group lazy
}
Expand Down