Merge branch 'main' into feature/update-gh-actions

.github/workflows/ci.yml

@@ -51,8 +51,11 @@ jobs:
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@v3
         env:
-          GITHUB_DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
-          GITHUB_DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
+          ORG_GRADLE_PROJECT_deployUsername: ${{ secrets.DEPLOY_USER }}
+          ORG_GRADLE_PROJECT_deployToken: ${{ secrets.DEPLOY_TOKEN }}
+          ORG_GRADLE_PROJECT_deplyRepository: ${{ secrets.DEPLOY_REPOSITORY }}
+          GITHUB_DEPLOY_USER: ${{ github.actor }}
+          GITHUB_DEPLOY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_DEPLOY_REPOSITORY: ${{ secrets.DEPLOY_REPOSITORY }}
         with:
           gradle-version: 8.0.2

.github/workflows/publish.yml

@@ -28,16 +28,6 @@ jobs:
           java-version: 11
           architecture: x64
 
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-version: 8.0.2
-          arguments: createRelease
-        env:
-          GITHUB_DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
-          GITHUB_DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
-          GITHUB_DEPLOY_REPOSITORY: ${{ secrets.DEPLOY_REPOSITORY }}
-
       - name: Set Main Version
         run: echo "MAIN_VERSION=${{ github.event.release.name }}" >> src/main/java/org/spin/base/version.properties
 
@@ -47,6 +37,19 @@ jobs:
       - name: Set Implementation Version
         run: echo "IMPLEMENTATION_VERSION=${{ github.event.release.tag_name }}" >> src/main/java/org/spin/base/version.properties
 
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v3
+        with:
+          gradle-version: 8.0.2
+          arguments: createRelease
+        env:
+          ORG_GRADLE_PROJECT_deployUsername: ${{ secrets.DEPLOY_USER }}
+          ORG_GRADLE_PROJECT_deployToken: ${{ secrets.DEPLOY_TOKEN }}
+          ORG_GRADLE_PROJECT_deplyRepository: ${{ secrets.DEPLOY_REPOSITORY }}
+          GITHUB_DEPLOY_USER: ${{ github.actor }}
+          GITHUB_DEPLOY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_DEPLOY_REPOSITORY: ${{ secrets.DEPLOY_REPOSITORY }}
+
       - name: Upload descriptor file artifact
         uses: actions/upload-artifact@v4
         with:

.gitignore

@@ -23,5 +23,9 @@
 hs_err_pid*
 /bin/
 /.gradle/
+/libs/
+/dependences/
 /build/
-*.properties
+*.properties
+# skip folder dependencies
+!dependencies/*.jar

build.gradle

@@ -84,16 +84,17 @@ protobuf {
 }
 
 sourceSets {
-    main {
-        java {
-            srcDirs 'build/generated/source/proto/main/grpc'
-            srcDirs 'build/generated/source/proto/main/java'
-            srcDirs 'src/main/proto'
-        }
+	main {
+		java {
+			srcDirs 'build/generated/source/proto/main/grpc'
+			srcDirs 'build/generated/source/proto/main/java'
+			srcDirs 'src/main/proto'
+		}
 		resources {
+			srcDirs 'src/main/java'
 			include 'org/spin/base/version.properties'
 		}
-    }
+	}
 }
 
 // Copy proto descriptor another folder
@@ -111,16 +112,16 @@ allprojects {
 	}
 }
 
-task AdempiereTemplateServer(type: CreateStartScripts) {
+task AdempiereReportEngineServer(type: CreateStartScripts) {
 	mainClass = javaMainClass
-    applicationName = 'adempiere-report-engine-service-server'
-    outputDir = new File(project.buildDir, 'tmp')
-    classpath = jar.outputs.files + project.configurations.runtimeClasspath
+	applicationName = 'adempiere-report-engine-service-server'
+	outputDir = new File(project.buildDir, 'tmp')
+	classpath = jar.outputs.files + project.configurations.runtimeClasspath
 }
 
 applicationDistribution.into('bin') {
-	from(AdempiereTemplateServer)
-    fileMode = 0755
+	from(AdempiereReportEngineServer)
+	fileMode = 0755
 }
 
 //	Create release for project

src/main/java/org/spin/base/Version.java

@@ -21,13 +21,17 @@
 import java.text.SimpleDateFormat;
 import java.util.Properties;
 
+import org.compiere.util.CLogger;
+
 /**
  * @author Edwin Betancourt, EdwinBetanc0urt@outlook.com, https://github.com/EdwinBetanc0urt
  * Service for backend of Version
  */
 public final class Version
 {
 
+	private static CLogger log = CLogger.getCLogger(Version.class);
+
 	/** Main Version String         */
 	// Conventions for naming second number is even for stable, and odd for unstable
 	// the releases will have a suffix (a) for alpha - (b) for beta - (t) for trunk - (s) for stable - and (LTS) for long term support
@@ -60,7 +64,8 @@ public final class Version
 					IMPLEMENTATION_VERSION = properties.getProperty("IMPLEMENTATION_VERSION");
 				}
 			} catch (IOException e) {
-				// file does not exist
+				// file does not exists
+				log.warning("File version.properties does no exists");
 			}
 		}
 	}

src/main/java/org/spin/report_engine/server/ReportEngineServer.java

@@ -44,6 +44,7 @@ public class ReportEngineServer {
 	/** Services/Methods allow request without Bearer token validation */
 	private List<String> ALLOW_REQUESTS_WITHOUT_TOKEN = Arrays.asList(
 		// proto package . proto service / proto method
+		"report_engine.ReportEngine/GetSystemInfo"
 	);
 
 	/**	Revoke session	*/