You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/03/03 11:48:08 UTC

[maven] branch MNG-6294 updated (8169e6a -> fb8881c)

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

slachiewicz pushed a change to branch MNG-6294
in repository https://gitbox.apache.org/repos/asf/maven.git.


    omit 8169e6a  [MNG-6294] Convert MavenPluginValidator into a plexus component
     add 9f07b03  [MNG-6261] - using File apis to compare
     add e4e33f7  [MNG-6261] Relative parent POM resolution failing in 3.5.0 with complex multimodule builds
     add 732e7de  [MNG-6529] ProjectBuilder.build(List<Project> ...) honor request.isResolveDependency
     add c6bdafe  [MNG-5965] Parallel build multiplies work if multiple goals are given
     add 6c4c2e3  Change to keep only 5 artifacts on master and on branches only 1 artifact.
     add c7ab987  [MNG-6544] Replace CacheUtils#{eq,hash} with Objects
     add 71128cb  spelling: vertices
     add 9c94626  [MNG-6213] Validate scope in dependencyManagement
     add 391a111  [MNG-6526] Upgrade to Wagon 3.3.1
     add eab62f1  [MNG-6520] Update namespaces for maven-assembly to 2.0.0
     add 33e4f20  [MNG-6548] Lifecycle plugin version upgrades
     add d9facde  [MNG-6530] Introduce system property to disable global model cache
     add a939654  [MNG-6256] Surround parameter of echo command with double quotes
     add 8e5ecf0  fixed link (that goes to implementation in maven-core)
     add 375cd7b  [MNG-6559] Fix mailing list URL (#230)
     add fdf5d92  renamed variables for better understanding
     add 396291b  [MNG-6069] Migrate to non deprecated parts of Commons CLI (#153)
     add 2928dc6  refactoring: extracted initParent() method
     add 049b7a7  refactoring: reduced try/catch scope
     add ae1c32a  [MNG-6533] Test: ProjectBuildingException miss reference to MavenProject
     add 8b7055f  [MNG-6533] Prefer passing the interim project in ProjectBuildingResult
     add 27332cf  [MNG-6533] ProjectBuilder report ModelProblem instead of Exception
     add 24c762d  [MNG-6533] catch InvalidArtifactRTException runtime exception
     add bb3ec5d  [MNG-5995] Remove dependency to maven-compat (#185)
     add 7e3e545  [MNG-6573] Use Maven 3.6.0 for CI
     add 15c6471  [MNG-6558] ToolchainsBuildingResult event is not sent on EventSpy
     add b7249af  Revert [MNG-6069] Migrate to non deprecated parts of Commons CLI
     add 8f9075d  [MNG-6571] cache VersionRange instances, they are immutable
     add 6bd8bb9  [MNG-6571] forgot to put new instance in cache
     add 657fbb7  Revert "[MNG-6571] forgot to put new instance in cache"
     add 961746f  [MNG-6571] separate caches for create from spec and version
     add 4decfcf  [MNG-6591] Upgrade to Wagon 3.3.2
     add c674bcf  [MNG-6495] ModelResolver cannot be null
     add bd4a3a0  [MNG-6593] track input location for super-pom content
     add 9dd4732  Revert "[MNG-6548] Lifecycle plugin version upgrades"
     new fb8881c  [MNG-6294] Convert MavenPluginValidator into a plexus component

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (8169e6a)
            \
             N -- N -- N   refs/heads/MNG-6294 (fb8881c)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CONTRIBUTING.md                                    |   4 +-
 Jenkinsfile                                        |  10 +-
 apache-maven/README.txt                            |   2 +-
 apache-maven/src/bin/mvn.cmd                       |   4 +-
 apache-maven/src/main/assembly/bin.xml             |   4 +-
 apache-maven/src/main/assembly/component.xml       |   4 +-
 apache-maven/src/main/assembly/dir.xml             |   4 +-
 apache-maven/src/main/assembly/src.xml             |   4 +-
 .../org/apache/maven/artifact/ArtifactUtils.java   |   2 +-
 .../maven/artifact/versioning/VersionRange.java    |  33 +-
 .../artifact/versioning/VersionRangeTest.java      |  19 +
 .../apache/maven/bridge/MavenRepositorySystem.java | 100 +++++-
 .../multithreaded/ConcurrencyDependencyGraph.java  |   9 +-
 .../multithreaded/MultiThreadedBuilder.java        |  10 +-
 .../plugin/DefaultLifecycleBindingsInjector.java   |  14 +-
 .../java/org/apache/maven/plugin/CacheUtils.java   |  53 +--
 .../maven/project/DefaultProjectBuilder.java       | 382 ++++++++++++---------
 .../project/DefaultProjectBuildingHelper.java      |   6 +-
 .../org/apache/maven/project/ProjectSorter.java    |   2 +-
 .../internal/ConcurrencyDependencyGraphTest.java   |   2 +-
 .../apache/maven/project/ProjectBuilderTest.java   | 161 +++++++++
 .../resources/projects/artifactMissingVersion.xml  |  34 ++
 .../pom.xml => resources/projects/badPom.xml}      |  10 +-
 .../projects/basic-resolveDependencies.xml         |  15 +
 .../main/java/org/apache/maven/cli/MavenCli.java   |   6 +-
 .../java/org/apache/maven/cli/MavenCliTest.java    |  38 ++
 .../maven/model/building/DefaultModelBuilder.java  |   3 +-
 .../maven/model/building/FileModelSource.java      |  23 ++
 .../maven/model/building/ModelBuildingRequest.java |   4 +-
 .../model/superpom/DefaultSuperPomProvider.java    |  11 +-
 .../model/validation/DefaultModelValidator.java    |  10 +-
 maven-model-builder/src/site/apt/index.apt         |   4 +-
 .../maven/model/building/FileModelSourceTest.java  |  75 ++++
 .../validation/DefaultModelValidatorTest.java      |  10 +
 ...ier.xml => bad-dependency-management-scope.xml} |  38 +-
 pom.xml                                            |   5 +-
 36 files changed, 869 insertions(+), 246 deletions(-)
 create mode 100644 maven-core/src/test/resources/projects/artifactMissingVersion.xml
 copy maven-core/src/test/{projects/default-maven/cyclic-reference/pom.xml => resources/projects/badPom.xml} (53%)
 create mode 100644 maven-core/src/test/resources/projects/basic-resolveDependencies.xml
 create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
 copy maven-model-builder/src/test/resources/poms/validation/{bad-import-scope-classifier.xml => bad-dependency-management-scope.xml} (53%)


[maven] 01/01: [MNG-6294] Convert MavenPluginValidator into a plexus component

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MNG-6294
in repository https://gitbox.apache.org/repos/asf/maven.git

commit fb8881ce315d832b53016c960d67cdc39048dc9a
Author: Michael Simacek <ms...@redhat.com>
AuthorDate: Thu Oct 12 14:55:46 2017 +0300

    [MNG-6294] Convert MavenPluginValidator into a plexus component
---
 ...dator.java => DefaultMavenPluginValidator.java} | 41 +++----------
 .../apache/maven/plugin/MavenPluginValidator.java  | 51 +---------------
 .../plugin/internal/DefaultMavenPluginManager.java | 12 ++--
 .../maven/plugin/MavenPluginValidatorTest.java     | 70 ++++++++++++++++++++++
 4 files changed, 86 insertions(+), 88 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultMavenPluginValidator.java
similarity index 65%
copy from maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
copy to maven-core/src/main/java/org/apache/maven/plugin/DefaultMavenPluginValidator.java
index ec4c511..968d897 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultMavenPluginValidator.java
@@ -19,40 +19,23 @@ package org.apache.maven.plugin;
  * under the License.
  */
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
- * MavenPluginValidator
+ * Default MavenPluginValidator implemntation
  */
-public class MavenPluginValidator
+@Component( role = MavenPluginValidator.class )
+public class DefaultMavenPluginValidator
+        implements MavenPluginValidator
 {
-    private final Artifact pluginArtifact;
 
-    private List<String> errors = new ArrayList<>();
-
-    private boolean firstDescriptor = true;
-
-    public MavenPluginValidator( Artifact pluginArtifact )
+    @Override
+    public void validate( Artifact pluginArtifact, PluginDescriptor pluginDescriptor, List<String> errors )
     {
-        this.pluginArtifact = pluginArtifact;
-    }
-
-    public void validate( PluginDescriptor pluginDescriptor )
-    {
-        /*
-         * NOTE: For plugins that depend on other plugin artifacts the plugin realm contains more than one plugin
-         * descriptor. However, only the first descriptor is of interest.
-         */
-        if ( !firstDescriptor )
-        {
-            return;
-        }
-        firstDescriptor = false;
-
         if ( !pluginArtifact.getGroupId().equals( pluginDescriptor.getGroupId() ) )
         {
             errors.add( "Plugin's descriptor contains the wrong group ID: " + pluginDescriptor.getGroupId() );
@@ -68,14 +51,4 @@ public class MavenPluginValidator
             errors.add( "Plugin's descriptor contains the wrong version: " + pluginDescriptor.getVersion() );
         }
     }
-
-    public boolean hasErrors()
-    {
-        return !errors.isEmpty();
-    }
-
-    public List<String> getErrors()
-    {
-        return errors;
-    }
 }
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
index ec4c511..e41b275 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
@@ -19,63 +19,16 @@ package org.apache.maven.plugin;
  * under the License.
  */
 
-import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 
 /**
  * MavenPluginValidator
  */
-public class MavenPluginValidator
+public interface MavenPluginValidator
 {
-    private final Artifact pluginArtifact;
-
-    private List<String> errors = new ArrayList<>();
-
-    private boolean firstDescriptor = true;
-
-    public MavenPluginValidator( Artifact pluginArtifact )
-    {
-        this.pluginArtifact = pluginArtifact;
-    }
-
-    public void validate( PluginDescriptor pluginDescriptor )
-    {
-        /*
-         * NOTE: For plugins that depend on other plugin artifacts the plugin realm contains more than one plugin
-         * descriptor. However, only the first descriptor is of interest.
-         */
-        if ( !firstDescriptor )
-        {
-            return;
-        }
-        firstDescriptor = false;
-
-        if ( !pluginArtifact.getGroupId().equals( pluginDescriptor.getGroupId() ) )
-        {
-            errors.add( "Plugin's descriptor contains the wrong group ID: " + pluginDescriptor.getGroupId() );
-        }
-
-        if ( !pluginArtifact.getArtifactId().equals( pluginDescriptor.getArtifactId() ) )
-        {
-            errors.add( "Plugin's descriptor contains the wrong artifact ID: " + pluginDescriptor.getArtifactId() );
-        }
-
-        if ( !pluginArtifact.getBaseVersion().equals( pluginDescriptor.getVersion() ) )
-        {
-            errors.add( "Plugin's descriptor contains the wrong version: " + pluginDescriptor.getVersion() );
-        }
-    }
 
-    public boolean hasErrors()
-    {
-        return !errors.isEmpty();
-    }
+    void validate( Artifact pluginArtfiact, PluginDescriptor pluginDescriptor, List<String> errors );
 
-    public List<String> getErrors()
-    {
-        return errors;
-    }
 }
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 8630471..2188ca8 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -164,6 +164,9 @@ public class DefaultMavenPluginManager
     @Requirement
     private PluginArtifactsCache pluginArtifactsCache;
 
+    @Requirement
+    private MavenPluginValidator pluginValidator;
+
     private ExtensionDescriptorBuilder extensionDescriptorBuilder = new ExtensionDescriptorBuilder();
 
     private PluginDescriptorBuilder builder = new PluginDescriptorBuilder();
@@ -241,14 +244,13 @@ public class DefaultMavenPluginManager
             throw new PluginDescriptorParsingException( plugin, pluginFile.getAbsolutePath(), e );
         }
 
-        MavenPluginValidator validator = new MavenPluginValidator( pluginArtifact );
-
-        validator.validate( pluginDescriptor );
+        List<String> errors = new ArrayList<>();
+        pluginValidator.validate( pluginArtifact, pluginDescriptor, errors );
 
-        if ( validator.hasErrors() )
+        if ( !errors.isEmpty() )
         {
             throw new InvalidPluginDescriptorException(
-                "Invalid plugin descriptor for " + plugin.getId() + " (" + pluginFile + ")", validator.getErrors() );
+                "Invalid plugin descriptor for " + plugin.getId() + " (" + pluginFile + ")", errors );
         }
 
         pluginDescriptor.setPluginArtifact( pluginArtifact );
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/MavenPluginValidatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/MavenPluginValidatorTest.java
new file mode 100644
index 0000000..72162aa
--- /dev/null
+++ b/maven-core/src/test/java/org/apache/maven/plugin/MavenPluginValidatorTest.java
@@ -0,0 +1,70 @@
+package org.apache.maven.plugin;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.handler.DefaultArtifactHandler;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.codehaus.plexus.PlexusTestCase;
+
+/**
+ * @author Michael Simacek
+ */
+public class MavenPluginValidatorTest
+        extends PlexusTestCase
+{
+    private MavenPluginValidator mavenPluginValidator;
+
+    @Override
+    protected void setUp()
+            throws Exception
+    {
+        super.setUp();
+        mavenPluginValidator = lookup( MavenPluginValidator.class );
+    }
+
+    public void testValidate()
+    {
+        Artifact plugin = new DefaultArtifact( "org.apache.maven.its.plugins", "maven-it-plugin", "0.1", "compile",
+                "jar", null, new DefaultArtifactHandler() );
+        PluginDescriptor descriptor = new PluginDescriptor();
+        descriptor.setGroupId( "org.apache.maven.its.plugins" );
+        descriptor.setArtifactId( "maven-it-plugin" );
+        descriptor.setVersion( "0.1" );
+        List<String> errors = new ArrayList<>();
+        mavenPluginValidator.validate( plugin, descriptor, errors );
+        assertTrue( errors.isEmpty() );
+    }
+
+    public void testInvalid()
+    {
+        Artifact plugin = new DefaultArtifact( "org.apache.maven.its.plugins", "maven-it-plugin", "0.1", "compile",
+                "jar", null, new DefaultArtifactHandler() );
+        PluginDescriptor descriptor = new PluginDescriptor();
+        descriptor.setGroupId( "org.apache.maven.its.plugins" );
+        descriptor.setArtifactId( "maven-it-plugin" );
+        List<String> errors = new ArrayList<>();
+        mavenPluginValidator.validate( plugin, descriptor, errors );
+        assertFalse( errors.isEmpty() );
+    }
+}