diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e28c059df7d50570f4d26151c63a20958519c6c..1c7adc2457c4f699b2f9e212d356448cd47debec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,7 +94,7 @@ build_and_deploy: - git submodule update --recursive --init - git -C src/main/webapp/tei-stylesheets/ checkout $TEI_STYLESHEETS_VERSION # 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 . artifacts: name: WEBAPP_DEB_PACKAGES diff --git a/pom.xml b/pom.xml index 8c62560f410fff43eefe048acd69787c51ad58ba..6a8d4b8297fc28a996a33dc22573931ebb56c28b 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ <cxf-version>3.3.13</cxf-version> <confclient-version>4.1.0</confclient-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> <!-- TG-crud client configuration is not working with newest crud, I'll just fix it tomorrow! --> @@ -476,22 +476,6 @@ </reportPlugins> </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> <resources> <resource> @@ -618,6 +602,29 @@ </plugins> </build> </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> <organization> <name>TextGrid</name>