From 71e354affb7818b1c1308daee3926c4f91e94d0c Mon Sep 17 00:00:00 2001
From: Jacek Wolniewicz <jacekwoln@gmail.com>
Date: Fri, 18 Aug 2023 00:50:32 +0200
Subject: [PATCH] Fix maven

---
 API/pom.xml                                   | 20 +++++++------------
 Client/pom.xml                                |  4 +---
 .../tiktok/http/TikTokApiService.java         |  2 +-
 TestApplication/pom.xml                       | 10 ++--------
 Tools/pom.xml                                 |  4 ++--
 pom.xml                                       |  8 ++++++++
 6 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/API/pom.xml b/API/pom.xml
index 8473fca..651f8d0 100644
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -9,17 +9,15 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>API</artifactId>
-    <packaging>jar</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>3.8.0</version>
-        </dependency>
-    </dependencies>
+
+    <properties>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
     <build>
-        <sourceDirectory>target/generated-sources</sourceDirectory>
+
         <plugins>
             <plugin>
                 <groupId>kr.motd.maven</groupId>
@@ -45,11 +43,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <addProtoSources>all</addProtoSources>
                             <includeMavenTypes>direct</includeMavenTypes>
-                            <includeDirectories>
-                                <include>src/main</include>
-                            </includeDirectories>
                             <inputDirectories>
                                 <include>src/main/proto</include>
                             </inputDirectories>
diff --git a/Client/pom.xml b/Client/pom.xml
index 7811197..6e187eb 100644
--- a/Client/pom.xml
+++ b/Client/pom.xml
@@ -6,12 +6,10 @@
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
         <version>1.0.0</version>
-
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Client</artifactId>
-    <packaging>jar</packaging>
 
 
     <dependencies>
@@ -25,7 +23,7 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>API</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokApiService.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokApiService.java
index 90eadb5..dfe8011 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokApiService.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokApiService.java
@@ -82,7 +82,7 @@ public class TikTokApiService {
         }
     }
 
-    public WebcastResponse fetchClientData()
+    public WebcastResponse  fetchClientData()
     {
         logger.info("Fetch ClientData");
         try {
diff --git a/TestApplication/pom.xml b/TestApplication/pom.xml
index 13894dc..6047cc2 100644
--- a/TestApplication/pom.xml
+++ b/TestApplication/pom.xml
@@ -11,22 +11,16 @@
 
     <artifactId>TestApplication</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>io.github.jwdeveloper.tiktok</groupId>
-            <artifactId>Client</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>API</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>Client</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/Tools/pom.xml b/Tools/pom.xml
index 746894a..e0e6dcb 100644
--- a/Tools/pom.xml
+++ b/Tools/pom.xml
@@ -30,13 +30,13 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>API</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>Client</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index a80ac20..1c0446b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,8 @@
                     </execution>
                 </executions>
             </plugin>
+
+
         </plugins>
     </build>
 
@@ -75,6 +77,12 @@
             <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>3.8.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>