Commit 44e1c04e authored by Stefan Funk's avatar Stefan Funk
Browse files

fix: generate pom with pom profile now

parent add3ec01
......@@ -79,8 +79,7 @@ validate-java:
junit:
- "**/target/*-reports/TEST-*.xml"
# Build and deploy all the JARs to GWDG Nexus, and build all the DEBs and store DEBs to artifacts.
# NOTE: "deploy" also triggers BOM creation!
# Build and deploy all the JARs to GWDG Nexus, build all the DEBs and store DEBs to artifacts, and create the JSON bom file for deps.
build-and-deploy-jars:
stage: build
image: maven:3.8.3-jdk-8
......@@ -88,7 +87,7 @@ build-and-deploy-jars:
- develop
- tags
script:
- mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean validate deploy -Pdhrep.deb
- mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean validate deploy -Pdhrep.deb -Psbom
- cp target/bom.json .
- cp kolibri-addon-textgrid-import/target/kolibri-addon-textgrid-import.zip .
- cp kolibri-cli/target/kolibri-cli-${PVERSION}.jar kolibri-cli.jar
......
......@@ -74,6 +74,31 @@
<name>SUB Göttingen | Deutsche Nationalbibliothek</name>
<url>https://sub.uni-goettingen.de | https://dnb.de</url>
</organization>
<profiles>
<profile>
<id>sbom</id>
<build>
<plugins>
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
<version>${cyclonedx-maven-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>makeAggregateBom</goal>
</goals>
</execution>
</executions>
<configuration>
<outputFormat>JSON</outputFormat>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<modules>
<module>kolibri-base</module>
<module>kolibri-schema-beans</module>
......@@ -220,22 +245,6 @@
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
<version>${cyclonedx-maven-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>makeAggregateBom</goal>
</goals>
</execution>
</executions>
<configuration>
<outputFormat>JSON</outputFormat>
</configuration>
</plugin>
</plugins>
</build>
</project>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment