Use MavenProjectHelper for adding resources · mojohaus/license-maven-plugin@ba65608 (original) (raw)

File tree

Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
1 1 # Generated by org.codehaus.mojo.license.AddThirdPartyMojo
2 2 #-------------------------------------------------------------------------------
3 3 # Already used licenses in project :
4 +# - Apache 2
5 +# - Apache 2.0
6 +# - Apache License 2.0
4 7 # - Apache License, Version 2.0
5 8 # - Apache Public License 2.0
6 9 # - Apache-2.0
7 -# - BSD 4-Clause DOM4J
10 +# - BSD
11 +# - BSD 2-Clause License
12 +# - BSD License
8 13 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
9 -# - Eclipse Public License 1.0
14 +# - Eclipse Public License v2.0
10 15 # - Eclipse Public License, Version 1.0
16 +# - GNU General Public License, version 2 (GPL2), with the classpath exception
11 17 # - Lesser General Public License (LGPL) v 3.0
12 18 # - MIT License
13 -# - New BSD License
19 +# - MIT license
14 20 # - Public Domain
21 +# - The Apache License, Version 2.0
15 22 # - The Apache Software License, Version 2.0
23 +# - The MIT License
24 +# - The SAX License
25 +# - The W3C License
16 26 #-------------------------------------------------------------------------------
17 27 # Please fill the missing licenses for dependencies :
18 28 #
19 29 #
20 -#Tue Jun 06 18:01:37 CEST 2023
21 -commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
22 -dom4j--dom4j--1.1=BSD 4-Clause DOM4J
30 +#Fri Nov 29 08:49:34 CET 2024
23 31 org.codehaus.plexus--plexus-i18n--1.0-beta-10=The Apache Software License, Version 2.0
24 -oro--oro--2.0.8=The Apache Software License, Version 2.0
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@
41 41 import org.apache.maven.plugin.MojoFailureException;
42 42 import org.apache.maven.plugins.annotations.Parameter;
43 43 import org.apache.maven.project.MavenProject;
44 +import org.apache.maven.project.MavenProjectHelper;
44 45 import org.apache.maven.project.ProjectBuildingException;
45 46 import org.codehaus.mojo.license.api.DefaultThirdPartyHelper;
46 47 import org.codehaus.mojo.license.api.DependenciesTool;
@@ -666,7 +667,9 @@ public abstract class AbstractAddThirdPartyMojo extends AbstractLicenseMojo {
666 667 @Parameter(property = "license.artifactFiltersUrl")
667 668 protected String artifactFiltersUrl;
668 669
669 -protected AbstractAddThirdPartyMojo(ThirdPartyTool thirdPartyTool, DependenciesTool dependenciesTool) {
670 +protected AbstractAddThirdPartyMojo(
671 +ThirdPartyTool thirdPartyTool, DependenciesTool dependenciesTool, MavenProjectHelper projectHelper) {
672 +super(projectHelper);
670 673 this.thirdPartyTool = thirdPartyTool;
671 674 this.dependenciesTool = dependenciesTool;
672 675 }
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@
41 41 import org.apache.commons.lang3.StringUtils;
42 42 import org.apache.maven.plugin.MojoFailureException;
43 43 import org.apache.maven.plugins.annotations.Parameter;
44 +import org.apache.maven.project.MavenProjectHelper;
44 45 import org.codehaus.mojo.license.api.FreeMarkerHelper;
45 46 import org.codehaus.mojo.license.header.FileHeader;
46 47 import org.codehaus.mojo.license.header.FileHeaderProcessor;
@@ -374,7 +375,9 @@ public abstract class AbstractFileHeaderMojo extends AbstractLicenseNameMojo {
374 375 */
375 376 private FreeMarkerHelper freeMarkerHelper = FreeMarkerHelper.newDefaultHelper();
376 377
377 -protected AbstractFileHeaderMojo(Map<String, FileHeaderTransformer> transformers) {
378 +protected AbstractFileHeaderMojo(
379 +Map<String, FileHeaderTransformer> transformers, MavenProjectHelper projectHelper) {
380 +super(projectHelper);
378 381 this.transformers = transformers;
379 382 }
380 383
Original file line number Diff line number Diff line change
@@ -24,14 +24,16 @@
24 24
25 25 import java.io.File;
26 26 import java.nio.charset.Charset;
27 +import java.util.Arrays;
28 +import java.util.Objects;
27 29
28 30 import org.apache.commons.lang3.StringUtils;
29 31 import org.apache.maven.plugin.AbstractMojo;
30 32 import org.apache.maven.plugin.MojoExecutionException;
31 33 import org.apache.maven.plugin.MojoFailureException;
32 34 import org.apache.maven.plugins.annotations.Parameter;
33 35 import org.apache.maven.project.MavenProject;
34 -import org.codehaus.mojo.license.utils.MojoHelper;
36 +import org.apache.maven.project.MavenProjectHelper;
35 37 import org.slf4j.Logger;
36 38 import org.slf4j.LoggerFactory;
37 39
@@ -78,6 +80,12 @@ public abstract class AbstractLicenseMojo extends AbstractMojo {
78 80 @Parameter(defaultValue = "${project}", readonly = true)
79 81 MavenProject project;
80 82
83 +protected final MavenProjectHelper projectHelper;
84 +
85 +protected AbstractLicenseMojo(MavenProjectHelper projectHelper) {
86 +this.projectHelper = Objects.requireNonNull(projectHelper, "projectHelper cannot be null");
87 + }
88 +
81 89 // ----------------------------------------------------------------------
82 90 // Abstract methods
83 91 // ----------------------------------------------------------------------
@@ -332,9 +340,9 @@ protected void checkEncoding() {
332 340 * @param includes files to include
333 341 */
334 342 protected void addResourceDir(File dir, String... includes) {
335 -boolean added = MojoHelper.addResourceDir(dir, getProject(), includes);
336 -if (added && isVerbose()) {
337 -LOG.info("add resource {} with includes {}", dir, (Object) includes);
343 +projectHelper.addResource(getProject(), dir.getAbsolutePath(), Arrays.asList(includes), null);
344 +if (isVerbose()) {
345 +LOG.info("add resource {} with includes {}", dir, includes);
338 346 }
339 347 }
340 348
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@
35 35
36 36 import org.apache.commons.lang3.StringUtils;
37 37 import org.apache.maven.plugins.annotations.Parameter;
38 +import org.apache.maven.project.MavenProjectHelper;
38 39 import org.codehaus.mojo.license.api.FreeMarkerHelper;
39 40 import org.codehaus.mojo.license.header.transformer.FileHeaderTransformer;
40 41 import org.codehaus.mojo.license.model.Copyright;
@@ -201,6 +202,10 @@ public abstract class AbstractLicenseNameMojo extends AbstractLicenseMojo {
201 202 */
202 203 private LicenseStore licenseStore;
203 204
205 +public AbstractLicenseNameMojo(MavenProjectHelper projectHelper) {
206 +super(projectHelper);
207 + }
208 +
204 209 // ----------------------------------------------------------------------
205 210 // AbstractLicenseMojo Implementaton
206 211 // ----------------------------------------------------------------------
Original file line number Diff line number Diff line change
@@ -43,6 +43,7 @@
43 43 import org.apache.maven.plugins.annotations.Parameter;
44 44 import org.apache.maven.plugins.annotations.ResolutionScope;
45 45 import org.apache.maven.project.MavenProject;
46 +import org.apache.maven.project.MavenProjectHelper;
46 47 import org.apache.maven.project.ProjectBuildingException;
47 48 import org.codehaus.mojo.license.api.ArtifactFilters;
48 49 import org.codehaus.mojo.license.api.DependenciesTool;
@@ -126,8 +127,9 @@ public class AddThirdPartyMojo extends AbstractAddThirdPartyMojo implements Mave
126 127 private ArtifactFilters artifactFilters;
127 128
128 129 @Inject
129 -public AddThirdPartyMojo(ThirdPartyTool thirdPartyTool, DependenciesTool dependenciesTool) {
130 -super(thirdPartyTool, dependenciesTool);
130 +public AddThirdPartyMojo(
131 +ThirdPartyTool thirdPartyTool, DependenciesTool dependenciesTool, MavenProjectHelper projectHelper) {
132 +super(thirdPartyTool, dependenciesTool, projectHelper);
131 133 }
132 134
133 135 // ----------------------------------------------------------------------
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@
41 41 import org.apache.maven.plugins.annotations.Parameter;
42 42 import org.apache.maven.plugins.annotations.ResolutionScope;
43 43 import org.apache.maven.project.MavenProject;
44 +import org.apache.maven.project.MavenProjectHelper;
44 45 import org.apache.maven.project.ProjectBuildingException;
45 46 import org.codehaus.mojo.license.api.DependenciesTool;
46 47 import org.codehaus.mojo.license.api.ThirdPartyTool;
@@ -112,8 +113,9 @@ public class AggregatorAddThirdPartyMojo extends AbstractAddThirdPartyMojo {
112 113 private File aggregateMissingLicensesFile;
113 114
114 115 @Inject
115 -public AggregatorAddThirdPartyMojo(ThirdPartyTool thirdPartyTool, DependenciesTool dependenciesTool) {
116 -super(thirdPartyTool, dependenciesTool);
116 +public AggregatorAddThirdPartyMojo(
117 +ThirdPartyTool thirdPartyTool, DependenciesTool dependenciesTool, MavenProjectHelper projectHelper) {
118 +super(thirdPartyTool, dependenciesTool, projectHelper);
117 119 }
118 120
119 121 // ----------------------------------------------------------------------
@@ -222,7 +224,7 @@ protected void doAction() throws Exception {
222 224 continue;
223 225 }
224 226
225 -AddThirdPartyMojo mojo = new AddThirdPartyMojo(thirdPartyTool, dependenciesTool);
227 +AddThirdPartyMojo mojo = new AddThirdPartyMojo(thirdPartyTool, dependenciesTool, projectHelper);
226 228 mojo.initFromMojo(this, reactorProject);
227 229
228 230 LicenseMap childLicenseMap = mojo.licenseMap;
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@
28 28
29 29 import org.apache.maven.plugins.annotations.Mojo;
30 30 import org.apache.maven.plugins.annotations.Parameter;
31 +import org.apache.maven.project.MavenProjectHelper;
31 32 import org.codehaus.mojo.license.header.transformer.FileHeaderTransformer;
32 33
33 34 /**
@@ -68,8 +69,8 @@ public class CheckFileHeaderMojo extends AbstractFileHeaderMojo {
68 69 private boolean skipCheckLicense;
69 70
70 71 @Inject
71 -public CheckFileHeaderMojo(Map<String, FileHeaderTransformer> transformers) {
72 -super(transformers);
72 +public CheckFileHeaderMojo(Map<String, FileHeaderTransformer> transformers, MavenProjectHelper projectHelper) {
73 +super(transformers, projectHelper);
73 74 }
74 75
75 76 // ----------------------------------------------------------------------
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@
34 34 import org.apache.maven.plugin.MojoFailureException;
35 35 import org.apache.maven.plugins.annotations.Mojo;
36 36 import org.apache.maven.plugins.annotations.Parameter;
37 +import org.apache.maven.project.MavenProjectHelper;
37 38 import org.codehaus.mojo.license.header.transformer.FileHeaderTransformer;
38 39 import org.slf4j.Logger;
39 40 import org.slf4j.LoggerFactory;
@@ -72,7 +73,8 @@ public class CommentStyleListMojo extends AbstractLicenseMojo {
72 73 private final Map<String, FileHeaderTransformer> transformers;
73 74
74 75 @Inject
75 -public CommentStyleListMojo(Map<String, FileHeaderTransformer> transformers) {
76 +public CommentStyleListMojo(Map<String, FileHeaderTransformer> transformers, MavenProjectHelper projectHelper) {
77 +super(projectHelper);
76 78 this.transformers = transformers;
77 79 }
78 80
Original file line number Diff line number Diff line change
@@ -31,6 +31,7 @@
31 31 import org.apache.maven.plugin.MojoFailureException;
32 32 import org.apache.maven.plugins.annotations.Mojo;
33 33 import org.apache.maven.plugins.annotations.Parameter;
34 +import org.apache.maven.project.MavenProjectHelper;
34 35 import org.codehaus.mojo.license.model.License;
35 36 import org.codehaus.mojo.license.model.LicenseStore;
36 37 import org.slf4j.Logger;
@@ -78,6 +79,10 @@ public class LicenseListMojo extends AbstractLicenseMojo {
78 79 */
79 80 private LicenseStore licenseStore;
80 81
82 +public LicenseListMojo(MavenProjectHelper projectHelper) {
83 +super(projectHelper);
84 + }
85 +
81 86 // ----------------------------------------------------------------------
82 87 // AbstractLicenseMojo Implementaton
83 88 // ----------------------------------------------------------------------