From d48274d9c00ce2d5ac5288d9642ea4196e430a47 Mon Sep 17 00:00:00 2001 From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com> Date: Fri, 7 Aug 2026 09:58:50 +0200 Subject: [PATCH 1/2] Fixed Maven License Plugin tool --- .github/actions/check-dependencies/action.yml | 4 ++++ .github/workflows/dash.yml | 4 ++++ .gitignore | 1 - utils/license-maven-plugin/.gitignore | 3 ++- utils/license-maven-plugin/pom.xml | 2 +- .../org/eclipse/set/licensemavenplugin/LicenseCheckMojo.java | 5 ++++- 6 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 .gitignore diff --git a/.github/actions/check-dependencies/action.yml b/.github/actions/check-dependencies/action.yml index 21a53a0..d2132e9 100644 --- a/.github/actions/check-dependencies/action.yml +++ b/.github/actions/check-dependencies/action.yml @@ -22,6 +22,10 @@ inputs: description: "" required: false default: "" + repo: + description: "" + required: false + default: "" pom: description: "pom path" required: false diff --git a/.github/workflows/dash.yml b/.github/workflows/dash.yml index f703033..7af2a42 100644 --- a/.github/workflows/dash.yml +++ b/.github/workflows/dash.yml @@ -23,6 +23,9 @@ on: type: string required: false default: "technology.set" + repo: + description: 'The repository, which license vetting is requested', + required: true pom: description: "The path to the pom.xml" type: string @@ -97,6 +100,7 @@ jobs: request-review: ${{ env.request-review }} project-id: ${{ inputs.projectId }} pom: ${{ inputs.pom }} + repo: ${{ inputs-repo }} env: GITLAB_API_TOKEN: ${{ secrets.gitlabAPIToken }} diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5e83119..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.settings diff --git a/utils/license-maven-plugin/.gitignore b/utils/license-maven-plugin/.gitignore index 7920d82..b9dd095 100644 --- a/utils/license-maven-plugin/.gitignore +++ b/utils/license-maven-plugin/.gitignore @@ -1,2 +1,3 @@ out/ -target/ \ No newline at end of file +target/ +*.log \ No newline at end of file diff --git a/utils/license-maven-plugin/pom.xml b/utils/license-maven-plugin/pom.xml index e2122dd..185d29c 100644 --- a/utils/license-maven-plugin/pom.xml +++ b/utils/license-maven-plugin/pom.xml @@ -38,7 +38,7 @@ org.eclipse.dash - org.eclipse.dash.licenses + license-tool-plugin 1.1.0 diff --git a/utils/license-maven-plugin/src/main/java/org/eclipse/set/licensemavenplugin/LicenseCheckMojo.java b/utils/license-maven-plugin/src/main/java/org/eclipse/set/licensemavenplugin/LicenseCheckMojo.java index 09761fe..b9bf74d 100644 --- a/utils/license-maven-plugin/src/main/java/org/eclipse/set/licensemavenplugin/LicenseCheckMojo.java +++ b/utils/license-maven-plugin/src/main/java/org/eclipse/set/licensemavenplugin/LicenseCheckMojo.java @@ -151,6 +151,9 @@ public class LicenseCheckMojo extends AbstractArtifactFilteringMojo { */ @Parameter(property = "dash.proxy") private String proxy; + + @Parameter(property ="dash.repo") + private String repo; /** * The Maven session. @@ -187,7 +190,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { // Validate the user-given dash license tool settings ISettings settings; try { - settings = new MavenSettings(batch, foundationApi, clearlyDefinedApi, licenses, confidence, projectId, iplabToken); + settings = new MavenSettings(batch, foundationApi, clearlyDefinedApi, licenses, confidence, projectId, iplabToken, repo); } catch (IllegalArgumentException e) { throw new MojoExecutionException("Invalid setting: " + e.getMessage()); } From b47999b31f8fb8084a885a41a059cee8b760f3dd Mon Sep 17 00:00:00 2001 From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com> Date: Fri, 7 Aug 2026 10:06:40 +0200 Subject: [PATCH 2/2] update repository --- utils/license-maven-plugin/pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/utils/license-maven-plugin/pom.xml b/utils/license-maven-plugin/pom.xml index 185d29c..aba9256 100644 --- a/utils/license-maven-plugin/pom.xml +++ b/utils/license-maven-plugin/pom.xml @@ -44,11 +44,8 @@ - dash-licenses-snapshots + dash-licenses https://repo.eclipse.org/content/repositories/dash-licenses - - true -