Author: tchemit Date: 2010-06-20 23:41:45 +0200 (Sun, 20 Jun 2010) New Revision: 1775 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1775 Log: clean code + do NOT treate system scope dependencies in add-third-party Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-06-20 21:22:09 UTC (rev 1774) +++ trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-06-20 21:41:45 UTC (rev 1775) @@ -28,7 +28,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.License; import org.apache.maven.plugin.MojoFailureException; @@ -36,7 +35,6 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; import org.nuiton.io.SortedProperties; import org.nuiton.plugin.PluginHelper; @@ -118,7 +116,7 @@ * A flag to generate or update the missing licenses file. * * @parameter expression="${license.generateMissing}" default-value="true" - * @since 1.0.0 + * @since 2.3 */ protected boolean generateMissing; @@ -131,10 +129,10 @@ protected boolean force; /** - * A flag to fail the build if there is some unknown license for some dependencies. + * A flag to fail the build if at least one dependency was detected without a license. * * @parameter expression="${license.failIfWarning}" default-value="false" - * @since 1.0.0 + * @since 2.3 */ protected boolean failIfWarning; @@ -167,40 +165,6 @@ protected List<?> remoteRepositories; /** - * Dependency tree builder component. - * - * @component - */ - protected DependencyTreeBuilder dependencyTreeBuilder; - -// /** -// * Artifact Factory component. -// * -// * @component -// */ -// protected ArtifactFactory factory; - - /** - * Artifact metadata source component. - * - * @component - * @required - * @readonly - * @since 1.0.0 - */ - protected ArtifactMetadataSource artifactMetadataSource; - -// /** -// * Artifact collector component. -// * -// * @component -// * @required -// * @readonly -// * @since 1.0.0 -// */ -// protected ArtifactCollector collector; - - /** * Maven Project Builder component. * * @component @@ -210,7 +174,6 @@ */ protected MavenProjectBuilder mavenProjectBuilder; - private File thirdPartyFile; private LicenseMap licenseMap; @@ -284,7 +247,12 @@ for (Object o : getProject().getArtifacts()) { Artifact artifact = (Artifact) o; + if (Artifact.SCOPE_SYSTEM.equals(artifact.getScope())) { + // never treate system artifacts (they are mysterious and + // no information can be retrive from anywhere)... + continue; + } String id = getArtifactId(artifact); MavenProject project = addArtifact(id, artifact); @@ -511,18 +479,6 @@ } return project; } -// boolean allowStubModel = false; - -// if (!"pom".equals(artifact.getType())) { -// artifact = factory.createProjectArtifact( -// artifact.getGroupId(), -// artifact.getArtifactId(), -// artifact.getVersion(), -// artifact.getScope() -// ); -// allowStubModel = true; -// } - project = mavenProjectBuilder.buildFromRepository( artifact, remoteRepositories,