fix: fixed build related issues

YarikRevich · Oct 5, 2024 · c579c36 · c579c36
1 parent 77173b7
commit c579c36
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 36 deletions.
diff --git a/Makefile b/Makefile
@@ -28,13 +28,13 @@ lint: ## Run Apache Spotless linter
 	@mvn spotless:apply
 
 .PHONY: create-local-client
-create-local-client: ## Create ResourceTracker local directory for client
+create-local-client: ## Create RepoAchiever local directory for client
 .PHONY: create-local-client
-create-local-client: ## Create ResourceTracker local directory for client
+create-local-client: ## Create RepoAchiever local directory for client
 	@mkdir -p $(HOME)/.repoachiever/config/swap
 
 .PHONY: create-local-api-server
-create-local-api-server: ## Create ResourceTracker local directory for API Server
+create-local-api-server: ## Create RepoAchiever local directory for API Server
 	@mkdir -p $(HOME)/.repoachiever/config
 	@mkdir -p $(HOME)/.repoachiever/diagnostics/prometheus/internal
 	@mkdir -p $(HOME)/.repoachiever/diagnostics/prometheus/config
@@ -57,13 +57,6 @@ clone-api-server-config: ## Clone RepoAchiever API Server configuration files to
 	@cp -r ./config/prometheus/prometheus.tmpl $(HOME)/.repoachiever/diagnostics/prometheus/config
 	@cp -r ./samples/config/api-server/api-server.yaml $(HOME)/.repoachiever/config
 
-.PHONY: clone-worker
-clone-worker: ## Clone Worker JAR into a RepoAchiever local directory
-ifeq (,$(wildcard $(HOME)/.repoachiever/bin/worker))
-	@mkdir -p $(HOME)/.repoachiever/bin
-endif
-	@cp -r ./bin/worker $(HOME)/.repoachiever/bin/
-
 .PHONY: clone-cluster
 clone-cluster: ## Clone Cluster JAR into a RepoAchiever local directory
 ifeq (,$(wildcard $(HOME)/.repoachiever/bin/cluster))
@@ -78,18 +71,6 @@ ifeq (,$(wildcard $(HOME)/.repoachiever/bin/api-server))
 endif
 	@cp -r ./bin/api-server $(HOME)/.repoachiever/bin/
 
-.PHONY: build-worker
-build-worker: clean ## Build Worker application
-ifneq (,$(wildcard ./bin/worker))
-	@rm -r ./bin/worker
-endif
-ifeq ($(dev), 'false')
-	@mvn -pl worker -T10 install
-else
-	@mvn -P dev -pl worker -T10 install
-endif
-	$(MAKE) clone-worker
-
 .PHONY: build-cluster
 build-cluster: clean ## Build Cluster application
 ifneq (,$(wildcard ./bin/cluster))

diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
 # RepoAchiever
 
-[![Build](https://github.com/YarikRevich/RepoAchiever/actions/workflows/build.yml/badge.svg)](https://github.com/YarikRevich/ResourceTracker/actions/workflows/build.yml)
+[![Build](https://github.com/YarikRevich/RepoAchiever/actions/workflows/build.yml/badge.svg)](https://github.com/YarikRevich/RepoAchiever/actions/workflows/build.yml)
 ![Linux](https://img.shields.io/badge/Linux-FCC624?style=for-the-badge&logo=linux&logoColor=black)
 ![MacOS](https://img.shields.io/badge/MacOS-8773f5?style=for-the-badge&logo=macos&logoColor=black)
+![OpenJDK](https://img.shields.io/badge/JDK-23-65bd60?style=for-the-badge)
 [![StandWithUkraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
 
 ## General Information

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -3,7 +3,7 @@
   <artifactId>cli</artifactId>
   <version>1.0-SNAPSHOT</version>
   <name>cli</name>
-  <description>CLI for ResourceTracker</description>
+  <description>CLI for RepoAchiever</description>
 
   <parent>
     <groupId>com.repoachiever</groupId>

diff --git a/cluster/pom.xml b/cluster/pom.xml
@@ -174,14 +174,14 @@
           <groupId>com.google.cloud.tools</groupId>
           <artifactId>jib-maven-plugin</artifactId>
         </plugin>
-        <plugin>
+        <!-- <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-            <source>19</source>
-            <target>19</target>
+            <source>22</source>
+            <target>22</target>
           </configuration>
-        </plugin>
+        </plugin> -->
         <plugin>
           <groupId>com.coderplus.maven.plugins</groupId>
           <artifactId>copy-rename-maven-plugin</artifactId>

diff --git a/gui/pom.xml b/gui/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>gui</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>gui</name>
-    <description>GUI for ResourceTracker</description>
+    <description>GUI for RepoAchiever</description>
 
     <parent>
         <groupId>com.repoachiever</groupId>

diff --git a/pom.xml b/pom.xml
@@ -23,10 +23,6 @@
   </modules>
 
   <properties>
-    <java.release>21</java.release>
-    <java.version>21</java.version>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
     <main.basedir>${project.basedir}</main.basedir>
     <default.package>com.repoachiever</default.package>
   </properties>
@@ -279,7 +275,7 @@
       <dependency>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>
-        <version>1.18.30</version>
+        <version>1.18.34</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -533,8 +529,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-            <source>21</source>
-            <target>21</target>
+            <release>22</release>
             <compilerArgs>--enable-preview</compilerArgs>
           </configuration>
         </plugin>