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/04/12 12:59:53 UTC
[maven] branch MNG-6294 updated (fb8881c -> e9d89e1)
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.
discard fb8881c [MNG-6294] Convert MavenPluginValidator into a plexus component
add 37676a2 [MNG-6599] use version from parent if necessary, like groupId
add 4bec550 [MNG-6600] add inputlocation tracking for default lifecycle executions
add 0b10fe7 [MNG-6597] add input location tracking for plugins configuration
add 49c8f17 [MNG-6601] add input location tracking for m-site-p converted reports
add f5a1374 [MNG-6572] use int or long instead of BigIntegers for little numbers in ComparableVersion
add 0be2644 [MNG-6538] Upgrade maven-resolver to 1.3.3
add 5306cd0 [MNG-6506] [MNG-6543] Upgrade Plexus Classworlds to 2.6.0
add a7acfe7 [MNG-6611] Update animal-sniffer-maven-plugin to version 1.17
add 95401cf [MNG-6605] Unable to suppress download/upload messages (in interactive mode)
add 0ba5753 [MNG-6618] adding org.slf4j.event in exported packages
add d66c9c0 [maven-release-plugin] prepare release maven-3.6.1
add 5222f03 [maven-release-plugin] prepare for next development iteration
add 55614d3 [MNG-6627] upgrade Plexus container to 2.0.0 for Reproducible Builds
new e9d89e1 [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 (fb8881c)
\
N -- N -- N refs/heads/MNG-6294 (e9d89e1)
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:
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
.../artifact/versioning/ComparableVersion.java | 227 ++++++++++++++++++---
.../artifact/versioning/ComparableVersionTest.java | 90 ++++++++
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 22 +-
.../main/resources/META-INF/maven/extension.xml | 1 +
maven-embedder/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 3 +
.../main/java/org/apache/maven/cli/MavenCli.java | 2 +-
maven-model-builder/pom.xml | 2 +-
.../maven/model/building/ModelProblemUtils.java | 4 +
.../model/plugin/DefaultReportingConverter.java | 54 +++--
.../model/superpom/DefaultSuperPomProvider.java | 2 +-
maven-model/pom.xml | 3 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 14 +-
24 files changed, 383 insertions(+), 65 deletions(-)
[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 e9d89e1d85621a83c1dfb45253a2c78600abd8d9
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() );
+ }
+}