[03/12] maven git commit: [MNG-6240] Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver
[MNG-6240] Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver Maven Core needs to export the maven-aether-provider artifact so that its components do not get added twice in plugin realm. This happens if the build uses an extension plugin depending on maven-aether-provider, before it was renamed to maven-resolver-provider Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a1fe4219 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a1fe4219 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a1fe4219 Branch: refs/heads/MNG-6069 Commit: a1fe42199565f76007a97f47cd4a848fd9b63482 Parents: 12d6471 Author: Guillaume BouéAuthored: Fri Jun 9 23:25:31 2017 +0200 Committer: Guillaume Boué Committed: Wed Jun 14 19:55:41 2017 +0200 -- maven-core/src/main/resources/META-INF/maven/extension.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/a1fe4219/maven-core/src/main/resources/META-INF/maven/extension.xml -- diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml index 1f0b95f..c5f40b5 100644 --- a/maven-core/src/main/resources/META-INF/maven/extension.xml +++ b/maven-core/src/main/resources/META-INF/maven/extension.xml @@ -134,6 +134,11 @@ under the License. org.sonatype.sisu:sisu-inject-plexus org.eclipse.sisu:org.eclipse.sisu.plexus org.apache.maven:maven-artifact + +org.apache.maven:maven-aether-provider org.apache.maven:maven-resolver-provider org.apache.maven:maven-artifact-manager org.apache.maven:maven-compat
[09/12] maven git commit: [MNG-6127] Fix plugin execution configuration interference
[MNG-6127] Fix plugin execution configuration interference Signed-off-by: rfscholteProject: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f1ed6592 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f1ed6592 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f1ed6592 Branch: refs/heads/MNG-6069 Commit: f1ed6592b1c701834d1377fade6cdb382a63bbf4 Parents: 842db37 Author: Mario Krizmanic Authored: Tue Aug 15 21:46:29 2017 +0200 Committer: rfscholte Committed: Tue Aug 15 21:46:29 2017 +0200 -- .../internal/DefaultLifecyclePluginAnalyzer.java | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f1ed6592/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java -- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java index aec785f..14653b7 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java @@ -31,6 +31,7 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.StringUtils; +import org.codehaus.plexus.util.xml.Xpp3Dom; import java.util.ArrayList; import java.util.Collections; @@ -190,8 +191,13 @@ public class DefaultLifecyclePluginAnalyzer execution.setPhase( phase ); execution.setPriority( i - mojos.size() ); execution.getGoals().add( gs.goal ); -execution.setConfiguration( mojo.getConfiguration() ); - + +Xpp3Dom lifecycleConfiguration = mojo.getConfiguration(); +if ( lifecycleConfiguration != null ) +{ +execution.setConfiguration( new Xpp3Dom( lifecycleConfiguration ) ); +} + plugin.setDependencies( mojo.getDependencies() ); plugin.getExecutions().add( execution ); }
[08/12] maven git commit: [MNG-6148] Can't package and assemble with JDK9/Jigsaw
[MNG-6148] Can't package and assemble with JDK9/Jigsaw Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/842db371 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/842db371 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/842db371 Branch: refs/heads/MNG-6069 Commit: 842db371f0fcaf4e930b99395fb6a8bb442684d6 Parents: 4f2a2db Author: rfscholteAuthored: Tue Aug 15 21:42:42 2017 +0200 Committer: rfscholte Committed: Tue Aug 15 21:42:42 2017 +0200 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/842db371/pom.xml -- diff --git a/pom.xml b/pom.xml index 78c375f..8ce59ed 100644 --- a/pom.xml +++ b/pom.xml @@ -657,6 +657,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin +3.0.0-M1 en
[02/12] maven git commit: [MNG-6207] Create WARNINGs in case of using system scope o display deprecation build warning for dependencies with scope 'system' declaration o Note about tests: existing 'sy
[MNG-6207] Create WARNINGs in case of using system scope o display deprecation build warning for dependencies with scope 'system' declaration o Note about tests: existing 'systemPath' related tests are reused/expanded (rationale: scope 'system' and 'systemPath' are mutually dependent) Signed-off-by: Karl Heinz MarbaiseProject: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/12d64713 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/12d64713 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/12d64713 Branch: refs/heads/MNG-6069 Commit: 12d6471337c7ad067b7762d44050a079829ea26c Parents: 707cff6 Author: dejan2609 Authored: Sat May 20 15:42:43 2017 +0200 Committer: Karl Heinz Marbaise Committed: Sun Jun 11 13:55:07 2017 +0200 -- .../model/validation/DefaultModelValidator.java | 14 +--- .../validation/DefaultModelValidatorTest.java | 36 +--- 2 files changed, 41 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/12d64713/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java -- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index f46be0e..2e7985f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -467,6 +467,13 @@ public class DefaultModelValidator } else if ( "system".equals( dependency.getScope() ) ) { + +if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 ) +{ +addViolation( problems, Severity.WARNING, Version.V31, prefix + ".scope", key, + "declares usage of deprecated 'system' scope ", dependency ); +} + String sysPath = dependency.getSystemPath(); if ( StringUtils.isNotEmpty( sysPath ) ) { @@ -488,7 +495,7 @@ public class DefaultModelValidator if ( equals( "LATEST", dependency.getVersion() ) || equals( "RELEASE", dependency.getVersion() ) ) { addViolation( problems, Severity.WARNING, Version.BASE, prefix + ".version", key, -"is either LATEST or RELEASE (both of them are being deprecated)", dependency ); + "is either LATEST or RELEASE (both of them are being deprecated)", dependency ); } Dependency existing = index.get( key ); @@ -1034,9 +1041,8 @@ public class DefaultModelValidator buffer.append( ' ' ).append( message ); // CHECKSTYLE_OFF: LineLength -problems.add( new ModelProblemCollectorRequest( severity, -version ).setMessage( buffer.toString() ).setLocation( getLocation( fieldName, - tracker ) ) ); +problems.add( new ModelProblemCollectorRequest( severity, version ).setMessage( + buffer.toString() ).setLocation( getLocation( fieldName, tracker ) ) ); // CHECKSTYLE_ON: LineLength } http://git-wip-us.apache.org/repos/asf/maven/blob/12d64713/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java -- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java index bb99be9..4da3c87 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java @@ -418,7 +418,20 @@ public class DefaultModelValidatorTest assertViolations( result, 0, 0, 1 ); -assertTrue( result.getWarnings().get( 0 ).contains( "test:a:jar" ) ); +assertContains( result.getWarnings().get( 0 ), +"'dependencies.dependency.systemPath' for test:a:jar should use a variable instead of a hard-coded path" ); + +SimpleProblemCollector result_31 =
[11/12] maven git commit: Squashed commit of the following:
Squashed commit of the following: commit c829bdcfc275b207e23fc568b3c16d98195675be Author: rfscholteDate: Thu Aug 24 10:54:08 2017 +0200 [MNG-6275] ServiceLoaderFactory can't find implementations via ClassRealm Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f047ea14 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f047ea14 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f047ea14 Branch: refs/heads/MNG-6069 Commit: f047ea143766fd22ae42040e6805bef287f3cc3e Parents: 785bad6 Author: rfscholte Authored: Thu Aug 24 11:33:01 2017 +0200 Committer: rfscholte Committed: Thu Aug 24 11:33:01 2017 +0200 -- .../classrealm/DefaultClassRealmManager.java| 2 +- .../DefaultClassRealmManagerTest.java | 101 +++ 2 files changed, 102 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f047ea14/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 6ce1925..d517924 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, null ); +ClassRealm classRealm = world.newRealm( realmId, ClassLoader.getSystemClassLoader() ); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/f047ea14/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java new file mode 100644 index 000..726199f --- /dev/null +++ b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java @@ -0,0 +1,101 @@ +package org.apache.maven.classrealm; + +/* + * 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.ServiceLoader; + +import javax.script.ScriptEngineFactory; + +import org.apache.maven.model.Model; +import org.apache.maven.model.Plugin; +import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; +import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.classworlds.realm.ClassRealm; +import org.junit.Test; + +public class DefaultClassRealmManagerTest extends PlexusTestCase +{ +private ClassRealmManager classRealmManager; + +@Override +protected void setUp() +throws Exception +{ +super.setUp(); +this.classRealmManager = lookup( ClassRealmManager.class ); +} + +@Override +protected void customizeContainerConfiguration( ContainerConfiguration configuration ) +{ +configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); +} + +@Test +public void testMNG6275_pluginRealmDefaultParentClassLoader() +{ +Plugin plugin = new Plugin(); +plugin.setVersion( "VERSION" ); + +ClassLoader parent = null; + +ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null ); +ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm ); +assertTrue( sef.iterator().hasNext() ); +} + +@Test +public void testMNG6275_extensionRealmDefaultParentClassLoader() +{ +Plugin
[06/12] maven git commit: [MNG-6123] detect self references in POM and fail fast o Added unit test and self referencing pom
[MNG-6123] detect self references in POM and fail fast o Added unit test and self referencing pom Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8f8c45c9 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8f8c45c9 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8f8c45c9 Branch: refs/heads/MNG-6069 Commit: 8f8c45c990193b04c1770997d446951c5185b164 Parents: b100257 Author: Karl Heinz MarbaiseAuthored: Tue Apr 4 22:46:11 2017 +0200 Committer: Karl Heinz Marbaise Committed: Tue Aug 1 22:01:36 2017 +0200 -- .../model/validation/DefaultModelValidator.java | 54 ++-- .../validation/DefaultModelValidatorTest.java | 13 + .../validation/raw-model/self-referencing.xml | 38 ++ 3 files changed, 102 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/8f8c45c9/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java -- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index 2e7985f..d97d8f6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -131,6 +131,9 @@ public class DefaultModelValidator validate20RawDependencies( problems, m.getDependencies(), "dependencies.dependency", request ); +validate20RawDependenciesSelfReferencing( problems, m, m.getDependencies(), "dependencies.dependency", + request ); + if ( m.getDependencyManagement() != null ) { validate20RawDependencies( problems, m.getDependencyManagement().getDependencies(), @@ -344,12 +347,12 @@ public class DefaultModelValidator Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 ); -validateEffectiveDependencies( problems, m.getDependencies(), false, request ); +validateEffectiveDependencies( problems, m, m.getDependencies(), false, request ); DependencyManagement mgmt = m.getDependencyManagement(); if ( mgmt != null ) { -validateEffectiveDependencies( problems, mgmt.getDependencies(), true, request ); +validateEffectiveDependencies( problems, m, mgmt.getDependencies(), true, request ); } if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 ) @@ -524,7 +527,33 @@ public class DefaultModelValidator } } -private void validateEffectiveDependencies( ModelProblemCollector problems, List dependencies, +private void validate20RawDependenciesSelfReferencing( ModelProblemCollector problems, Model m, + List dependencies, String prefix, + ModelBuildingRequest request ) +{ +// We only check for groupId/artifactId cause if there is another +// module with the same groupId/artifactId this will fail the build +// earlier like "Project '...' is duplicated in the reactor. +// So it is sufficient to check only groupId/artifactId and not the +// packaging type. +for ( Dependency dependency : dependencies ) +{ +String key = dependency.getGroupId() + ":" + dependency.getArtifactId() + ":" + dependency.getVersion(); +String mKey = m.getGroupId() + ":" + m.getArtifactId() + ":" + m.getVersion(); +if ( key.equals( mKey ) ) +{ +// This means a module which is build has a dependency which has the same +// groupId, artifactId and version coordinates. This is in consequence +// a self reference or in other words a circular reference which can not +// being resolved. +addViolation( problems, Severity.FATAL, Version.V31, prefix + " " + key, key, "is referencing itself.", + dependency ); + +} +} +} + +private void validateEffectiveDependencies( ModelProblemCollector problems, Model m, List dependencies, boolean management, ModelBuildingRequest request ) { Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 ); @@ -551,11 +580,30 @@ public class
[01/12] maven git commit: [MNG-6186] fixed path to jansi native libs in distribution [Forced Update!]
Repository: maven Updated Branches: refs/heads/MNG-6069 0abc475f7 -> d349ddd32 (forced update) [MNG-6186] fixed path to jansi native libs in distribution Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/707cff6f Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/707cff6f Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/707cff6f Branch: refs/heads/MNG-6069 Commit: 707cff6ffdecbfb0e0356c70e3a7b490535e7ce4 Parents: eb6b212 Author: Hervé BoutemyAuthored: Sat Jun 10 08:04:43 2017 +0200 Committer: Hervé Boutemy Committed: Sat Jun 10 08:04:43 2017 +0200 -- apache-maven/src/bin/mvn | 2 +- apache-maven/src/bin/mvn.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/707cff6f/apache-maven/src/bin/mvn -- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index 525b2ef..fa6164b 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -194,6 +194,6 @@ exec "$JAVACMD" \ -classpath "${CLASSWORLDS_JAR}" \ "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \ "-Dmaven.home=${MAVEN_HOME}" \ - "-Dlibrary.jansi.path=${MAVEN_HOME}/jansi-native" \ + "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ${CLASSWORLDS_LAUNCHER} "$@" http://git-wip-us.apache.org/repos/asf/maven/blob/707cff6f/apache-maven/src/bin/mvn.cmd -- diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index ba61f80..7b0b271 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -181,7 +181,7 @@ set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher -classpath %CLASSWORLDS_JAR% ^ "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^ "-Dmaven.home=%MAVEN_HOME%" ^ - "-Dlibrary.jansi.path=%MAVEN_HOME%\jansi-native" ^ + "-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% if ERRORLEVEL 1 goto error
[12/12] maven git commit: [MNG-6069] Migrate to non deprecated parts of Commons CLI
[MNG-6069] Migrate to non deprecated parts of Commons CLI Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d349ddd3 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d349ddd3 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d349ddd3 Branch: refs/heads/MNG-6069 Commit: d349ddd3222cb15f14230cf9277ee6c82a0106fd Parents: f047ea1 Author: Karl Heinz MarbaiseAuthored: Sat Mar 18 18:18:27 2017 +0100 Committer: Karl Heinz Marbaise Committed: Sun Aug 27 16:36:42 2017 +0200 -- .../java/org/apache/maven/cli/CLIManager.java | 118 ++- 1 file changed, 60 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/d349ddd3/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index a9038bf..20376d9 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -24,9 +24,9 @@ import java.io.PrintWriter; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; @@ -35,43 +35,43 @@ import org.apache.commons.cli.ParseException; */ public class CLIManager { -public static final char ALTERNATE_POM_FILE = 'f'; +public static final String ALTERNATE_POM_FILE = "f"; -public static final char BATCH_MODE = 'B'; +public static final String BATCH_MODE = "B"; -public static final char SET_SYSTEM_PROPERTY = 'D'; +public static final String SET_SYSTEM_PROPERTY = "D"; -public static final char OFFLINE = 'o'; +public static final String OFFLINE = "o"; -public static final char QUIET = 'q'; +public static final String QUIET = "q"; -public static final char DEBUG = 'X'; +public static final String DEBUG = "X"; -public static final char ERRORS = 'e'; +public static final String ERRORS = "e"; -public static final char HELP = 'h'; +public static final String HELP = "h"; -public static final char VERSION = 'v'; +public static final String VERSION = "v"; -public static final char SHOW_VERSION = 'V'; +public static final String SHOW_VERSION = "V"; -public static final char NON_RECURSIVE = 'N'; +public static final String NON_RECURSIVE = "N"; -public static final char UPDATE_SNAPSHOTS = 'U'; +public static final String UPDATE_SNAPSHOTS = "U"; -public static final char ACTIVATE_PROFILES = 'P'; +public static final String ACTIVATE_PROFILES = "P"; public static final String SUPRESS_SNAPSHOT_UPDATES = "nsu"; -public static final char CHECKSUM_FAILURE_POLICY = 'C'; +public static final String CHECKSUM_FAILURE_POLICY = "C"; -public static final char CHECKSUM_WARNING_POLICY = 'c'; +public static final String CHECKSUM_WARNING_POLICY = "c"; -public static final char ALTERNATE_USER_SETTINGS = 's'; +public static final String ALTERNATE_USER_SETTINGS = "s"; public static final String ALTERNATE_GLOBAL_SETTINGS = "gs"; -public static final char ALTERNATE_USER_TOOLCHAINS = 't'; +public static final String ALTERNATE_USER_TOOLCHAINS = "t"; public static final String ALTERNATE_GLOBAL_TOOLCHAINS = "gt"; @@ -103,50 +103,52 @@ public class CLIManager protected Options options; -@SuppressWarnings( { "static-access", "checkstyle:linelength" } ) +// CHECKSTYLE_OFF: LineLength public CLIManager() { options = new Options(); -options.addOption( OptionBuilder.withLongOpt( "help" ).withDescription( "Display help information" ).create( HELP ) ); -options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( "Force the use of an alternate POM file (or directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) ); -options.addOption( OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create( SET_SYSTEM_PROPERTY ) ); -options.addOption( OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) ); -options.addOption( OptionBuilder.withLongOpt( "version" ).withDescription( "Display version information" ).create( VERSION ) ); -options.addOption(
[04/12] maven git commit: [MNG-6258] Upgrade to Maven Resolver 1.1.0
[MNG-6258] Upgrade to Maven Resolver 1.1.0 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e520324c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e520324c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e520324c Branch: refs/heads/MNG-6069 Commit: e520324c8d45e2465cf8aeafb4d57cef30250136 Parents: a1fe421 Author: Michael OsipovAuthored: Wed Jul 12 19:50:09 2017 +0200 Committer: Michael Osipov Committed: Wed Jul 12 19:50:09 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/e520324c/pom.xml -- diff --git a/pom.xml b/pom.xml index d6f165c..78c375f 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. 1.7 1.9.1 1.3 -1.0.3 +1.1.0 1.7.22 true
[10/12] maven git commit: [MNG-6220] Add CLI options to control color output Introduce -Dstyle.color=[always|never|auto]
[MNG-6220] Add CLI options to control color output Introduce -Dstyle.color=[always|never|auto] Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/785bad69 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/785bad69 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/785bad69 Branch: refs/heads/MNG-6069 Commit: 785bad693c60ad60d7b307af8fab9e9234ff57bd Parents: f1ed659 Author: rfscholteAuthored: Tue Aug 15 21:48:57 2017 +0200 Committer: rfscholte Committed: Tue Aug 15 21:48:57 2017 +0200 -- maven-embedder/pom.xml | 5 ++ .../java/org/apache/maven/cli/MavenCli.java | 28 +-- .../java/org/apache/maven/cli/MavenCliTest.java | 86 ++-- 3 files changed, 107 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/785bad69/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 7bd2650..4b3d097 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -138,6 +138,11 @@ under the License. org.apache.commons commons-lang3 + + org.fusesource.jansi + jansi + test + http://git-wip-us.apache.org/repos/asf/maven/blob/785bad69/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 641a2a9..3474fab 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -144,6 +144,8 @@ public class MavenCli private static final String MVN_MAVEN_CONFIG = ".mvn/maven.config"; +public static final String STYLE_COLOR_PROPERTY = "style.color"; + private ClassWorld classWorld; private LoggerManager plexusLoggerManager; @@ -472,8 +474,9 @@ public class MavenCli /** * configure logging */ -private void logging( CliRequest cliRequest ) +void logging( CliRequest cliRequest ) { +// LOG LEVEL cliRequest.debug = cliRequest.commandLine.hasOption( CLIManager.DEBUG ); cliRequest.quiet = !cliRequest.debug && cliRequest.commandLine.hasOption( CLIManager.QUIET ); cliRequest.showErrors = cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.ERRORS ); @@ -494,18 +497,33 @@ public class MavenCli // else fall back to default log level specified in conf // see https://issues.apache.org/jira/browse/MNG-2570 -if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE ) ) +// LOG COLOR +String styleColor = cliRequest.getUserProperties().getProperty( STYLE_COLOR_PROPERTY, "auto" ); +if ( "always".equals( styleColor ) ) +{ +MessageUtils.setColorEnabled( true ); +} +else if ( "never".equals( styleColor ) ) { MessageUtils.setColorEnabled( false ); } - +else if ( !"auto".equals( styleColor ) ) +{ +throw new IllegalArgumentException( "Invalid color configuration option [" + styleColor ++ "]. Supported values are (auto|always|never)." ); +} +else if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE ) +|| cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) ) +{ +MessageUtils.setColorEnabled( false ); +} + +// LOG STREAMS if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) ) { File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) ); logFile = resolveFile( logFile, cliRequest.workingDirectory ); -MessageUtils.setColorEnabled( false ); - // redirect stdout and stderr to file try { http://git-wip-us.apache.org/repos/asf/maven/blob/785bad69/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java -- diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java index 9b480ea..433c949 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java @@ -19,26 +19,35 @@ package org.apache.maven.cli; * under the License. */ -import junit.framework.TestCase; -import org.apache.commons.cli.ParseException; +import
[07/12] maven git commit: [MNG-6174] Clean Up Maven Model
[MNG-6174] Clean Up Maven Model Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4f2a2dba Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4f2a2dba Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4f2a2dba Branch: refs/heads/MNG-6069 Commit: 4f2a2dba89251d9045fe9944783509a397491da3 Parents: 8f8c45c Author: Karl Heinz MarbaiseAuthored: Sun Feb 19 21:17:31 2017 +0100 Committer: Karl Heinz Marbaise Committed: Wed Aug 2 19:31:49 2017 +0200 -- maven-model/src/main/mdo/maven.mdo | 667 1 file changed, 667 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/4f2a2dba/maven-model/src/main/mdo/maven.mdo -- diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index de800d9..7ba6106 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -83,18 +83,6 @@ - pomVersion - 3.0.0 - true - String - - - - - modelVersion 4.0.0+ true @@ -107,20 +95,6 @@ - extend - 3.0.0 - - - - String - - parent 4.0.0+ The location of the parent project, if one exists. Values from the parent @@ -159,25 +133,6 @@ String - id - 3.0.0 - true - - - - String - - - currentVersion - The current version of the artifact produced by this project. - 3.0.0 - true - String - - version 4.0.0+ true @@ -185,15 +140,6 @@ String - versions - 3.0.0 - Contains information on previous versions of the project. - -Version -* - - - packaging 4.0.0+ @@ -223,13 +169,6 @@ String - shortDescription - 3.0.0 - A short description of the project. The short description should be limited -to a single line. - String - - description 3.0.0+ A detailed description of the project, used by Maven whenever it needs to @@ -251,20 +190,6 @@ String - siteAddress - 3.0.0 - The hostname of the web server that hosts the project's web site. This is -used when the web site is deployed. - String - - - siteDirectory - 3.0.0 - The directory on the web server where the public web site for this project -resides. This is used when the web site is deployed. - String - - inceptionYear 3.0.0+ true @@ -273,20 +198,6 @@ String - logo - 3.0.0 - - - - String - - organization 3.0.0+ This element describes various attributes of the organization to which the @@ -361,27 +272,6 @@ - - branches - 3.0.0 - - - - -Branch -* - - - - repository - 3.0.0 - Specification for the SCM used by the project, such as CVS, Subversion, etc. - -Repository - - scm 4.0.0+ @@ -395,12 +285,6 @@ - - issueTrackingUrl - 3.0.0 - The URL of the project's issue tracking system. - String - issueManagement 4.0.0+ @@ -415,12 +299,6 @@ - gumpRepositoryId - 3.0.0 - This is the repository identifier in Gump that this project is part of. - String - - ciManagement 4.0.0+ The project's continuous integration information. @@ -430,83 +308,6 @@ - - - - - distributionSite - 3.0.0 - - - - String - - - distributionDirectory - 3.0.0 - The directory on the web server where the final distributions will be -published. This
[05/12] maven git commit: [MNG-5457] Show repository id when downloading or uploading from/to a remote repository
[MNG-5457] Show repository id when downloading or uploading from/to a remote repository Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b1002575 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b1002575 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b1002575 Branch: refs/heads/MNG-6069 Commit: b1002575177abd1108fe50f457cceb9c7c3cf7d8 Parents: e520324 Author: Michael OsipovAuthored: Fri Jul 15 23:26:56 2016 +0200 Committer: Michael Osipov Committed: Wed Jul 12 20:10:47 2017 +0200 -- .../transfer/AbstractMavenTransferListener.java | 31 +--- .../transfer/Slf4jMavenTransferListener.java| 31 +--- 2 files changed, 42 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/b1002575/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java index 21822be..2b13879 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java @@ -217,9 +217,15 @@ public abstract class AbstractMavenTransferListener public void transferInitiated( TransferEvent event ) { String action = event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploading" : "Downloading"; +String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from"; TransferResource resource = event.getResource(); -out.println( action + ": " + resource.getRepositoryUrl() + resource.getResourceName() ); +StringBuilder message = new StringBuilder(); +message.append( action ).append( ' ' ).append( direction ).append( ' ' ).append( resource.getRepositoryId() ); +message.append( ": " ); +message.append( resource.getRepositoryUrl() ).append( resource.getResourceName() ); + +out.println( message.toString() ); } @Override @@ -228,30 +234,35 @@ public abstract class AbstractMavenTransferListener { TransferResource resource = event.getResource(); // TODO This needs to be colorized -out.println( "[WARNING] " + event.getException().getMessage() + " for " + resource.getRepositoryUrl() -+ resource.getResourceName() ); +out.println( "[WARNING] " + event.getException().getMessage() + " from " + resource.getRepositoryId() + " for " ++ resource.getRepositoryUrl() + resource.getResourceName() ); } @Override public void transferSucceeded( TransferEvent event ) { +String action = ( event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploaded" : "Downloaded" ); +String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from"; + TransferResource resource = event.getResource(); long contentLength = event.getTransferredBytes(); - FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH ); -String result = ( event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploaded" : "Downloaded" ); -String len = format.format( contentLength ); -String throughput = ""; +StringBuilder message = new StringBuilder(); +message.append( action ).append( ' ' ).append( direction ).append( ' ' ).append( resource.getRepositoryId() ); +message.append( ": " ); +message.append( resource.getRepositoryUrl() ).append( resource.getResourceName() ); +message.append( " (" ).append( format.format( contentLength ) ); + long duration = System.currentTimeMillis() - resource.getTransferStartTime(); if ( duration > 0L ) { double bytesPerSecond = contentLength / ( duration / 1000.0 ); -throughput = " at " + format.format( (long) bytesPerSecond ) + "/s"; +message.append( " at " ).append( format.format( (long) bytesPerSecond ) ).append( "/s" ); } -out.println( result + ": " + resource.getRepositoryUrl() + resource.getResourceName() + " (" + len -+ throughput + ")" ); +message.append( ')' ); +out.println( message.toString() ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/b1002575/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java -- diff
[3/5] maven git commit: [MNG-6220] Add CLI options to control color output Introduce -Dstyle.color=[always|never|auto]
[MNG-6220] Add CLI options to control color output Introduce -Dstyle.color=[always|never|auto] Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/785bad69 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/785bad69 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/785bad69 Branch: refs/heads/MNG-6216 Commit: 785bad693c60ad60d7b307af8fab9e9234ff57bd Parents: f1ed659 Author: rfscholteAuthored: Tue Aug 15 21:48:57 2017 +0200 Committer: rfscholte Committed: Tue Aug 15 21:48:57 2017 +0200 -- maven-embedder/pom.xml | 5 ++ .../java/org/apache/maven/cli/MavenCli.java | 28 +-- .../java/org/apache/maven/cli/MavenCliTest.java | 86 ++-- 3 files changed, 107 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/785bad69/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 7bd2650..4b3d097 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -138,6 +138,11 @@ under the License. org.apache.commons commons-lang3 + + org.fusesource.jansi + jansi + test + http://git-wip-us.apache.org/repos/asf/maven/blob/785bad69/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 641a2a9..3474fab 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -144,6 +144,8 @@ public class MavenCli private static final String MVN_MAVEN_CONFIG = ".mvn/maven.config"; +public static final String STYLE_COLOR_PROPERTY = "style.color"; + private ClassWorld classWorld; private LoggerManager plexusLoggerManager; @@ -472,8 +474,9 @@ public class MavenCli /** * configure logging */ -private void logging( CliRequest cliRequest ) +void logging( CliRequest cliRequest ) { +// LOG LEVEL cliRequest.debug = cliRequest.commandLine.hasOption( CLIManager.DEBUG ); cliRequest.quiet = !cliRequest.debug && cliRequest.commandLine.hasOption( CLIManager.QUIET ); cliRequest.showErrors = cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.ERRORS ); @@ -494,18 +497,33 @@ public class MavenCli // else fall back to default log level specified in conf // see https://issues.apache.org/jira/browse/MNG-2570 -if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE ) ) +// LOG COLOR +String styleColor = cliRequest.getUserProperties().getProperty( STYLE_COLOR_PROPERTY, "auto" ); +if ( "always".equals( styleColor ) ) +{ +MessageUtils.setColorEnabled( true ); +} +else if ( "never".equals( styleColor ) ) { MessageUtils.setColorEnabled( false ); } - +else if ( !"auto".equals( styleColor ) ) +{ +throw new IllegalArgumentException( "Invalid color configuration option [" + styleColor ++ "]. Supported values are (auto|always|never)." ); +} +else if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE ) +|| cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) ) +{ +MessageUtils.setColorEnabled( false ); +} + +// LOG STREAMS if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) ) { File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) ); logFile = resolveFile( logFile, cliRequest.workingDirectory ); -MessageUtils.setColorEnabled( false ); - // redirect stdout and stderr to file try { http://git-wip-us.apache.org/repos/asf/maven/blob/785bad69/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java -- diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java index 9b480ea..433c949 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java @@ -19,26 +19,35 @@ package org.apache.maven.cli; * under the License. */ -import junit.framework.TestCase; -import org.apache.commons.cli.ParseException; +import
[4/5] maven git commit: Squashed commit of the following:
Squashed commit of the following: commit c829bdcfc275b207e23fc568b3c16d98195675be Author: rfscholteDate: Thu Aug 24 10:54:08 2017 +0200 [MNG-6275] ServiceLoaderFactory can't find implementations via ClassRealm Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f047ea14 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f047ea14 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f047ea14 Branch: refs/heads/MNG-6216 Commit: f047ea143766fd22ae42040e6805bef287f3cc3e Parents: 785bad6 Author: rfscholte Authored: Thu Aug 24 11:33:01 2017 +0200 Committer: rfscholte Committed: Thu Aug 24 11:33:01 2017 +0200 -- .../classrealm/DefaultClassRealmManager.java| 2 +- .../DefaultClassRealmManagerTest.java | 101 +++ 2 files changed, 102 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f047ea14/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 6ce1925..d517924 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, null ); +ClassRealm classRealm = world.newRealm( realmId, ClassLoader.getSystemClassLoader() ); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/f047ea14/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java new file mode 100644 index 000..726199f --- /dev/null +++ b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java @@ -0,0 +1,101 @@ +package org.apache.maven.classrealm; + +/* + * 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.ServiceLoader; + +import javax.script.ScriptEngineFactory; + +import org.apache.maven.model.Model; +import org.apache.maven.model.Plugin; +import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; +import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.classworlds.realm.ClassRealm; +import org.junit.Test; + +public class DefaultClassRealmManagerTest extends PlexusTestCase +{ +private ClassRealmManager classRealmManager; + +@Override +protected void setUp() +throws Exception +{ +super.setUp(); +this.classRealmManager = lookup( ClassRealmManager.class ); +} + +@Override +protected void customizeContainerConfiguration( ContainerConfiguration configuration ) +{ +configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); +} + +@Test +public void testMNG6275_pluginRealmDefaultParentClassLoader() +{ +Plugin plugin = new Plugin(); +plugin.setVersion( "VERSION" ); + +ClassLoader parent = null; + +ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null ); +ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm ); +assertTrue( sef.iterator().hasNext() ); +} + +@Test +public void testMNG6275_extensionRealmDefaultParentClassLoader() +{ +Plugin
[5/5] maven git commit: [MNG-6216] ArrayIndexOutOfBoundsException when parsing POM o Upgraded to new release of plexus-utils which contains the fix for #22 in plexus-utils.
[MNG-6216] ArrayIndexOutOfBoundsException when parsing POM o Upgraded to new release of plexus-utils which contains the fix for #22 in plexus-utils. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/99244b09 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/99244b09 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/99244b09 Branch: refs/heads/MNG-6216 Commit: 99244b097a5d09363126d3722973213b380483d3 Parents: f047ea1 Author: Karl Heinz MarbaiseAuthored: Thu Aug 3 20:12:25 2017 +0200 Committer: Karl Heinz Marbaise Committed: Sun Aug 27 16:44:00 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/99244b09/pom.xml -- diff --git a/pom.xml b/pom.xml index 8ce59ed..761edbf 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ under the License. 1.10.19 1.7.1 1.24 -3.0.24 +3.1.0 20.0 4.0 0.3.3
[2/5] maven git commit: [MNG-6127] Fix plugin execution configuration interference
[MNG-6127] Fix plugin execution configuration interference Signed-off-by: rfscholteProject: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f1ed6592 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f1ed6592 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f1ed6592 Branch: refs/heads/MNG-6216 Commit: f1ed6592b1c701834d1377fade6cdb382a63bbf4 Parents: 842db37 Author: Mario Krizmanic Authored: Tue Aug 15 21:46:29 2017 +0200 Committer: rfscholte Committed: Tue Aug 15 21:46:29 2017 +0200 -- .../internal/DefaultLifecyclePluginAnalyzer.java | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f1ed6592/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java -- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java index aec785f..14653b7 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java @@ -31,6 +31,7 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.StringUtils; +import org.codehaus.plexus.util.xml.Xpp3Dom; import java.util.ArrayList; import java.util.Collections; @@ -190,8 +191,13 @@ public class DefaultLifecyclePluginAnalyzer execution.setPhase( phase ); execution.setPriority( i - mojos.size() ); execution.getGoals().add( gs.goal ); -execution.setConfiguration( mojo.getConfiguration() ); - + +Xpp3Dom lifecycleConfiguration = mojo.getConfiguration(); +if ( lifecycleConfiguration != null ) +{ +execution.setConfiguration( new Xpp3Dom( lifecycleConfiguration ) ); +} + plugin.setDependencies( mojo.getDependencies() ); plugin.getExecutions().add( execution ); }
[1/5] maven git commit: [MNG-6148] Can't package and assemble with JDK9/Jigsaw [Forced Update!]
Repository: maven Updated Branches: refs/heads/MNG-6216 9bd69aa8f -> 99244b097 (forced update) [MNG-6148] Can't package and assemble with JDK9/Jigsaw Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/842db371 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/842db371 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/842db371 Branch: refs/heads/MNG-6216 Commit: 842db371f0fcaf4e930b99395fb6a8bb442684d6 Parents: 4f2a2db Author: rfscholteAuthored: Tue Aug 15 21:42:42 2017 +0200 Committer: rfscholte Committed: Tue Aug 15 21:42:42 2017 +0200 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/842db371/pom.xml -- diff --git a/pom.xml b/pom.xml index 78c375f..8ce59ed 100644 --- a/pom.xml +++ b/pom.xml @@ -657,6 +657,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin +3.0.0-M1 en
svn commit: r1806368 - in /maven/plugins/trunk/maven-ear-plugin/src: main/java/org/apache/maven/plugins/ear/ site/apt/examples/ test/java/org/apache/maven/plugins/ear/
Author: khmarbaise Date: Sun Aug 27 13:54:21 2017 New Revision: 1806368 URL: http://svn.apache.org/viewvc?rev=1806368=rev Log: [MEAR-248] Support lookup-name in env-entry section o Added lookup-name in env-entry section. Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/specifying-env-entries-for-the-generated-application-xml.apt.vm maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/EnvEntryTest.java Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java?rev=1806368=1806367=1806368=diff == --- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java Sun Aug 27 13:54:21 2017 @@ -41,6 +41,8 @@ class EnvEntry static final String ENV_ENTRY_VALUE = "env-entry-value"; +static final String ENV_LOOKUP_NAME = "lookup-name"; + private final String description; private final String name; @@ -49,7 +51,9 @@ class EnvEntry private final String value; -public EnvEntry( String description, String name, String type, String value ) +private final String lookupName; + +public EnvEntry( String description, String name, String type, String value, String lookupName ) { if ( StringUtils.isEmpty( name ) ) { @@ -66,6 +70,7 @@ class EnvEntry this.name = name; this.type = type; this.value = value; +this.lookupName = lookupName; } public String getDescription() @@ -88,6 +93,11 @@ class EnvEntry return value; } +public String getLookupName() +{ +return lookupName; +} + /** * Appends the XML representation of this env-entry. * @@ -119,6 +129,12 @@ class EnvEntry doWriteElement( writer, ENV_ENTRY_VALUE, getValue() ); } +// lookup-name +if ( getLookupName() != null ) +{ +doWriteElement( writer, ENV_LOOKUP_NAME, getLookupName() ); +} + // end of env-entry writer.endElement(); } @@ -132,7 +148,8 @@ class EnvEntry public String toString() { -return "env-entry [name=" + getName() + ", type=" + getType() + ", value=" + getValue() + "]"; +return "env-entry [name=" + getName() + ", type=" + getType() + ", value=" + getValue() + ", lookup-name=" ++ getLookupName() + "]"; } } \ No newline at end of file Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java?rev=1806368=1806367=1806368=diff == --- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java Sun Aug 27 13:54:21 2017 @@ -356,6 +356,8 @@ public class GenerateApplicationXmlMojo final PlexusConfiguration[] allEnvEntries = envEntries.getChildren( EnvEntry.ENV_ENTRY ); +getLog().debug( "buildEnvEntries: allEnvEntries:" + allEnvEntries ); +getLog().debug( "buildEnvEntries: allEnvEntries size:" + allEnvEntries.length ); for ( PlexusConfiguration envEntry : allEnvEntries ) { // CHECKSTYLE_OFF: LineLength @@ -367,12 +369,14 @@ public class GenerateApplicationXmlMojo interpolate( ssi, envEntry.getChild( EnvEntry.ENV_ENTRY_TYPE ).getValue() ); final String childEnvEntryValue = interpolate( ssi, envEntry.getChild( EnvEntry.ENV_ENTRY_VALUE ).getValue() ); +final String childEnvLookupNameValue = +interpolate( ssi, envEntry.getChild( EnvEntry.ENV_LOOKUP_NAME ).getValue() ); // CHECKSTYLE_ON: LineLength try { result.add( new EnvEntry( childDescription, childEnvEntryName, childEnvEntryType, - childEnvEntryValue ) ); + childEnvEntryValue, childEnvLookupNameValue ) ); } catch (
svn commit: r1806364 - in /maven/plugins/trunk/maven-ear-plugin/src: main/java/org/apache/maven/plugins/ear/ site/apt/ site/apt/examples/
Author: khmarbaise Date: Sun Aug 27 13:26:55 2017 New Revision: 1806364 URL: http://svn.apache.org/viewvc?rev=1806364=rev Log: [MEAR-247] resource-ref in generated application.xml o Added the generation of resource-ref entries in application.xml Added: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ResourceRef.java maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/specifying-resource-ref-entries-for-the-generated-application-xml.apt.vm Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriter.java maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriter.java?rev=1806364=1806363=1806364=diff == --- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriter.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriter.java Sun Aug 27 13:26:55 2017 @@ -33,9 +33,11 @@ import org.codehaus.plexus.util.xml.XMLW final class ApplicationXmlWriter extends AbstractXmlWriter { -public static final String DOCTYPE_1_3 = "application PUBLIC\n" -+ "\t\"-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN\"\n" -+ "\t\"http://java.sun.com/dtd/application_1_3.dtd\";; +//@formatter:off +public static final String DOCTYPE_1_3 = "application PUBLIC\n" ++ "\t\"-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN\"\n" ++ "\t\"http://java.sun.com/dtd/application_1_3.dtd\";; +//@formatter:on private static final String APPLICATION_ELEMENT = "application"; @@ -134,6 +136,10 @@ final class ApplicationXmlWriter { ejbEntry.appendEjbRefEntry( writer ); } +for ( ResourceRef resourceEntry : context.getResourceRefs() ) +{ +resourceEntry.appendResourceRefEntry( writer ); +} } writer.endElement(); Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java?rev=1806364=1806363=1806364=diff == --- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java Sun Aug 27 13:26:55 2017 @@ -40,9 +40,11 @@ class ApplicationXmlWriterContext private final List securityRoles; private final List envEntries; - + private final List ejbEntries; +private final List resourceRefs; + private final String displayName; private final String description; @@ -55,15 +57,16 @@ class ApplicationXmlWriterContext public ApplicationXmlWriterContext( File destinationFile, List earModules, List securityRoles, List envEntries, -List ejbEntries, -String displayName, String description, String libraryDirectory, -String applicationName, Boolean initializeInOrder ) +List ejbEntries, List resourceRefs, String displayName, +String description, String libraryDirectory, String applicationName, +Boolean initializeInOrder ) { this.destinationFile = destinationFile; this.earModules = earModules; this.securityRoles = securityRoles; this.envEntries = envEntries; this.ejbEntries = ejbEntries; +this.resourceRefs = resourceRefs; this.displayName = displayName; this.description = description; this.libraryDirectory = libraryDirectory; @@ -133,6 +136,16 @@ class ApplicationXmlWriterContext } /** + * Returns the list of {@link ResourceRef}. + * + * @return the resource-ref elements. + */ +public List getResourceRefs() +{ +return resourceRefs; +} + +/** * Returns the display name. *
svn commit: r1806351 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AcrModule.java
Author: khmarbaise Date: Sun Aug 27 11:35:08 2017 New Revision: 1806351 URL: http://svn.apache.org/viewvc?rev=1806351=rev Log: [MEAR-226] bundleFileName functionality for the acr plugin o Added AcrModule implementation to make bundleFileName configuration possible. Added: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AcrModule.java Added: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AcrModule.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AcrModule.java?rev=1806351=auto == --- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AcrModule.java (added) +++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AcrModule.java Sun Aug 27 11:35:08 2017 @@ -0,0 +1,120 @@ +package org.apache.maven.plugins.ear; + +/* + * 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 org.apache.maven.artifact.Artifact; +import org.apache.maven.plugin.MojoFailureException; +import org.codehaus.plexus.util.xml.XMLWriter; + +import java.util.Set; + +/** + * The {@link EarModule} implementation for an Acr Module. + * + * + * @author Karl Heinz Marbaise + * @since 3.0.0 + */ +public class AcrModule +extends AbstractEarModule +{ +private Boolean includeInApplicationXml = Boolean.FALSE; + +private static final String APP_CLIENT = "app-client"; + +/** + * Create an instance. + */ +public AcrModule() +{ +super(); +} + +/** + * @param a {@link Artifact} + * @param defaultLibBundleDir The default library bundle directory. + * @param includeInApplicationXml Include the application xml or not. + */ +public AcrModule( Artifact a, String defaultLibBundleDir, Boolean includeInApplicationXml ) +{ +super( a ); +setLibBundleDir( defaultLibBundleDir ); +this.includeInApplicationXml = includeInApplicationXml; + +} + +/** + * {@inheritDoc} + */ +public void appendModule( XMLWriter writer, String version, Boolean generateId ) +{ +// Generates an entry in the application.xml only if +// includeInApplicationXml is set +if ( includeInApplicationXml ) +{ +startModuleElement( writer, generateId ); +writer.startElement( APP_CLIENT ); +writer.writeText( getUri() ); +writer.endElement(); + +writeAltDeploymentDescriptor( writer, version ); + +writer.endElement(); +} +} + +/** + * {@inheritDoc} + */ +public void resolveArtifact( Set artifacts ) +throws EarPluginException, MojoFailureException +{ +// Let's resolve the artifact +super.resolveArtifact( artifacts ); + +// If the defaultLibBundleDir is set and no bundle dir is +// set, set the default as bundle dir +setLibBundleDir( earExecutionContext.getDefaultLibBundleDir() ); +} + +/** + * {@inheritDoc} + */ +public String getType() +{ +return APP_CLIENT; +} + +private void setLibBundleDir( String defaultLibBundleDir ) +{ +if ( defaultLibBundleDir != null && bundleDir == null ) +{ +this.bundleDir = defaultLibBundleDir; +} +} + +/** + * {@inheritDoc} + */ +public boolean changeManifestClasspath() +{ +return false; +} +}
svn commit: r1806347 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Sun Aug 27 10:33:08 2017 New Revision: 1806347 URL: http://svn.apache.org/viewvc?rev=1806347=rev Log: [MWAR-410] Upgrade plexus-utils to version 3.1.0 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1806347=1806346=1806347=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun Aug 27 10:33:08 2017 @@ -124,7 +124,7 @@ org.codehaus.plexus plexus-utils - 3.0.24 + 3.1.0
svn commit: r1806346 - in /maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact: deploy/internal/DefaultArtifactDeployerTest.java install/internal/D
Author: khmarbaise Date: Sun Aug 27 10:22:28 2017 New Revision: 1806346 URL: http://svn.apache.org/viewvc?rev=1806346=rev Log: [MSHARED-656] Make integration testing for different Maven versions possible o Reordered parts of the tests. Modified: maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java Modified: maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java?rev=1806346=1806345=1806346=diff == --- maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java (original) +++ maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java Sun Aug 27 10:22:28 2017 @@ -57,10 +57,10 @@ public class DefaultArtifactDeployerTest throws ArtifactDeployerException { DefaultArtifactDeployer dap = new DefaultArtifactDeployer(); +ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class ); thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter mavenArtifacts is not allowed to be null." ); -ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class ); dap.deploy( pbr, null ); } @@ -69,10 +69,10 @@ public class DefaultArtifactDeployerTest throws ArtifactDeployerException { DefaultArtifactDeployer dap = new DefaultArtifactDeployer(); +ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class ); thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The collection mavenArtifacts is not allowed to be empty." ); -ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class ); dap.deploy( pbr, Collections.emptyList() ); } @@ -93,10 +93,10 @@ public class DefaultArtifactDeployerTest throws ArtifactDeployerException { DefaultArtifactDeployer dap = new DefaultArtifactDeployer(); +ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class ); thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter mavenArtifacts is not allowed to be null." ); -ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class ); dap.deploy( pbr, null, null ); } @@ -105,10 +105,10 @@ public class DefaultArtifactDeployerTest throws ArtifactDeployerException { DefaultArtifactDeployer dap = new DefaultArtifactDeployer(); +ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class ); thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The collection mavenArtifacts is not allowed to be empty." ); -ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class ); dap.deploy( pbr, null, Collections.emptyList() ); } Modified: maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java?rev=1806346=1806345=1806346=diff == --- maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java (original) +++ maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java Sun Aug 27 10:22:28 2017 @@ -45,8 +45,7 @@ public class DefaultArtifactInstallerTes public ExpectedException thrown = ExpectedException.none(); @Test -public void installShouldReturnIllegalArgumentExceptionForFirstParameterWithNull() -throws ArtifactInstallerException +public void installShouldReturnIllegalArgumentExceptionForFirstParameterWithNull() throws IllegalArgumentException, ArtifactInstallerException { DefaultArtifactInstaller dai = new DefaultArtifactInstaller();