From b5e8c173bf2f12d49d3cd9527b70e20aa2b25a3a Mon Sep 17 00:00:00 2001
From: Marc Zottner <marc@zottner.com>
Date: Tue, 31 Oct 2023 09:48:56 +0100
Subject: [PATCH] Updating Auditor to 2.0.3, Trivy to 0.46.1 and NGINX to
 1.25.3

---
 .gitignore                               | 2 +-
 _versions.sh                             | 6 +++---
 util/02__update/check_latest_versions.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index c403ae3..d4ead48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@
 conf/Fernflower/excluded_sha1.txt
 conf/CSA/default-bins.yaml
 conf/CSA/custom-rules/*
-conf/CSA/default-rules/*
+conf/CSA/default-rules*
 conf/CSA/tmp-rules/*
 conf/CSA/tmp-bins.yaml
 dist/bagger/target
diff --git a/_versions.sh b/_versions.sh
index 7a90394..edcb83a 100755
--- a/_versions.sh
+++ b/_versions.sh
@@ -7,7 +7,7 @@
 ##############################################################################################################
 
 # Current version of Application Portfolio Auditor
-export TOOL_VERSION='2.0.2'
+export TOOL_VERSION='2.0.3'
 
 # Java version used for Bagger and Fernflower
 export JAVA_VERSION='20'
@@ -41,11 +41,11 @@ export SLSCAN_VERSION='2.1.1'
 export INSIDER_VERSION='3.0.0'
 export SYFT_VERSION='0.94.0'
 export GRYPE_VERSION='0.72.0'
-export TRIVY_VERSION='0.46.0'
+export TRIVY_VERSION='0.46.1'
 
 # Other
 export MUSTACHE_VERSION="3.0.3"
-export NGINX_VERSION="1.25.2"
+export NGINX_VERSION="1.25.3"
 export NIST_MIRROR_VERSION="1.6.0"
 export D3_VERSION="7.8.5"
 export JQUERY_VERSION="3.7.1"
diff --git a/util/02__update/check_latest_versions.py b/util/02__update/check_latest_versions.py
index cd25c94..22940c7 100755
--- a/util/02__update/check_latest_versions.py
+++ b/util/02__update/check_latest_versions.py
@@ -162,7 +162,7 @@ async def print_ok_message(message,line_idx):
         (check_github, 'nexB/scancode-toolkit', r'.*/tag/v(.+)', 'ScanCode', SCANCODE_VERSION, None),
         (check_github, 'AlDanial/cloc', r'.*/tag/v(.+)', 'CLOC', CLOC_VERSION, None),
         ## Windup: Versions from 6.2.x do not allow multiple targets
-        (check_github, 'windup/windup-distribution', r'.*/tag/(.+).Final', 'Windup', WINDUP_VERSION, '6.3.2'),
+        (check_github, 'windup/windup-distribution', r'.*/tag/(.+).Final', 'Windup', WINDUP_VERSION, '6.3.3'),
         (check_github, 'vmware-tanzu/cloud-suitability-analyzer', r'.*/tag/(.+)', 'CSA', CSA_VERSION, None),
         (check_github, 'microsoft/ApplicationInspector', r'.*/tag/v(.+)', 'MAI', MAI_VERSION, None),
         (check_github, 'github/linguist', r'.*/tag/v(.+)', 'Linguist', LINGUIST_VERSION, None),