optimize CodeQL

wangliang181230 · Sep 4, 2024 · dc5fc70 · dc5fc70
1 parent 3beae4a
commit dc5fc70
Show file tree

Hide file tree

Showing 35 changed files with 4 additions and 3,937 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -31,9 +31,11 @@ jobs:
         with:
           languages: ${{ matrix.language }}
 
-      - run: ./mvnw -T 4C clean install -DskipTests
-
       # step 3
+      - name: "Build"
+        run: ./mvnw -T 4C clean package -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+      # step 4
       - name: "Perform CodeQL Analysis"
         uses: github/codeql-action/analyze@v3
         with:

diff --git a/common/src/main/java/org/apache/seata/common/result/BaseParam.java b/common/src/main/java/org/apache/seata/common/result/BaseParam.java
@@ -14,11 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-<<<<<<<< HEAD:console/src/main/java/org/apache/seata/console/param/BaseParam.java
-package org.apache.seata.console.param;
-========
 package org.apache.seata.common.result;
->>>>>>>> upstream/2.x:common/src/main/java/org/apache/seata/common/result/BaseParam.java
 
 import java.io.Serializable;
 

diff --git a/common/src/main/java/org/apache/seata/common/result/Code.java b/common/src/main/java/org/apache/seata/common/result/Code.java
@@ -14,18 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-<<<<<<<< HEAD:console/src/main/java/org/apache/seata/console/constant/Code.java
-package org.apache.seata.console.constant;
-
-/**
- * The Code for the response of message
- *
- */
-========
 package org.apache.seata.common.result;
 
 
->>>>>>>> upstream/2.x:common/src/main/java/org/apache/seata/common/result/Code.java
 public enum Code {
     /**
      * response success

diff --git a/common/src/main/java/org/apache/seata/common/result/PageResult.java b/common/src/main/java/org/apache/seata/common/result/PageResult.java
@@ -14,19 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-<<<<<<<< HEAD:console/src/main/java/org/apache/seata/console/result/PageResult.java
-package org.apache.seata.console.result;
-========
 package org.apache.seata.common.result;
->>>>>>>> upstream/2.x:common/src/main/java/org/apache/seata/common/result/PageResult.java
 
 import java.io.Serializable;
 import java.util.List;
 
-<<<<<<<< HEAD:console/src/main/java/org/apache/seata/console/result/PageResult.java
-import org.apache.seata.console.param.BaseParam;
-========
->>>>>>>> upstream/2.x:common/src/main/java/org/apache/seata/common/result/PageResult.java
 /**
  * The page result
  *

diff --git a/common/src/main/java/org/apache/seata/common/result/Result.java b/common/src/main/java/org/apache/seata/common/result/Result.java
@@ -14,11 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-<<<<<<<< HEAD:console/src/main/java/org/apache/seata/console/result/Result.java
-package org.apache.seata.console.result;
-========
 package org.apache.seata.common.result;
->>>>>>>> upstream/2.x:common/src/main/java/org/apache/seata/common/result/Result.java
 
 import java.io.Serializable;
 

diff --git a/common/src/main/java/org/apache/seata/common/result/SingleResult.java b/common/src/main/java/org/apache/seata/common/result/SingleResult.java
@@ -14,18 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-<<<<<<<< HEAD:console/src/main/java/org/apache/seata/console/result/SingleResult.java
-package org.apache.seata.console.result;
-
-import java.io.Serializable;
-
-import org.apache.seata.console.constant.Code;
-========
 package org.apache.seata.common.result;
 
 import java.io.Serializable;
 
->>>>>>>> upstream/2.x:common/src/main/java/org/apache/seata/common/result/SingleResult.java
 
 /**
  * The single result