Skip to content
Snippets Groups Projects
Verified Commit 9a88debf authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

move sbom generation to profile, tgsearch client to 4.0.4-SNAPSHOT

parent 8c954c4a
No related branches found
No related tags found
No related merge requests found
Pipeline #305481 passed
...@@ -94,7 +94,7 @@ build_and_deploy: ...@@ -94,7 +94,7 @@ build_and_deploy:
- git submodule update --recursive --init - git submodule update --recursive --init
- git -C src/main/webapp/tei-stylesheets/ checkout $TEI_STYLESHEETS_VERSION - git -C src/main/webapp/tei-stylesheets/ checkout $TEI_STYLESHEETS_VERSION
# REMOVE SKIPTESTS AS SOON AS TESTS ARE WORKING...!! # REMOVE SKIPTESTS AS SOON AS TESTS ARE WORKING...!!
- mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean verify -Ptextgrid.deb -DskipTests=true - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean verify -Ptextgrid.deb -Psbom -DskipTests=true
- cp target/bom.json . - cp target/bom.json .
artifacts: artifacts:
name: WEBAPP_DEB_PACKAGES name: WEBAPP_DEB_PACKAGES
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<cxf-version>3.3.13</cxf-version> <cxf-version>3.3.13</cxf-version>
<confclient-version>4.1.0</confclient-version> <confclient-version>4.1.0</confclient-version>
<cyclonedx-maven-plugin.version>2.7.0</cyclonedx-maven-plugin.version> <cyclonedx-maven-plugin.version>2.7.0</cyclonedx-maven-plugin.version>
<tgsearch-version>4.0.3</tgsearch-version> <tgsearch-version>4.0.4-SNAPSHOT</tgsearch-version>
<tgcrud-version>2.6.0</tgcrud-version> <tgcrud-version>2.6.0</tgcrud-version>
<!-- TG-crud client configuration is not working with newest crud, I'll <!-- TG-crud client configuration is not working with newest crud, I'll
just fix it tomorrow! --> just fix it tomorrow! -->
...@@ -476,22 +476,6 @@ ...@@ -476,22 +476,6 @@
</reportPlugins> </reportPlugins>
</configuration> </configuration>
</plugin> </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> </plugins>
<resources> <resources>
<resource> <resource>
...@@ -618,6 +602,29 @@ ...@@ -618,6 +602,29 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<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> </profiles>
<organization> <organization>
<name>TextGrid</name> <name>TextGrid</name>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment