From af59c74c1f4fc560a589533d07496e1807479bf0 Mon Sep 17 00:00:00 2001
From: Centaurioun <86323645+Centaurioun@users.noreply.github.com>
Date: Wed, 11 Jan 2023 20:12:56 +0300
Subject: [PATCH 1/4] fix: json-modules/json/src/main/webapp/package.json to
 reduce vulnerabilities (#425)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-DEBUG-3227433

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
---
 json-modules/json/src/main/webapp/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/json-modules/json/src/main/webapp/package.json b/json-modules/json/src/main/webapp/package.json
index 5dae00059373..f321fc1db53a 100644
--- a/json-modules/json/src/main/webapp/package.json
+++ b/json-modules/json/src/main/webapp/package.json
@@ -4,8 +4,8 @@
     "version": "0.0.1",
     "license": "MIT",
     "dependencies": {
-         "typings": "0.6.5",
-         "jsonforms": "0.0.19",
+         "typings": "0.7.0",
+         "jsonforms": "0.0.20",
          "bootstrap": "3.3.6"
      }
 }
\ No newline at end of file

From 10f5ee8321d1cc038d5613e507f7dfcb9e5a9b41 Mon Sep 17 00:00:00 2001
From: Centaurioun <86323645+Centaurioun@users.noreply.github.com>
Date: Wed, 11 Jan 2023 20:56:45 +0300
Subject: [PATCH 2/4] ci(Mergify): configuration update (#443)

Signed-off-by: null <null>

Signed-off-by: null <null>
---
 .mergify.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 000000000000..fac2166e311e
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,7 @@
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions:
+      - "#approved-reviews-by>=1"
+    actions:
+      merge:
+        method: merge

From 7247a048198d2f3bb21f19c3b97d470637394efd Mon Sep 17 00:00:00 2001
From: Snyk bot <github+bot@snyk.io>
Date: Fri, 3 Mar 2023 23:48:39 +0100
Subject: [PATCH 3/4] [Snyk] Security upgrade org.apache.kafka:kafka-streams
 from 3.3.1 to 3.4.0 (#622)

* fix: libraries-data/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEKAFKA-3317161

* Restyled by whitespace (#623)

Co-authored-by: Restyled.io <commits@restyled.io>

---------

Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>
---
 libraries-data/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 85edf8b69a33..157de2e9b5fe 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -169,7 +169,7 @@
         <assembly.plugin.version>2.3</assembly.plugin.version>
         <httpclient.version>3.1</httpclient.version>
         <storm.version>1.2.2</storm.version>
-        <kafka.version>3.3.1</kafka.version>
+        <kafka.version>3.4.0</kafka.version>
         <ignite.version>2.4.0</ignite.version>
         <gson.version>2.9.1</gson.version>
         <cache.version>1.1.1</cache.version>
@@ -180,4 +180,4 @@
         <jmapper.version>1.6.0.1</jmapper.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>

From 8fdb0a8770930169f1ac5418e86129c515a289f0 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Fri, 24 Mar 2023 00:45:52 +0000
Subject: [PATCH 4/4] fix: messaging-modules/spring-jms/pom.xml to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-3369749
---
 messaging-modules/spring-jms/pom.xml | 170 +++++++++++++--------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/messaging-modules/spring-jms/pom.xml b/messaging-modules/spring-jms/pom.xml
index 398a2ec54c92..ed85ba77b117 100644
--- a/messaging-modules/spring-jms/pom.xml
+++ b/messaging-modules/spring-jms/pom.xml
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-jms</artifactId>
-    <name>spring-jms</name>
-    <packaging>war</packaging>
-    <description>Introduction to Spring JMS</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>messaging-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <!-- Spring JMS -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jms</artifactId>
-            <version>${springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- ActiveMQ -->
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-all</artifactId>
-            <version>${activemq.version}</version>
-        </dependency>
-        <!-- Test -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring-boot-test.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>4.6.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq.tooling</groupId>
-            <artifactId>activemq-junit</artifactId>
-            <version>5.16.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <version>1.17.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>${maven-war-plugin.version}</version>
-                    <configuration>
-                        <warSourceDirectory>src/main/webapp</warSourceDirectory>
-                        <warName>spring-jms</warName>
-                        <failOnMissingWebXml>false</failOnMissingWebXml>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <finalName>spring-jms</finalName>
-    </build>
-
-    <properties>
-        <springframework.version>4.3.4.RELEASE</springframework.version>
-        <activemq.version>5.14.1</activemq.version>
-        <spring-boot-test.version>1.5.10.RELEASE</spring-boot-test.version>
-    </properties>
-
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-jms</artifactId>
+    <name>spring-jms</name>
+    <packaging>war</packaging>
+    <description>Introduction to Spring JMS</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>messaging-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <!-- Spring JMS -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jms</artifactId>
+            <version>${springframework.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- ActiveMQ -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-all</artifactId>
+            <version>${activemq.version}</version>
+        </dependency>
+        <!-- Test -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot-test.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>4.6.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq.tooling</groupId>
+            <artifactId>activemq-junit</artifactId>
+            <version>5.16.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.17.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven-war-plugin.version}</version>
+                    <configuration>
+                        <warSourceDirectory>src/main/webapp</warSourceDirectory>
+                        <warName>spring-jms</warName>
+                        <failOnMissingWebXml>false</failOnMissingWebXml>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <finalName>spring-jms</finalName>
+    </build>
+
+    <properties>
+        <springframework.version>5.0.0.RELEASE</springframework.version>
+        <activemq.version>5.14.1</activemq.version>
+        <spring-boot-test.version>1.5.10.RELEASE</spring-boot-test.version>
+    </properties>
+
 </project>