[ofbiz-framework] branch trunk updated: Improved: Try to reduce the SARIF file used by CodeQL for Java classes (OFBIZ-12361)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 13da3fd  Improved: Try to reduce the SARIF file used by CodeQL for 
Java classes (OFBIZ-12361)
13da3fd is described below

commit 13da3fdf8801d29f8735ecaa562b51ab76809971
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Nov 16 12:10:26 2021 +0100

    Improved: Try to reduce the SARIF file used by CodeQL for Java classes 
(OFBIZ-12361)
    
    Forgot 2 things:
    I created a Jira (here is the ref)
    I removed Java analysis (here it's back)
    
    Now uses again adityasharad's syntax, not sure it's the right one and place
    It also needs a not functional change for codeQL to run
    
    Thanks: adityasharad from GH CodeQL
    See 
https://github.com/github/vscode-codeql/issues/735#issuecomment-969348461
---
 .github/workflows/codeql-analysis.yml                             | 8 +++-----
 .../org/apache/ofbiz/party/party/PartyRelationshipServices.java   | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml 
b/.github/workflows/codeql-analysis.yml
index 70814bb..1a3f2be 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,8 +50,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        #language: [ 'java', 'javascript' ]
-        language: [ 'javascript' ]
+        language: [ 'java', 'javascript' ]
+        #language: [ 'javascript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 
'python' ]
         # Learn more:
         # 
https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
@@ -89,8 +89,6 @@ jobs:
     #- name: Perform CodeQL Analysis
     # uses: github/codeql-action/analyze@v1
 
-    - name: Debug
-      uses: github/codeql-action/analyze@v1
+    - uses: github/codeql-action@v1
       with:
         debug: true
-
diff --git 
a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipServices.java
 
b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipServices.java
index 71fa985..22ebe89 100644
--- 
a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipServices.java
+++ 
b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipServices.java
@@ -46,7 +46,6 @@ import org.apache.ofbiz.service.ServiceUtil;
 public class PartyRelationshipServices {
 
     private static final String MODULE = 
PartyRelationshipServices.class.getName();
-    private static final String RESOURCE = "PartyUiLabels";
     private static final String RES_ERROR = "PartyErrorUiLabels";
 
     /** Creates and updates a PartyRelationship creating related PartyRoles if 
needed.