From 1e423206edb08ad07a802428ed3098ee0c04dfce Mon Sep 17 00:00:00 2001
From: Sascha Doemer <Cf4ThQgxcnxAovOUXTNv@saschadoemer.de>
Date: Wed, 22 Jun 2022 15:07:48 +0200
Subject: [PATCH 1/2] Adapt version declaration for easier update.

---
 agrirouter-sdk-java-api/pom.xml |  2 +-
 pom.xml                         | 91 ++++++++++-----------------------
 2 files changed, 29 insertions(+), 64 deletions(-)

diff --git a/agrirouter-sdk-java-api/pom.xml b/agrirouter-sdk-java-api/pom.xml
index fc6f38eb..41cf0da9 100644
--- a/agrirouter-sdk-java-api/pom.xml
+++ b/agrirouter-sdk-java-api/pom.xml
@@ -59,7 +59,7 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.version}</version>
+                <version>1.3.71</version>
                 <executions>
                     <execution>
                         <id>compile</id>
diff --git a/pom.xml b/pom.xml
index 98d85834..c3a2d173 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,37 +70,6 @@
         <maven-compiler-plugin.encoding>UTF-8</maven-compiler-plugin.encoding>
         <maven-compiler-plugin.source>1.8</maven-compiler-plugin.source>
         <maven-compiler-plugin.target>1.8</maven-compiler-plugin.target>
-
-        <!-- DEPENDENCIES -->
-        <rest-assured.version>4.3.0</rest-assured.version>
-        <junit-jupiter.version>5.6.1</junit-jupiter.version>
-        <junit-vintage.version>4.12.2</junit-vintage.version>
-        <junit-platform.version>1.6.1</junit-platform.version>
-        <commons-lang3.version>3.10</commons-lang3.version>
-        <bcprov-jdk15on.version>1.67</bcprov-jdk15on.version>
-        <jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
-        <gson.version>2.8.6</gson.version>
-        <jersey-client.version>2.30.1</jersey-client.version>
-        <httpcore.version>4.4.13</httpcore.version>
-        <protobuf.version>3.16.1</protobuf.version>
-        <htmlunit.version>2.38.0</htmlunit.version>
-        <activation.version>1.1.1</activation.version>
-        <kotlin.version>1.3.71</kotlin.version>
-        <org.eclipse.paho.client.mqttv3.version>1.2.4</org.eclipse.paho.client.mqttv3.version>
-        <commons-codec.version>1.14</commons-codec.version>
-        <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
-        <annotations.version>19.0.0</annotations.version>
-        <jackson-annotations.version>2.11.0.rc1</jackson-annotations.version>
-        <agrirouter-api-protobuf-definitions.version>1.1.1</agrirouter-api-protobuf-definitions.version>
-        <slf4j-api.version>1.7.32</slf4j-api.version>
-
-        <!-- PLUGINS -->
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
-        <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
-        <build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version>
-        <fmt-maven-plugin.version>2.9</fmt-maven-plugin.version>
-        <guava.version>30.1.1-jre</guava.version>
     </properties>
 
     <dependencyManagement>
@@ -127,7 +96,7 @@
             <dependency>
                 <groupId>com.agrirouter.proto</groupId>
                 <artifactId>agrirouter-api-protobuf-definitions</artifactId>
-                <version>${agrirouter-api-protobuf-definitions.version}</version>
+                <version>1.1.1</version>
             </dependency>
 
             <!-- ADDITIONAL PROTOBUF DEFINITIONS -->
@@ -141,7 +110,7 @@
             <dependency>
                 <groupId>io.rest-assured</groupId>
                 <artifactId>rest-assured</artifactId>
-                <version>${rest-assured.version}</version>
+                <version>4.3.0</version>
                 <scope>test</scope>
             </dependency>
 
@@ -149,25 +118,25 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
-                <version>${junit-jupiter.version}</version>
+                <version>5.6.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-params</artifactId>
-                <version>${junit-jupiter.version}</version>
+                <version>5.6.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit-jupiter.version}</version>
+                <version>5.6.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.junit.platform</groupId>
                 <artifactId>junit-platform-launcher</artifactId>
-                <version>${junit-platform.version}</version>
+                <version>1.6.1</version>
                 <scope>test</scope>
             </dependency>
 
@@ -175,118 +144,118 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3.version}</version>
+                <version>3.10</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>${commons-codec.version}</version>
+                <version>1.14</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>${bcprov-jdk15on.version}</version>
+                <version>1.67</version>
             </dependency>
 
             <!-- JAXB -->
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
-                <version>${jaxb-api.version}</version>
+                <version>2.4.0-b180830.0359</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>javax.activation</groupId>
                 <artifactId>activation</artifactId>
-                <version>${activation.version}</version>
+                <version>1.1.1</version>
             </dependency>
 
             <!-- GSON -->
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-                <version>${gson.version}</version>
+                <version>2.8.6</version>
             </dependency>
 
             <!-- JERSEY -->
             <dependency>
                 <groupId>org.glassfish.jersey.core</groupId>
                 <artifactId>jersey-client</artifactId>
-                <version>${jersey-client.version}</version>
+                <version>2.30.1</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.inject</groupId>
                 <artifactId>jersey-hk2</artifactId>
-                <version>${jersey-client.version}</version>
+                <version>2.30.1</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.media</groupId>
                 <artifactId>jersey-media-json-jackson</artifactId>
-                <version>${jersey-client.version}</version>
+                <version>2.30.1</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
-                <version>${jackson-annotations.version}</version>
+                <version>2.11.0.rc1</version>
             </dependency>
 
             <!-- HTTP -->
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>${httpcore.version}</version>
+                <version>4.4.13</version>
             </dependency>
 
             <!-- LOGGING -->
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>${slf4j-api.version}</version>
+                <version>1.7.32</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-nop</artifactId>
-                <version>${slf4j-api.version}</version>
+                <version>1.7.32</version>
             </dependency>
 
             <!-- MQTT -->
             <dependency>
                 <groupId>org.eclipse.paho</groupId>
                 <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-                <version>${org.eclipse.paho.client.mqttv3.version}</version>
+                <version>1.2.4</version>
             </dependency>
 
             <!-- PROTOBUF -->
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
-                <version>${protobuf.version}</version>
+                <version>3.16.1</version>
             </dependency>
 
             <!-- KOTLIN -->
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-stdlib</artifactId>
-                <version>${kotlin.version}</version>
+                <version>1.3.71</version>
             </dependency>
             <dependency>
                 <groupId>org.jetbrains</groupId>
                 <artifactId>annotations</artifactId>
-                <version>${annotations.version}</version>
+                <version>19.0.0</version>
             </dependency>
 
             <!-- JAX-RS -->
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
-                <version>${javax.ws.rs-api.version}</version>
+                <version>2.1.1</version>
             </dependency>
 
             <!-- GUAVA -->
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
+                <version>30.1.1-jre</version>
             </dependency>
 
         </dependencies>
@@ -305,14 +274,10 @@
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>${build-helper-maven-plugin.version}</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -332,7 +297,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>${maven-compiler-plugin.source}</source>
                     <target>${maven-compiler-plugin.target}</target>
@@ -366,7 +331,7 @@
             <plugin>
                 <groupId>com.coveo</groupId>
                 <artifactId>fmt-maven-plugin</artifactId>
-                <version>${fmt-maven-plugin.version}</version>
+                <version>2.9</version>
                 <executions>
                     <execution>
                         <goals>

From 7ec1517226f1a3c38c289c83a46b6f762284fea2 Mon Sep 17 00:00:00 2001
From: Sascha Doemer <Cf4ThQgxcnxAovOUXTNv@saschadoemer.de>
Date: Wed, 22 Jun 2022 15:37:43 +0200
Subject: [PATCH 2/2] Update versions to resolve CVE warnings.

---
 agrirouter-sdk-java-api/pom.xml |  6 ++++-
 pom.xml                         | 40 ++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/agrirouter-sdk-java-api/pom.xml b/agrirouter-sdk-java-api/pom.xml
index 41cf0da9..edd8aa48 100644
--- a/agrirouter-sdk-java-api/pom.xml
+++ b/agrirouter-sdk-java-api/pom.xml
@@ -52,6 +52,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -59,7 +63,7 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>1.3.71</version>
+                <version>1.7.0</version>
                 <executions>
                     <execution>
                         <id>compile</id>
diff --git a/pom.xml b/pom.xml
index c3a2d173..c02cb6d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,14 +103,14 @@
             <dependency>
                 <groupId>com.agrirouter.proto</groupId>
                 <artifactId>agrirouter-tmt-protobuf-definitions</artifactId>
-                <version>2.0.0</version>
+                <version>2.1.0</version>
             </dependency>
 
             <!-- REST-ASSURED -->
             <dependency>
                 <groupId>io.rest-assured</groupId>
                 <artifactId>rest-assured</artifactId>
-                <version>4.3.0</version>
+                <version>5.1.1</version>
                 <scope>test</scope>
             </dependency>
 
@@ -118,13 +118,13 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
-                <version>5.6.1</version>
+                <version>5.8.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-params</artifactId>
-                <version>5.6.1</version>
+                <version>5.8.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -144,17 +144,17 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.10</version>
+                <version>3.12.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.14</version>
+                <version>1.15</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>1.67</version>
+                <version>1.70</version>
             </dependency>
 
             <!-- JAXB -->
@@ -174,74 +174,74 @@
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-                <version>2.8.6</version>
+                <version>2.9.0</version>
             </dependency>
 
             <!-- JERSEY -->
             <dependency>
                 <groupId>org.glassfish.jersey.core</groupId>
                 <artifactId>jersey-client</artifactId>
-                <version>2.30.1</version>
+                <version>2.35</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.inject</groupId>
                 <artifactId>jersey-hk2</artifactId>
-                <version>2.30.1</version>
+                <version>2.35</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.media</groupId>
                 <artifactId>jersey-media-json-jackson</artifactId>
-                <version>2.30.1</version>
+                <version>2.35</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
-                <version>2.11.0.rc1</version>
+                <version>2.13.3</version>
             </dependency>
 
             <!-- HTTP -->
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.13</version>
+                <version>4.4.15</version>
             </dependency>
 
             <!-- LOGGING -->
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.7.32</version>
+                <version>1.7.36</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-nop</artifactId>
-                <version>1.7.32</version>
+                <version>1.7.36</version>
             </dependency>
 
             <!-- MQTT -->
             <dependency>
                 <groupId>org.eclipse.paho</groupId>
                 <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-                <version>1.2.4</version>
+                <version>1.2.5</version>
             </dependency>
 
             <!-- PROTOBUF -->
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
-                <version>3.16.1</version>
+                <version>3.21.1</version>
             </dependency>
 
             <!-- KOTLIN -->
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-stdlib</artifactId>
-                <version>1.3.71</version>
+                <version>1.7.0</version>
             </dependency>
             <dependency>
                 <groupId>org.jetbrains</groupId>
                 <artifactId>annotations</artifactId>
-                <version>19.0.0</version>
+                <version>23.0.0</version>
             </dependency>
 
             <!-- JAX-RS -->
@@ -255,7 +255,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>30.1.1-jre</version>
+                <version>31.1-jre</version>
             </dependency>
 
         </dependencies>