Skip to content

Commit fb69edc

Browse files
mfd2007mfd2007
authored
Merge pull request #196 from secvisogram/fix_github_badges
Fix GitHub badges
2 parents bb91a98 + fba93c6 commit fb69edc

File tree

3 files changed

+79
-135
lines changed

3 files changed

+79
-135
lines changed

‎.github/workflows/github-badges.yml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 79 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -40,92 +40,93 @@
4040
<version>3.2.4</version>
4141
</parent>
4242

43-
<profiles>
43+
<profiles>
4444
<profile>
4545
<id>default</id>
4646
<activation>
4747
<activeByDefault>true</activeByDefault>
48-
</activation>
49-
<properties>
50-
<java.version>18</java.version>
51-
</properties>
52-
<build>
53-
<plugins>
54-
<plugin>
55-
<groupId>org.spdx</groupId>
56-
<artifactId>spdx-maven-plugin</artifactId>
57-
<!-- please check for updates on
58-
https://search.maven.org/search?q=a:spdx-maven-plugin -->
59-
<version>${plugin.version.spdx}</version>
60-
<executions>
61-
<execution>
62-
<id>build-spdx</id>
63-
<phase>package</phase>
64-
<goals>
65-
<goal>createSPDX</goal>
66-
</goals>
67-
</execution>
68-
</executions>
69-
<configuration>
70-
<!-- See documentation below for additional configuration -->
71-
<spdxFile>sbom/${project.groupId}_${project.artifactId}-${project.version}.spdx</spdxFile>
72-
</configuration>
73-
</plugin>
74-
<plugin>
75-
<groupId>org.cyclonedx</groupId>
76-
<artifactId>cyclonedx-maven-plugin</artifactId>
77-
<version>${plugin.version.cyclonedx}</version>
78-
<executions>
79-
<execution>
80-
<phase>package</phase>
81-
<goals>
82-
<goal>makeAggregateBom</goal>
83-
</goals>
84-
</execution>
85-
</executions>
86-
<configuration>
87-
<outputName>${project.groupId}_${project.artifactId}-${project.version}.cyclonedx</outputName>
88-
<outputFormat>json</outputFormat>
89-
<outputDirectory>sbom/</outputDirectory>
90-
</configuration>
91-
</plugin>
48+
</activation>
49+
<properties>
50+
<java.version>18</java.version>
51+
</properties>
52+
<build>
53+
<plugins>
54+
<plugin>
55+
<groupId>org.spdx</groupId>
56+
<artifactId>spdx-maven-plugin</artifactId>
57+
<!-- please check for updates on
58+
https://search.maven.org/search?q=a:spdx-maven-plugin -->
59+
<version>${plugin.version.spdx}</version>
60+
<executions>
61+
<execution>
62+
<id>build-spdx</id>
63+
<phase>package</phase>
64+
<goals>
65+
<goal>createSPDX</goal>
66+
</goals>
67+
</execution>
68+
</executions>
69+
<configuration>
70+
<!-- See documentation below for additional configuration -->
71+
<spdxFile>sbom/${project.groupId}_${project.artifactId}-${project.version}.spdx</spdxFile>
72+
</configuration>
73+
</plugin>
74+
<plugin>
75+
<groupId>org.cyclonedx</groupId>
76+
<artifactId>cyclonedx-maven-plugin</artifactId>
77+
<version>${plugin.version.cyclonedx}</version>
78+
<executions>
79+
<execution>
80+
<phase>package</phase>
81+
<goals>
82+
<goal>makeAggregateBom</goal>
83+
</goals>
84+
</execution>
85+
</executions>
86+
<configuration>
87+
<outputName>${project.groupId}_${project.artifactId}-${project.version}.cyclonedx</outputName>
88+
<outputFormat>json</outputFormat>
89+
<outputDirectory>sbom/</outputDirectory>
90+
</configuration>
91+
</plugin>
9292
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-surefire-plugin</artifactId>
95-
<configuration>
96-
<consoleOutputReporter>
97-
<disable>false</disable>
98-
</consoleOutputReporter>
99-
</configuration>
100-
</plugin>
101-
</plugins>
93+
<groupId>org.apache.maven.plugins</groupId>
94+
<artifactId>maven-surefire-plugin</artifactId>
95+
<configuration>
96+
<consoleOutputReporter>
97+
<disable>false</disable>
98+
</consoleOutputReporter>
99+
</configuration>
100+
</plugin>
101+
</plugins>
102102
</build>
103103
</profile>
104104

105-
<profile>
106-
<id>github-action</id>
107-
<build>
108-
<plugins>
109-
<plugin>
110-
<groupId>org.apache.maven.plugins</groupId>
111-
<artifactId>maven-surefire-plugin</artifactId>
112-
<configuration>
113-
<consoleOutputReporter>
114-
<disable>true</disable>
115-
</consoleOutputReporter>
116-
<excludes>
117-
<exclude>**/CouchDbServiceTest.java</exclude>
118-
<exclude>**/AdvisoryWorkflowSemanticVersioningTest.java</exclude>
119-
</excludes>
120-
</configuration>
121-
</plugin>
122-
</plugins>
123-
</build>
124-
<properties>
125-
<java.version>18</java.version>
126-
</properties>
127-
</profile>
128-
</profiles>
105+
<profile>
106+
<id>github-action</id>
107+
<build>
108+
<plugins>
109+
<plugin>
110+
<groupId>org.apache.maven.plugins</groupId>
111+
<artifactId>maven-surefire-plugin</artifactId>
112+
<configuration>
113+
<consoleOutputReporter>
114+
<disable>true</disable>
115+
</consoleOutputReporter>
116+
<excludes>
117+
<exclude>**/CouchDbServiceTest.java</exclude>
118+
<exclude>**/AdvisoryWorkflowSemanticVersioningTest.java</exclude>
119+
<exclude>**/AdvisorySearchUtilTest.java</exclude>
120+
</excludes>
121+
</configuration>
122+
</plugin>
123+
</plugins>
124+
</build>
125+
<properties>
126+
<java.version>18</java.version>
127+
</properties>
128+
</profile>
129+
</profiles>
129130

130131
<dependencies>
131132
<dependency>

‎src/test/java/de/bsi/secvisogram/csaf_cms_backend/service/AdvisorySearchUtilTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public class AdvisorySearchUtilTest {
3636
@Test
3737
@WithMockUser(username = "editor", authorities = {CsafRoles.ROLE_REGISTERED, CsafRoles.ROLE_AUTHOR})
3838
public void getAdvisoryInformationsTest_documentTitle() throws IOException, CsafException {
39-
4039
IdAndRevision idRev1 = this.advisoryService.addAdvisory(csafToRequest(csafJsonTitle("title1")));
4140
this.advisoryService.addAdvisory(csafToRequest(csafJsonTitle("title2")));
4241
List<AdvisoryInformationResponse> infos = this.advisoryService.getAdvisoryInformations(createExprDocumentTitle("title1"));

0 commit comments

Comments
 (0)