From f8c17e70ff0ce883706b312e18eebfe8bc70f338 Mon Sep 17 00:00:00 2001
From: Martin Kuba <makub@ics.muni.cz>
Date: Tue, 5 Nov 2024 17:10:54 +0100
Subject: [PATCH] security updates of dependencies

---
 cloud/pom.xml          |  4 ++--
 metaacct/pom.xml       |  4 ++--
 metaacct_cmd/pom.xml   |  4 ++--
 pbsmon/pom.xml         |  4 ++--
 perun_machines/pom.xml |  2 +-
 pom.xml                | 52 ++++++++++++++++++++++++++++++++++++++----
 renovate.json          |  5 ++--
 7 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/cloud/pom.xml b/cloud/pom.xml
index 17bfd08..b49bbda 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.31</version>
+        <version>3.32</version>
     </parent>
 
     <artifactId>cloud</artifactId>
diff --git a/metaacct/pom.xml b/metaacct/pom.xml
index 3822b53..bfbb858 100644
--- a/metaacct/pom.xml
+++ b/metaacct/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.31</version>
+        <version>3.32</version>
     </parent>
 
     <artifactId>metaacct</artifactId>
diff --git a/metaacct_cmd/pom.xml b/metaacct_cmd/pom.xml
index b0f012e..80ebb75 100644
--- a/metaacct_cmd/pom.xml
+++ b/metaacct_cmd/pom.xml
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.31</version>
+        <version>3.32</version>
     </parent>
 
     <artifactId>metaacct_cmd</artifactId>
diff --git a/pbsmon/pom.xml b/pbsmon/pom.xml
index cfe1386..8638b95 100644
--- a/pbsmon/pom.xml
+++ b/pbsmon/pom.xml
@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.31</version>
+        <version>3.32</version>
     </parent>
 
     <artifactId>pbsmon</artifactId>
diff --git a/perun_machines/pom.xml b/perun_machines/pom.xml
index 0a78fbf..65c8aae 100644
--- a/perun_machines/pom.xml
+++ b/perun_machines/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.31</version>
+        <version>3.32</version>
     </parent>
 
     <artifactId>perun_machines</artifactId>
diff --git a/pom.xml b/pom.xml
index 190a013..d110ef5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>cz.metacentrum</groupId>
     <artifactId>accounting-parent</artifactId>
     <packaging>pom</packaging>
 
     <!--
-    Use "mvn versions:set -DnewVersion=3.31; mvn versions:commit" to change version in all modules
+    Use "mvn versions:set -DnewVersion=3.33; mvn versions:commit" to change version in all modules
      -->
-    <version>3.31</version>
+    <version>3.32</version>
     <name>MetaCentrum Accounting Parent Project</name>
 
     <properties>
         <java.version>17</java.version>
         <taglibs-standard.version>1.2.5</taglibs-standard.version>
-        <commons-lang3.version>3.14.0</commons-lang3.version><!-- fix for missing Range.of() in commons-lang3 3.12 -->
+        <commons-lang3.version>3.17.0</commons-lang3.version><!-- fix for missing Range.of() in commons-lang3 3.12 -->
         <maven.deploy.skip>true</maven.deploy.skip>
+        <spring.version>5.3.39</spring.version>
+        <logback.version>1.4.14</logback.version>
+        <postgresql.version>42.7.4</postgresql.version>
     </properties>
 
     <!-- defines compatible versions of many libraries -->
@@ -30,6 +33,47 @@
     <!-- specifies versions not defined by the Spring platform-bom -->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jdbc</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-expression</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.16.1</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
diff --git a/renovate.json b/renovate.json
index 3a8fde5..22a4d24 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,11 +1,12 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
+    "config:recommended"
   ],
   "ignoreDeps": [
     "com.github.hazendaz:displaytag",
-    "net.sourceforge.stripes:stripes"
+    "net.sourceforge.stripes:stripes",
+    "cz.metacentrum:accounting-parent"
   ],
   "packageRules": [
     {