http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml index 45dc77d..c8a8b85 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml @@ -1,8 +1,8 @@ <project> <modelVersion>4.0.0</modelVersion> - + <groupId>org.apache.maven.tests</groupId> <artifactId>build-from-file</artifactId> <version>1</version> - + </project> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml index 5c62a78..8f5154f 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml @@ -1,6 +1,6 @@ <project> <modelVersion>4.0.0</modelVersion> - + <groupId>tests</groupId> <artifactId>build-model-lineage</artifactId> <version>1</version> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml index 5953c32..4d1d23e 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml @@ -5,6 +5,6 @@ <artifactId>childAndParent-parent</artifactId> <version>1</version> </parent> - + <artifactId>childAndParent-child</artifactId> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml index 365ec18..164506f 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml @@ -1,6 +1,6 @@ <project> <modelVersion>4.0.0</modelVersion> - + <groupId>tests</groupId> <artifactId>childAndParent-parent</artifactId> <version>1</version> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml index e0eec3a..9633029 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml @@ -5,6 +5,6 @@ <artifactId>resolve-parent-pom-parent</artifactId> <version>1</version> </parent> - + <artifactId>resolve-parent-pom</artifactId> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml index 322147d..35c3217 100644 --- a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml +++ b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml @@ -18,7 +18,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + <toolchains> <toolchain> <type>jdk</type> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml index 01aa0e1..5233a33 100644 --- a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml +++ b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml @@ -18,7 +18,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + <toolchains> <toolchain> <type>jdk</type> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/project-dynamism/pom-interp.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/project-dynamism/pom-interp.xml b/maven-core/src/test/resources/project-dynamism/pom-interp.xml index 2ad098a..40fdb41 100644 --- a/maven-core/src/test/resources/project-dynamism/pom-interp.xml +++ b/maven-core/src/test/resources/project-dynamism/pom-interp.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - + <modelVersion>4.0.0</modelVersion> - + <groupId>org.test</groupId> <artifactId>test-build-dynamism</artifactId> <version>1</version> - + <build> <sourceDirectory>/${project.groupId}/src/main/java</sourceDirectory> <testSourceDirectory>/${pom.groupId}/src/test/java</testSourceDirectory> <scriptSourceDirectory>/${groupId}/src/main/scripts</scriptSourceDirectory> - + <plugins> <plugin> <artifactId>my-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/project-dynamism/pom-relative.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/project-dynamism/pom-relative.xml b/maven-core/src/test/resources/project-dynamism/pom-relative.xml index a24aebe..bb22b3d 100644 --- a/maven-core/src/test/resources/project-dynamism/pom-relative.xml +++ b/maven-core/src/test/resources/project-dynamism/pom-relative.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - + <modelVersion>4.0.0</modelVersion> - + <groupId>org.test</groupId> <artifactId>test-build-dynamism</artifactId> <version>1</version> - + <properties> <myProperty>${pom.build.directory}</myProperty> </properties> @@ -18,17 +18,17 @@ <directory>${pom.build.directory}/generated-resources/plexus</directory> </resource> </resources> - + <filters> <filter>${pom.build.directory}/generated-filters.properties</filter> </filters> - + <directory>target</directory> - + <sourceDirectory>src/main/java</sourceDirectory> <testSourceDirectory>src/test/java</testSourceDirectory> <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory> - + <outputDirectory>${pom.build.directory}/classes</outputDirectory> <testOutputDirectory>${pom.build.directory}/test-classes</testOutputDirectory> </build> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/project-dynamism/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/project-dynamism/pom.xml b/maven-core/src/test/resources/project-dynamism/pom.xml index 02bbed0..37797f2 100644 --- a/maven-core/src/test/resources/project-dynamism/pom.xml +++ b/maven-core/src/test/resources/project-dynamism/pom.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - + <modelVersion>4.0.0</modelVersion> - + <groupId>org.test</groupId> <artifactId>test-build-dynamism</artifactId> <version>1</version> - + <properties> <myProperty>${pom.build.directory}</myProperty> </properties> @@ -18,17 +18,17 @@ <directory>${pom.build.directory}/generated-resources/plexus</directory> </resource> </resources> - + <filters> <filter>${pom.build.directory}/generated-filters.properties</filter> </filters> - + <directory>target</directory> - + <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory> <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory> <scriptSourceDirectory>${pom.basedir}/src/main/scripts</scriptSourceDirectory> - + <outputDirectory>${pom.build.directory}/classes</outputDirectory> <testOutputDirectory>${pom.build.directory}/test-classes</testOutputDirectory> </build> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml b/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml index f4df904..58cae23 100644 --- a/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml +++ b/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml @@ -22,7 +22,7 @@ under the License. <artifactId>bar</artifactId> <name>Babar</name> <version>4.5</version> - + <!-- Build element should be inherited from the super model --> </model> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml b/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml index 6da9b27..7383109 100644 --- a/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml +++ b/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml @@ -3,7 +3,7 @@ <groupId>tests.project</groupId> <artifactId>duplicate-plugin-defs-merged</artifactId> <version>1</version> - + <build> <plugins> <plugin> @@ -44,5 +44,5 @@ </plugin> </plugins> </build> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml b/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml index 537605a..95ee353 100644 --- a/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml +++ b/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml @@ -8,9 +8,9 @@ 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 http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 0f1b538..97e9f09 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -84,12 +84,12 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <optional>true</optional> - </dependency> + </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <optional>true</optional> - </dependency> + </dependency> <!-- CLI --> <dependency> <groupId>commons-cli</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/examples/simple-project/settings.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/examples/simple-project/settings.xml b/maven-embedder/src/examples/simple-project/settings.xml index 7c234c1..39709fd 100644 --- a/maven-embedder/src/examples/simple-project/settings.xml +++ b/maven-embedder/src/examples/simple-project/settings.xml @@ -21,6 +21,6 @@ under the License. <settings> <pluginGroups> <pluginGroup>org.codehaus.tycho</pluginGroup> - <pluginGroup>org.sonatype.pwt</pluginGroup> + <pluginGroup>org.sonatype.pwt</pluginGroup> </pluginGroups> </settings> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java b/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java index a3cf2a3..06927bf 100644 --- a/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java +++ b/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java @@ -19,7 +19,7 @@ package org.apache.maven.embedder; * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java index cf7f8fc..ee90c20 100644 --- a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java +++ b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java @@ -22,7 +22,7 @@ import junit.framework.TestSuite; /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/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 cde88cb..ef81408 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 @@ -120,9 +120,9 @@ public class MavenCli private LoggerManager plexusLoggerManager; private ILoggerFactory slf4jLoggerFactory; - + private Logger slf4jLogger; - + private EventSpyDispatcher eventSpyDispatcher; private ModelProcessor modelProcessor; @@ -297,7 +297,7 @@ public class MavenCli System.out.println( CLIReportingUtils.showVersion() ); throw new ExitException( 0 ); } - } + } /** * configure logging @@ -497,7 +497,7 @@ public class MavenCli if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_MASTER_PASSWORD ) ) { String passwd = cliRequest.commandLine.getOptionValue( CLIManager.ENCRYPT_MASTER_PASSWORD ); - + if ( passwd == null ) { Console cons = System.console(); @@ -506,7 +506,7 @@ public class MavenCli { // Cipher uses Strings passwd = String.copyValueOf( password ); - + // Sun/Oracle advises to empty the char array java.util.Arrays.fill( password, ' ' ); } @@ -522,7 +522,7 @@ public class MavenCli else if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_PASSWORD ) ) { String passwd = cliRequest.commandLine.getOptionValue( CLIManager.ENCRYPT_PASSWORD ); - + if ( passwd == null ) { Console cons = System.console(); @@ -927,7 +927,7 @@ public class MavenCli if ( quiet ) { transferListener = new QuietMavenTransferListener(); - } + } else if ( request.isInteractiveMode() && !cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) ) { // @@ -1009,10 +1009,10 @@ public class MavenCli if ( commandLine.hasOption( CLIManager.PROJECT_LIST ) ) { String[] projectOptionValues = commandLine.getOptionValues( CLIManager.PROJECT_LIST ); - + List<String> inclProjects = new ArrayList<String>(); List<String> exclProjects = new ArrayList<String>(); - + if ( projectOptionValues != null ) { for ( String projectOptionValue : projectOptionValues ) @@ -1038,7 +1038,7 @@ public class MavenCli } } } - + request.setSelectedProjects( inclProjects ); request.setExcludedProjects( exclProjects ); } @@ -1070,24 +1070,24 @@ public class MavenCli { request.setLocalRepositoryPath( localRepoProperty ); } - + request.setCacheNotFound( true ); request.setCacheTransferError( false ); - // + // // Builder, concurrency and parallelism // // We preserve the existing methods for builder selection which is to look for various inputs in the threading // configuration. We don't have an easy way to allow a pluggable builder to provide its own configuration // parameters but this is sufficient for now. Ultimately we want components like Builders to provide a way to - // extend the command line to accept its own configuration parameters. + // extend the command line to accept its own configuration parameters. // final String threadConfiguration = commandLine.hasOption( CLIManager.THREADS ) ? commandLine.getOptionValue( CLIManager.THREADS ) : request.getSystemProperties().getProperty( MavenCli.THREADS_DEPRECATED ); // TODO: Remove this setting. Note that the int-tests use it - + if ( threadConfiguration != null ) { // @@ -1104,15 +1104,15 @@ public class MavenCli request.setDegreeOfConcurrency( Integer.valueOf( threadConfiguration ) ); } } - + // // Allow the builder to be overriden by the user if requested. The builders are now pluggable. // if ( commandLine.hasOption( CLIManager.BUILDER ) ) - { + { request.setBuilderId( commandLine.getOptionValue( CLIManager.BUILDER ) ); - } - + } + return request; } @@ -1121,7 +1121,7 @@ public class MavenCli int procs = Runtime.getRuntime().availableProcessors(); return (int) ( Float.valueOf( threadConfiguration.replace( "C", "" ) ) * procs ); } - + static File resolveFile( File file, String workingDirectory ) { if ( file == null ) @@ -1250,21 +1250,21 @@ public class MavenCli } } - + // // Customizations available via the CLI // - - protected TransferListener getConsoleTransferListener() + + protected TransferListener getConsoleTransferListener() { return new ConsoleMavenTransferListener( System.out ); } - + protected TransferListener getBatchTransferListener() { return new Slf4jMavenTransferListener(); } - + protected void customizeContainer( PlexusContainer container ) { } @@ -1273,5 +1273,5 @@ public class MavenCli throws ComponentLookupException { return container.lookup( ModelProcessor.class ); - } + } } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java index 44c79f4..33e9920 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; /** * Abstract implementation. - * + * * @author Hervé Boutemy * @since 3.1.0 */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java index c7b8900..5f4b64d 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java @@ -22,7 +22,7 @@ package org.apache.maven.cli.logging; /** * Interface for configuration operations on loggers, which are not available in slf4j, then require per-slf4f-binding * implementation. - * + * * @author Hervé Boutemy * @since 3.1.0 */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java index 3f06f37..3957464 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java @@ -24,7 +24,7 @@ import org.codehaus.plexus.logging.Logger; /** * Adapt an SLF4J logger to a Plexus logger, ignoring Plexus logger API parts that are not classical and * probably not really used. - * + * * @author Jason van Zyl * @since 3.1.0 */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java index d32ea83..64b9bfd 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java @@ -36,7 +36,7 @@ public class Slf4jStdoutLogger // // These are the only methods we need in our primordial logger - // + // public void error( String msg ) { out.print( ERROR ); @@ -50,12 +50,12 @@ public class Slf4jStdoutLogger if ( null != t ) { t.printStackTrace( out ); - } - } + } + } // // Don't need any of this - // + // public String getName() { return null; http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java index 27fae1f..b24ea9c 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java @@ -23,7 +23,7 @@ import org.apache.maven.cli.logging.BaseSlf4jConfiguration; /** * Configuration for slf4j-log4j2. - * + * * @author Hervé Boutemy * @since 3.1.0 */ @@ -39,7 +39,7 @@ public class Log4j2Configuration case DEBUG: value = "debug"; break; - + case INFO: value = "info"; break; http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java index 5d04961..5d9fab7 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; /** * Configuration for slf4j-logback. - * + * * @author Hervé Boutemy * @since 3.1.0 */ @@ -41,7 +41,7 @@ public class LogbackConfiguration case DEBUG: value = ch.qos.logback.classic.Level.DEBUG; break; - + case INFO: value = ch.qos.logback.classic.Level.INFO; break; http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java index 5d12d5a..3961059 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java @@ -25,7 +25,7 @@ import org.slf4j.impl.MavenSlf4jSimpleFriend; /** * Configuration for slf4j-simple. - * + * * @author Hervé Boutemy * @since 3.1.0 */ @@ -41,7 +41,7 @@ public class Slf4jSimpleConfiguration case DEBUG: value = "debug"; break; - + case INFO: value = "info"; break; http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java index a96ddc6..2e91b25 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; /** * Pseudo-configuration for unsupported slf4j binding. - * + * * @author Hervé Boutemy * @since 3.2.4 */ @@ -59,7 +59,7 @@ public class UnsupportedSlf4jBindingConfiguration for ( Map.Entry<URL, Set<Object>> entry : supported.entrySet() ) { StringBuilder sb = new StringBuilder(); - sb.append( "(from " ).append( entry.getKey().toExternalForm() ).append( ")" ); + sb.append( "(from " ).append( entry.getKey().toExternalForm() ).append( ")" ); for ( Object binding : entry.getValue() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java index f8911cc..4672502 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java @@ -29,7 +29,7 @@ import org.eclipse.aether.transfer.TransferResource; /** * Console download progress meter. - * + * * @author <a href="mailto:[email protected]";>Brett Porter</a> */ public class ConsoleMavenTransferListener http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/site/apt/logging.apt ---------------------------------------------------------------------- diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt index b903f8c..cc9257d 100644 --- a/maven-embedder/src/site/apt/logging.apt +++ b/maven-embedder/src/site/apt/logging.apt @@ -32,12 +32,12 @@ Maven Logging Maven uses {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus - Container logging API}}, like any other Plexus components, ie + Container logging API}}, like any other Plexus components, ie {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}} / {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}. Starting with Maven 3.1.0: - + * Maven supports SLF4J API logging API too, ie {{{http://slf4j.org/apidocs/org/slf4j/LoggerFactory.html}LoggerFactory}} / {{{http://slf4j.org/apidocs/org/slf4j/Logger.html}Logger}}, @@ -86,7 +86,7 @@ public class DefaultMyComponent Starting with Maven 3.1.0, SLF4J Logger can be used directly too, without Plexus. Of course, this will only work when run under Maven 3.1.0, then this technique can be used safely only in Maven core components or in plugins/component not requiring compatibility with previous Maven versions. - + +-----+ import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java b/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java index dc4f5ec..3902bac 100644 --- a/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java +++ b/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java @@ -4,7 +4,7 @@ package org.apache.maven; * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java index 9dd685d..7a879ce 100644 --- a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java +++ b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java @@ -7,7 +7,7 @@ import junit.framework.TestSuite; /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml index 181b40a..cfd2970 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>bad-dep-version</artifactId> <version>1</version> - + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml index f7a5b5e..6d06469 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven.errortest</groupId> <artifactId>bad-ext-direct-deps</artifactId> <version>1</version> - + <build> <extensions> <extension> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml index 9139736..2c3da51 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml @@ -5,14 +5,14 @@ <artifactId>bad-ext-plugin-maven-ver-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1</version> - - <!-- + + <!-- <prerequisites> <maven>10</maven> </prerequisites> - + --> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java index 703166d..5836f1e 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml index c70309d..9001cdc 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>bad-ext-plugin-dep-ver</artifactId> <version>1</version> - + <build> <plugins> <plugin> @@ -33,5 +33,5 @@ under the License. </plugin> </plugins> </build> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml index 9139736..2c3da51 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml @@ -5,14 +5,14 @@ <artifactId>bad-ext-plugin-maven-ver-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1</version> - - <!-- + + <!-- <prerequisites> <maven>10</maven> </prerequisites> - + --> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java index 703166d..5836f1e 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml index bcbc4d4..3ab2818 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>bad-ext-plugin-maven-ver</artifactId> <version>1</version> - + <build> <plugins> <plugin> @@ -33,5 +33,5 @@ under the License. </plugin> </plugins> </build> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml index fde0ed7..db547ca 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml @@ -3,7 +3,7 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>bad-maven-version</artifactId> <version>1</version> - + <prerequisites> <maven>10</maven> </prerequisites> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml index 940758b..4bb4c46 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>bad-mg-dep-version</artifactId> <version>1</version> - + <dependencyManagement> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml index 37816e7..dd2cff3 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>bad-non-dep-version</artifactId> <version>1</version> - + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml index 1a30d09..d7a7375 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml @@ -3,5 +3,5 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>bad-profile-repo</artifactId> <version>1</version> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java index 91e481e..6aa5c33 100644 --- a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + /** * @parameter default-value="something" * @required http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml index e6df01b..e2c7412 100644 --- a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>config-rdonly-mojo-param</artifactId> <version>1</version> - + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml b/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml index d9594d5..d766e41 100644 --- a/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>deploy-repo-creation-err</artifactId> <version>1</version> - + <dependencies> <dependency> <groupId>junit</groupId> @@ -30,7 +30,7 @@ under the License. <version>3.8.1</version> </dependency> </dependencies> - + <distributionManagement> <repository> <id>test</id> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml index 5e04826..c210cfb 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>err-loading-plugin</artifactId> <version>1</version> - + <build> <plugins> <plugin> @@ -41,5 +41,5 @@ under the License. </plugin> </plugins> </build> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml index d9b3bca..1339c66 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml @@ -3,7 +3,7 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>err-resolving-ext-plugin</artifactId> <version>1</version> - + <build> <plugins> <plugin> @@ -14,5 +14,5 @@ </plugin> </plugins> </build> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml index 2a142af..d0b755c 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml @@ -3,7 +3,7 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>err-resolving-project-dep</artifactId> <version>1</version> - + <dependencies> <dependency> <groupId>junit</groupId> @@ -17,7 +17,7 @@ <type>pom</type> </dependency> </dependencies> - + <repositories> <repository> <id>repo</id> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java index 39ae671..7e0144a 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java @@ -7,7 +7,7 @@ import junit.framework.TestSuite; /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml index 968ea71..8da1560 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven.errortest</groupId> <artifactId>ext-deps-resolve-err</artifactId> <version>1</version> - + <build> <extensions> <extension> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml index d9b0199..6565fd4 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>ext-plugin-artifact-missing</artifactId> <version>1</version> - + <build> <plugins> <plugin> @@ -33,5 +33,5 @@ under the License. </plugin> </plugins> </build> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml index 4bc809e..ddc1eee 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml @@ -10,7 +10,7 @@ </requirement> </requirements> </component> - + <component> <role>org.test.ComponentTwo</role> <role-hint>default</role-hint> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml index f7e341e..513e00c 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven.errortest</groupId> <artifactId>ext-plugin-realm-error</artifactId> <version>1</version> - + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml index 9139736..2c3da51 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml @@ -5,14 +5,14 @@ <artifactId>bad-ext-plugin-maven-ver-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1</version> - - <!-- + + <!-- <prerequisites> <maven>10</maven> </prerequisites> - + --> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java index 703166d..5836f1e 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml index bade9b7..ad6effc 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>ext-plugin-version-err</artifactId> <version>1</version> - + <build> <plugins> <plugin> @@ -32,5 +32,5 @@ under the License. </plugin> </plugins> </build> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml index 40b95f0..a567706 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml @@ -4,7 +4,7 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>test-maven-ext</artifactId> <version>1</version> - + <build> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java index 85ab5c4..0701b7a 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java +++ b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java @@ -4,7 +4,7 @@ package org.ext; * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml index 78ebb93..85e9a9f 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven.errortest</groupId> <artifactId>ext-realm-error</artifactId> <version>1</version> - + <build> <extensions> <extension> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml index 0fe1170..bb50b45 100644 --- a/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml @@ -3,7 +3,7 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>interp-from-project</artifactId> <version>1</version> - + <dependencies> <dependency> <groupId>org.test</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml index a8aa884..2a924b8 100644 --- a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml @@ -3,5 +3,5 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>load-extern-profiles-ioex</artifactId> <version>1</version> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml index 574a9e4..fdaa3d4 100644 --- a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml @@ -3,5 +3,5 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>load-extern-profiles-xex</artifactId> <version>1</version> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java index 0b3975d..2c825a0 100644 --- a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java +++ b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java @@ -4,7 +4,7 @@ package org.test; * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java index b84ebc6..e4e81e2 100644 --- a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java @@ -7,7 +7,7 @@ import junit.framework.TestSuite; /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml b/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml index 951f841..e0ab9f6 100644 --- a/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml @@ -5,7 +5,7 @@ <artifactId>missing-parent-pom-parent</artifactId> <version>1</version> </parent> - + <artifactId>missing-parent-pom</artifactId> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java index 2ce5b5d..51b71a8 100644 --- a/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + /** * @parameter * @required http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml index 0b52969..de32947 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml @@ -4,7 +4,7 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>mojo-config-error-maven-plugin</artifactId> <version>1</version> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java index 703166d..5836f1e 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml index 1bfb2af..9d63df5 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>mojo-config-error</artifactId> <version>1</version> - + <build> <plugins> <plugin> @@ -41,5 +41,5 @@ under the License. </plugin> </plugins> </build> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java index 703166d..5836f1e 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml index ab53542..1f10d0f 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml @@ -22,5 +22,5 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>mojo-exec-err</artifactId> <version>1</version> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java index a1507b0..bc2e712 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java @@ -17,7 +17,7 @@ public class TestPlugin { private Log log; - + /** * @component role-hint="nonexistant" */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml b/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml index e434d57..b70261d 100644 --- a/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml @@ -6,5 +6,5 @@ <version>1</version> </parent> <artifactId>parent-parse-ioex-child</artifactId> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml index ca60420..3961dd4 100644 --- a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml @@ -6,5 +6,5 @@ <version>1</version> </parent> <artifactId>parent-parse-xex-child</artifactId> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml index 072d885..7ac14c6 100644 --- a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml @@ -3,5 +3,5 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>parent-parse-xex</artifactId> <version>1</ver> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml b/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml index e8fc832..031ce1e 100644 --- a/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>profile-activator-err</artifactId> <version>1</version> - + <profiles> <profile> <id>faulty</id> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml index e802e70..0f93b9e 100644 --- a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml @@ -4,7 +4,7 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>profile-activator-lookup-err-ext</artifactId> <version>1</version> - + <build> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java index 85ab5c4..0701b7a 100644 --- a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java +++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java @@ -4,7 +4,7 @@ package org.ext; * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml index fabf381..a34b838 100644 --- a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven.errortest</groupId> <artifactId>profile-activator-lookup-err</artifactId> <version>1</version> - + <profiles> <profile> <id>test-profile</id> @@ -33,7 +33,7 @@ under the License. </activation> </profile> </profiles> - + <build> <extensions> <extension> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml index 5f1ed10..ebb7ee7 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?><project> <modelVersion>4.0.0</modelVersion> - + <groupId>org.apache.maven.errortest</groupId> <artifactId>module</artifactId> <version>1</version> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml index 5f1ed10..ebb7ee7 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?><project> <modelVersion>4.0.0</modelVersion> - + <groupId>org.apache.maven.errortest</groupId> <artifactId>module</artifactId> <version>1</version> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml index 0ecb5b9..9e11c6d 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml @@ -4,7 +4,7 @@ <artifactId>project-collision</artifactId> <version>1</version> <packaging>pom</packaging> - + <modules> <module>mod1</module> <module>mod2</module> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml index cc96cb4..eb1f08f 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?><project> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.apache.maven.errortest</groupId> <artifactId>project-cycle</artifactId> <version>1</version> </parent> - + <groupId>org.apache.maven.errortest</groupId> <artifactId>project-cycle-dep</artifactId> </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml index aba34bf..75c53e7 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml @@ -4,11 +4,11 @@ <artifactId>project-cycle</artifactId> <version>1</version> <packaging>pom</packaging> - + <modules> <module>dep</module> </modules> - + <dependencies> <dependency> <groupId>org.apache.maven.errortest</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml index 26a1029..3c297ac 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml @@ -3,14 +3,14 @@ <groupId>org.apache.maven.errortest</groupId> <artifactId>project-dep-missing</artifactId> <version>1</version> - + <repositories> <repository> <id>central</id> <url>file://${java.io.tmpdir}</url> </repository> </repositories> - + <dependencies> <dependency> <groupId>not</groupId> @@ -18,5 +18,5 @@ <version>3.8.1</version> </dependency> </dependencies> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java index 39ae671..7e0144a 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java @@ -7,7 +7,7 @@ import junit.framework.TestSuite; /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java index 39ae671..7e0144a 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java @@ -7,7 +7,7 @@ import junit.framework.TestSuite; /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml b/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml index a49b9dc..d0574bd 100644 --- a/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven</groupId> <artifactId>repo-creation-err</artifactId> <version>1</version> - + <dependencies> <dependency> <groupId>junit</groupId> @@ -30,7 +30,7 @@ under the License. <version>3.8.1</version> </dependency> </dependencies> - + <repositories> <repository> <id>test</id> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml b/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml index 4bbef51..169b392 100644 --- a/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml +++ b/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml @@ -3,7 +3,7 @@ <groupId>testing</groupId> <artifactId>read-with-deps</artifactId> <version>1</version> - + <dependencies> <dependency> <groupId>tests</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/extensions/META-INF/plexus/components.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/extensions/META-INF/plexus/components.xml b/maven-embedder/src/test/extensions/META-INF/plexus/components.xml index c71f2a2..f38af59 100644 --- a/maven-embedder/src/test/extensions/META-INF/plexus/components.xml +++ b/maven-embedder/src/test/extensions/META-INF/plexus/components.xml @@ -21,7 +21,7 @@ under the License. <components> <component> <role>org.apache.maven.artifact.factory.ArtifactFactory</role> - <role-hint>default</role-hint> + <role-hint>default</role-hint> <implementation>org.apache.maven.embedder.CustomArtifactFactory</implementation> </component> </components> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java index 9df1768..163d9d9 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java @@ -34,7 +34,7 @@ import org.codehaus.plexus.util.FileUtils; /** * Pseudo test to generate documentation fragment about supported CLI options. * TODO such documentation generation code should not be necessary as unit test but should be run - * during site generation (Velocity? Doxia macro?) + * during site generation (Velocity? Doxia macro?) */ public class CLIManagerTest extends PlexusTestCase http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/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 ba26467..6e06cc5 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 @@ -25,20 +25,20 @@ public class MavenCliTest extends TestCase { private MavenCli cli; - + protected void setUp() { - cli = new MavenCli(); + cli = new MavenCli(); } - + public void testCalculateDegreeOfConcurrencyWithCoreMultiplier() { - int cores = Runtime.getRuntime().availableProcessors(); + int cores = Runtime.getRuntime().availableProcessors(); // -T2.2C assertEquals( (int) ( cores * 2.2 ), cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "C2.2" ) ); // -TC2.2 assertEquals( (int) ( cores * 2.2 ), cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "2.2C" ) ); - + try { cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "CXXX" ); @@ -47,6 +47,6 @@ public class MavenCliTest catch ( NumberFormatException e ) { // carry on - } - } + } + } }
