From ef51173e72ed696d3dd9c05b0462224d9d673f38 Mon Sep 17 00:00:00 2001
From: Anton Seredkin <anton.seredkin@instana.com>
Date: Mon, 7 Aug 2023 17:44:53 +0200
Subject: [PATCH] Updates in version 1.0.1-SNAPSHOT:  * Protostuff 1.7.4  *
 Maven plugin to 3.11.0  * Java Source/Targets set to 17 and tested with 8 and
 11  * annotation-api 1.3.2 as direct dependency as it is optional after Java
 8  * Junit 4.13.2  * Guava 32.1.2-jre

---
 code-generation/plugin-proto-compiler/pom.xml |  7 ++++++-
 code-generation/pom.xml                       |  2 +-
 hello-world/pom.xml                           |  7 ++++++-
 multimodule-imports/a/pom.xml                 |  9 +++++++--
 multimodule-imports/b/pom.xml                 |  9 +++++++--
 multimodule-imports/pom.xml                   |  2 +-
 pom.xml                                       | 20 +++++++++++--------
 runtime-schema-usage/pom.xml                  |  3 +--
 8 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/code-generation/plugin-proto-compiler/pom.xml b/code-generation/plugin-proto-compiler/pom.xml
index 99fb78e..52bc113 100644
--- a/code-generation/plugin-proto-compiler/pom.xml
+++ b/code-generation/plugin-proto-compiler/pom.xml
@@ -5,13 +5,18 @@
     <parent>
         <artifactId>code-generation</artifactId>
         <groupId>io.protostuff.examples</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>plugin-proto-compiler</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.protostuff</groupId>
             <artifactId>protostuff-core</artifactId>
diff --git a/code-generation/pom.xml b/code-generation/pom.xml
index 9a573a6..6b265fc 100644
--- a/code-generation/pom.xml
+++ b/code-generation/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>protostuff-examples</artifactId>
         <groupId>io.protostuff.examples</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>code-generation</artifactId>
diff --git a/hello-world/pom.xml b/hello-world/pom.xml
index 54a4db9..ef2351b 100644
--- a/hello-world/pom.xml
+++ b/hello-world/pom.xml
@@ -5,13 +5,18 @@
     <parent>
         <artifactId>protostuff-examples</artifactId>
         <groupId>io.protostuff.examples</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>hello-world</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.protostuff</groupId>
             <artifactId>protostuff-core</artifactId>
diff --git a/multimodule-imports/a/pom.xml b/multimodule-imports/a/pom.xml
index 25aee26..257554d 100644
--- a/multimodule-imports/a/pom.xml
+++ b/multimodule-imports/a/pom.xml
@@ -5,17 +5,22 @@
     <parent>
         <artifactId>multimodule-imports</artifactId>
         <groupId>io.protostuff.examples</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>a</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.protostuff</groupId>
             <artifactId>protostuff-core</artifactId>
-            <version>1.3.6</version>
+            <version>${protostuff.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/multimodule-imports/b/pom.xml b/multimodule-imports/b/pom.xml
index 5032bf6..ffe94d2 100644
--- a/multimodule-imports/b/pom.xml
+++ b/multimodule-imports/b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>multimodule-imports</artifactId>
         <groupId>io.protostuff.examples</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,6 +14,11 @@
     <dependencies>
         <!-- Add dependency to "a" - it contains imported proto file and generated classes. -->
         <!-- Each maven module compile only its own proto-s. -->
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.protostuff.examples</groupId>
             <artifactId>a</artifactId>
@@ -22,7 +27,7 @@
         <dependency>
             <groupId>io.protostuff</groupId>
             <artifactId>protostuff-core</artifactId>
-            <version>1.3.6</version>
+            <version>${protostuff.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/multimodule-imports/pom.xml b/multimodule-imports/pom.xml
index 2ce45cf..809a3a6 100644
--- a/multimodule-imports/pom.xml
+++ b/multimodule-imports/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protostuff-examples</artifactId>
         <groupId>io.protostuff.examples</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 2c6842e..11bf603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,15 @@
 
     <groupId>io.protostuff.examples</groupId>
     <artifactId>protostuff-examples</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <protostuff.version>1.3.7</protostuff.version>
-        <guava.version>18.0</guava.version>
-        <junit.version>4.12</junit.version>
+        <protostuff.version>1.7.4</protostuff.version>
+        <guava.version>32.1.2-jre</guava.version>
+        <junit.version>4.13.2</junit.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
     </properties>
 
     <modules>
@@ -27,15 +28,18 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.2</version>
+                    <version>3.11.0</version>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <!-- Java 17 : source and target 8 or greater -->
+                        <!-- Java 8-11 : source and target 6 or greater -->
+                        <source>8</source>
+                        <target>8</target>
                     </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/runtime-schema-usage/pom.xml b/runtime-schema-usage/pom.xml
index 3a58328..3b0ee3c 100644
--- a/runtime-schema-usage/pom.xml
+++ b/runtime-schema-usage/pom.xml
@@ -5,13 +5,12 @@
     <parent>
         <artifactId>protostuff-examples</artifactId>
         <groupId>io.protostuff.examples</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>runtime-schema-usage</artifactId>
 
-
     <dependencies>
         <dependency>
             <groupId>io.protostuff</groupId>