From 2def603bfdf0b11aedf26e2bdac4f39181b06313 Mon Sep 17 00:00:00 2001
From: Ingmar Steiner <ingmar.steiner@iais.fraunhofer.de>
Date: Tue, 27 Aug 2024 18:25:50 +0200
Subject: [PATCH 1/2] Add license handling to JUnit template

---
 contrib/junit.tpl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/contrib/junit.tpl b/contrib/junit.tpl
index 08e649b9eb0..5661f8c41ce 100644
--- a/contrib/junit.tpl
+++ b/contrib/junit.tpl
@@ -15,6 +15,16 @@
     {{- end }}
     </testsuite>
 
+{{- if .Licenses }}
+    {{- $licenses := len .Licenses }}
+    <testsuite tests="{{ $licenses }}" failures="{{ $licenses }}" name="{{ .Target }}" time="0">{{ range .Licenses }}
+        <testcase classname="{{ .PkgName }}" name="[{{ .Severity }}] {{ .Name }}">
+            <failure/>
+        </testcase>
+    {{- end }}
+    </testsuite>
+{{- end }}
+
 {{- if .MisconfSummary }}
     <testsuite tests="{{ add .MisconfSummary.Successes .MisconfSummary.Failures }}" failures="{{ .MisconfSummary.Failures }}" name="{{  .Target }}" errors="0" skipped="{{ .MisconfSummary.Exceptions }}" time="">
 {{- else }}

From 48cb569fe4e848ae245757762eed957b16072a2e Mon Sep 17 00:00:00 2001
From: Ingmar Steiner <ingmar.steiner@iais.fraunhofer.de>
Date: Sat, 31 Aug 2024 19:10:23 +0200
Subject: [PATCH 2/2] Move license handling after misconf handling in JUnit
 template

---
 contrib/junit.tpl | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/contrib/junit.tpl b/contrib/junit.tpl
index 5661f8c41ce..b01bb9fd22d 100644
--- a/contrib/junit.tpl
+++ b/contrib/junit.tpl
@@ -15,16 +15,6 @@
     {{- end }}
     </testsuite>
 
-{{- if .Licenses }}
-    {{- $licenses := len .Licenses }}
-    <testsuite tests="{{ $licenses }}" failures="{{ $licenses }}" name="{{ .Target }}" time="0">{{ range .Licenses }}
-        <testcase classname="{{ .PkgName }}" name="[{{ .Severity }}] {{ .Name }}">
-            <failure/>
-        </testcase>
-    {{- end }}
-    </testsuite>
-{{- end }}
-
 {{- if .MisconfSummary }}
     <testsuite tests="{{ add .MisconfSummary.Successes .MisconfSummary.Failures }}" failures="{{ .MisconfSummary.Failures }}" name="{{  .Target }}" errors="0" skipped="{{ .MisconfSummary.Exceptions }}" time="">
 {{- else }}
@@ -43,5 +33,16 @@
         </testcase>
     {{- end }}
     </testsuite>
+
+{{- if .Licenses }}
+    {{- $licenses := len .Licenses }}
+    <testsuite tests="{{ $licenses }}" failures="{{ $licenses }}" name="{{ .Target }}" time="0">{{ range .Licenses }}
+        <testcase classname="{{ .PkgName }}" name="[{{ .Severity }}] {{ .Name }}">
+            <failure/>
+        </testcase>
+    {{- end }}
+    </testsuite>
+{{- end }}
+
 {{- end }}
 </testsuites>