[pulsar] branch branch-2.10 updated: [fix][build][branch-2.10] Fix ci-license check (#20505)

[lhotari]

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

lhotari pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new 832d7e05ed1 [fix][build][branch-2.10] Fix ci-license check (#20505)
832d7e05ed1 is described below

commit 832d7e05ed123b590cc03cae32a7675c634cd378
Author: Zike Yang <z...@apache.org>
AuthorDate: Tue Jun 6 13:59:58 2023 +0800

    [fix][build][branch-2.10] Fix ci-license check (#20505)
    
    Co-authored-by: Lari Hotari <lhot...@apache.org>
---
 .github/workflows/ci-license.yaml | 10 +---------
 pom.xml                           |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-license.yaml 
b/.github/workflows/ci-license.yaml
index eee5a8228e6..b98e4036cdb 100644
--- a/.github/workflows/ci-license.yaml
+++ b/.github/workflows/ci-license.yaml
@@ -28,7 +28,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false 
-Dmaven.wagon.http.retryHandler.class=standard 
-Dmaven.wagon.http.retryHandler.count=3
+  MAVEN_OPTS: -Xss1500k -Xmx1024m 
-Daether.connector.http.reuseConnections=false 
-Daether.connector.requestTimeout=60000 -Dhttp.keepAlive=false 
-Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard 
-Dmaven.wagon.http.retryHandler.count=3 
-Dmaven.wagon.http.retryHandler.requestSentEnabled=true 
-Dmaven.wagon.http.serviceUnavailableRetryStrategy.class=standard 
-Dmaven.wagon.rto=60000
 
 jobs:
 
@@ -73,14 +73,6 @@ jobs:
           distribution: 'temurin'
           java-version: 11
 
-
-      # license check fails with 3.6.2 so we have to downgrade
-      - name: Set up Maven
-        if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
-        uses: apache/pulsar-test-infra/setup-maven@master
-        with:
-          maven-version: 3.6.1
-
       - name: build and check license
         if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
         run: mvn -q -B -ntp -DskipTests apache-rat:check initialize 
license:check install
diff --git a/pom.xml b/pom.xml
index 195c4488038..10e8d5091af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,7 +237,7 @@ flexible messaging model and an intuitive client 
API.</description>
     <!-- Plugin dependencies -->
     <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
     <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
-    <license-maven-plugin.version>4.0.rc2</license-maven-plugin.version>
+    <license-maven-plugin.version>4.1</license-maven-plugin.version>
     <directory-maven-plugin.version>1.0</directory-maven-plugin.version>
     <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
     <!-- surefire.version is defined in apache parent pom -->