You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/27 20:25:11 UTC
svn commit: r1517906 [16/24] - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/
maven-antr...
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <artifactId>multymodule-4</artifactId>
+ <artifactId>multymodule-4</artifactId>
<version>1.0</version>
<name>multymodule-4</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipse</groupId>
<artifactId>maven-eclipse-plugin-test-project-52</artifactId>
<version>52</version>
</parent>
- <artifactId>module-1</artifactId>
+ <artifactId>module-1</artifactId>
<version>52</version>
<packaging>jar</packaging>
<build>
@@ -22,7 +22,7 @@
</sourceExcludes>
<sourceIncludes>
<sourceInclude>**/*.tst</sourceInclude>
- </sourceIncludes>
+ </sourceIncludes>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipse</groupId>
<artifactId>maven-eclipse-plugin-test-project-52</artifactId>
<version>52</version>
</parent>
- <artifactId>module-2</artifactId>
+ <artifactId>module-2</artifactId>
<version>52</version>
<packaging>jar</packaging>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipse</groupId>
<artifactId>maven-eclipse-plugin-test-project-52</artifactId>
<version>52</version>
</parent>
- <artifactId>module-3</artifactId>
+ <artifactId>module-3</artifactId>
<version>52</version>
<packaging>jar</packaging>
<build>
@@ -18,11 +18,11 @@
<version>test</version>
<configuration>
<sourceExcludes>
- <sourceExclude>**/.svn/**</sourceExclude>
+ <sourceExclude>**/.svn/**</sourceExclude>
<sourceExclude>**/CVS/**</sourceExclude>
</sourceExcludes>
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipse.project65</groupId>
<artifactId>parent</artifactId>
<version>1.0</version>
</parent>
- <artifactId>module-1</artifactId>
+ <artifactId>module-1</artifactId>
<version>1</version>
<packaging>war</packaging>
<name>War Project</name>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>project-myeclipse-07-MECLIPSE-445</artifactId>
- <version>1.0</version>
- </parent>
- <artifactId>multymodule-1</artifactId>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>project-myeclipse-07-MECLIPSE-445</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>multymodule-1</artifactId>
<version>99.0</version>
<packaging>jar</packaging>
<name>multymodule-1</name>
-
+
<build>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>project-myeclipse-07-MECLIPSE-445</artifactId>
- <version>1.0</version>
- </parent>
- <artifactId>multymodule-2</artifactId>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>project-myeclipse-07-MECLIPSE-445</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>multymodule-2</artifactId>
<version>99.0</version>
<packaging>jar</packaging>
<name>multymodule-2</name>
-
+
<build>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>project-rad-5_1</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>ear</packaging>
- <build>
- </build>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5_2</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5_3</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>ejb</type>
- </dependency>
- </dependencies>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>project-rad-5_1</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>ear</packaging>
+ <build>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5_2</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5_3</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <packaging>war</packaging>
- <artifactId>project-rad-5_2</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>98.0</version>
- </dependency>
- <dependency>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5_4</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <packaging>war</packaging>
+ <artifactId>project-rad-5_2</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>98.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5_4</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <packaging>ejb</packaging>
- <artifactId>project-rad-5_3</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>98.0</version>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>ejbModule</directory>
- </resource>
- </resources>
- </build>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <packaging>ejb</packaging>
+ <artifactId>project-rad-5_3</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>98.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>ejbModule</directory>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <packaging>jar</packaging>
- <artifactId>project-rad-5_4</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
+ <artifactId>project-rad-5_4</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</project>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Tue Aug 27 18:25:03 2013
@@ -280,7 +280,7 @@ public class EjbMojo
if ( excludes != null && !excludes.isEmpty() )
{
excludes.add( EJB_JAR_XML );
- mainJarExcludes = (String[]) excludes.toArray( new String[excludes.size()] );
+ mainJarExcludes = (String[]) excludes.toArray(new String[excludes.size()]);
}
archiver.getArchiver().addDirectory( outputDirectory, DEFAULT_INCLUDES, mainJarExcludes );
@@ -293,9 +293,10 @@ public class EjbMojo
getLog().debug( "Filtering deployment descriptor." );
MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution();
mavenResourcesExecution.setEscapeString( escapeString );
- List filterWrappers =
- mavenFileFilter.getDefaultFilterWrappers( project, filters, escapeBackslashesInFilePath,
- this.session, mavenResourcesExecution );
+ List filterWrappers = mavenFileFilter.getDefaultFilterWrappers( project, filters,
+ escapeBackslashesInFilePath,
+ this.session,
+ mavenResourcesExecution );
// Create a temporary file that we can copy-and-filter
File unfilteredDeploymentDescriptor = new File( outputDirectory, EJB_JAR_XML + ".unfiltered" );
@@ -329,8 +330,7 @@ public class EjbMojo
}
catch ( MavenFilteringException e )
{
- throw new MojoExecutionException(
- "There was a problem filtering the deployment descriptor: " + e.getMessage(), e );
+ throw new MojoExecutionException( "There was a problem filtering the deployment descriptor: " + e.getMessage(), e );
}
// Handle the classifier if necessary
@@ -358,12 +358,12 @@ public class EjbMojo
if ( clientIncludes != null && !clientIncludes.isEmpty() )
{
- includes = (String[]) clientIncludes.toArray( new String[clientIncludes.size()] );
+ includes = (String[]) clientIncludes.toArray(new String[clientIncludes.size()]);
}
if ( clientExcludes != null && !clientExcludes.isEmpty() )
{
- excludes = (String[]) clientExcludes.toArray( new String[clientExcludes.size()] );
+ excludes = (String[]) clientExcludes.toArray(new String[clientExcludes.size()]);
}
File clientJarFile = new File( basedir, clientJarName + "-client.jar" );
Modified: maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java Tue Aug 27 18:25:03 2013
@@ -183,10 +183,10 @@ public class EjbMojoTest
mojo.execute();
assertJarCreation( project, true, false );
- assertJarContent( project, new String[]{ "META-INF/MANIFEST.MF", "META-INF/ejb-jar.xml",
+ assertJarContent( project, new String[]{"META-INF/MANIFEST.MF", "META-INF/ejb-jar.xml",
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb/AppBean.class",
- "org/sample/ejb/AppCMP.class", "org/sample/ejb/AppSession.class" }, null );
+ "org/sample/ejb/AppCMP.class", "org/sample/ejb/AppSession.class"}, null );
}
/**
@@ -220,11 +220,11 @@ public class EjbMojoTest
mojo.execute();
assertJarCreation( project, true, true );
- assertClientJarContent( project, new String[]{ "META-INF/MANIFEST.MF",
+ assertClientJarContent( project, new String[]{"META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
- "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb/AppStub.class" },
- new String[]{ "META-INF/ejb-jar.xml", "org/sample/ejb/AppBean.class",
- "org/sample/ejb/AppCMP.class", "org/sample/ejb/AppSession.class" } );
+ "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb/AppStub.class"},
+ new String[]{"META-INF/ejb-jar.xml", "org/sample/ejb/AppBean.class",
+ "org/sample/ejb/AppCMP.class", "org/sample/ejb/AppSession.class"} );
}
/**
@@ -258,11 +258,10 @@ public class EjbMojoTest
mojo.execute();
assertJarCreation( project, true, true );
- assertClientJarContent( project, new String[]{ "META-INF/MANIFEST.MF",
+ assertClientJarContent( project, new String[]{"META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
- "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties",
- "org/sample/ejb/AppInclude.class" },
- new String[]{ "META-INF/ejb-jar.xml", "org/sample/ejb/AppExclude.class" } );
+ "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb/AppInclude.class"},
+ new String[]{"META-INF/ejb-jar.xml", "org/sample/ejb/AppExclude.class"} );
}
/**
@@ -297,11 +296,10 @@ public class EjbMojoTest
mojo.execute();
assertJarCreation( project, true, true );
- assertClientJarContent( project, new String[]{ "META-INF/MANIFEST.MF",
+ assertClientJarContent( project, new String[]{"META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
- "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties",
- "org/sample/ejb/AppInclude.class" },
- new String[]{ "META-INF/ejb-jar.xml", "org/sample/ejb/AppExclude.class" } );
+ "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb/AppInclude.class"},
+ new String[]{"META-INF/ejb-jar.xml", "org/sample/ejb/AppExclude.class"} );
}
@@ -337,11 +335,10 @@ public class EjbMojoTest
mojo.execute();
assertJarCreation( project, true, true );
- assertJarContent( project, new String[]{ "META-INF/MANIFEST.MF",
+ assertJarContent( project, new String[]{"META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
- "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties",
- "org/sample/ejb/AppInclude.class" },
- new String[]{ "META-INF/ejb-jar.xml", "org/sample/ejb/AppExclude.class" } );
+ "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb/AppInclude.class"},
+ new String[]{"META-INF/ejb-jar.xml", "org/sample/ejb/AppExclude.class"} );
}
@@ -377,11 +374,11 @@ public class EjbMojoTest
mojo.execute();
assertJarCreation( project, true, true );
- assertClientJarContent( project, new String[]{ "META-INF/MANIFEST.MF",
+ assertClientJarContent( project, new String[]{"META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
- "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb/App.class" },
- new String[]{ "META-INF/ejb-jar.xml", "org/sample/ejb/impl/AppImpl.class",
- "org/sample/ejb/impl" } );
+ "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb/App.class"},
+ new String[]{"META-INF/ejb-jar.xml", "org/sample/ejb/impl/AppImpl.class",
+ "org/sample/ejb/impl"} );
}
@@ -419,11 +416,11 @@ public class EjbMojoTest
assertJarCreation( project, true, true );
// We check that the created jar does not contain the org/sample/ejb package empty
- assertClientJarContent( project, new String[]{ "META-INF/MANIFEST.MF",
+ assertClientJarContent( project, new String[]{"META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
- "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb2/AppTwo.class" },
- new String[]{ "META-INF/ejb-jar.xml", "org/sample/ejb/AppOne.class",
- "org/sample/ejb" } );
+ "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties", "org/sample/ejb2/AppTwo.class"},
+ new String[]{"META-INF/ejb-jar.xml", "org/sample/ejb/AppOne.class",
+ "org/sample/ejb"} );
}
@@ -586,8 +583,7 @@ public class EjbMojoTest
else
{
checkedJarFile = project.getBuild().getDirectory() + "/" + DEFAULT_JAR_NAME + "-" + classifier + ".jar";
- checkedClientJarFile =
- project.getBuild().getDirectory() + "/" + DEFAULT_JAR_NAME + "-" + classifier + "-client.jar";
+ checkedClientJarFile = project.getBuild().getDirectory() + "/" + DEFAULT_JAR_NAME + "-" + classifier + "-client.jar";
}
assertEquals( "Invalid value for ejb-jar creation", ejbJarCreated, FileUtils.fileExists( checkedJarFile ) );
@@ -612,18 +608,16 @@ public class EjbMojoTest
final JarContentChecker inclusionChecker = new JarContentChecker();
// set expected jar contents
- for ( String expectedFile : expectedFiles )
- {
- inclusionChecker.addFile( new File( expectedFile ) );
+ for (String expectedFile : expectedFiles) {
+ inclusionChecker.addFile(new File(expectedFile));
}
assertTrue( inclusionChecker.isOK( new JarFile( checkedJarFile ) ) );
}
if ( unexpectedFiles != null )
{
final JarContentChecker exclusionChecker = new JarContentChecker();
- for ( String unexpectedFile : unexpectedFiles )
- {
- exclusionChecker.addFile( new File( unexpectedFile ) );
+ for (String unexpectedFile : unexpectedFiles) {
+ exclusionChecker.addFile(new File(unexpectedFile));
}
assertFalse( exclusionChecker.isOK( new JarFile( checkedJarFile ) ) );
}
Modified: maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java Tue Aug 27 18:25:03 2013
@@ -88,7 +88,7 @@ public class MavenProjectBuildStub
targetClassesList = new ArrayList();
dataMap = new HashMap();
setupBuild();
-
+
model.setBuild( build );
}
@@ -225,20 +225,17 @@ public class MavenProjectBuildStub
{
File currentDirectory;
- for ( Object aDirectoryList : directoryList )
- {
- currentDirectory = new File( parent, "/" + aDirectoryList );
+ for (Object aDirectoryList : directoryList) {
+ currentDirectory = new File(parent, "/" + aDirectoryList);
- if ( !currentDirectory.exists() )
- {
+ if (!currentDirectory.exists()) {
currentDirectory.mkdirs();
}
// duplicate dir structure in test resources
- currentDirectory = new File( testparent, "/" + aDirectoryList );
+ currentDirectory = new File(testparent, "/" + aDirectoryList);
- if ( !currentDirectory.exists() )
- {
+ if (!currentDirectory.exists()) {
currentDirectory.mkdirs();
}
}
@@ -250,16 +247,16 @@ public class MavenProjectBuildStub
switch ( type )
{
- case SOURCE_FILE:
+ case SOURCE_FILE :
retVal = sourceFileList;
break;
- case OUTPUT_FILE:
+ case OUTPUT_FILE :
retVal = targetClassesList;
break;
- case RESOURCES_FILE:
+ case RESOURCES_FILE :
retVal = resourcesFileList;
break;
- case ROOT_FILE:
+ case ROOT_FILE :
retVal = rootFileList;
break;
}
@@ -278,26 +275,20 @@ public class MavenProjectBuildStub
return;
}
- for ( Object aList : list )
- {
- currentFile = new File( parent, (String) aList );
+ for (Object aList : list) {
+ currentFile = new File(parent, (String) aList);
// create the necessary parent directories
// before we create the files
- if ( !currentFile.getParentFile().exists() )
- {
+ if (!currentFile.getParentFile().exists()) {
currentFile.getParentFile().mkdirs();
}
- if ( !currentFile.exists() )
- {
- try
- {
+ if (!currentFile.exists()) {
+ try {
currentFile.createNewFile();
- populateFile( currentFile, RESOURCES_FILE );
- }
- catch ( IOException io )
- {
+ populateFile(currentFile, RESOURCES_FILE);
+ } catch (IOException io) {
//TODO: handle exception
}
}
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java Tue Aug 27 18:25:03 2013
@@ -281,7 +281,7 @@ public class AttachedSignedArtifact
for ( Iterator i = result.iterator(); i.hasNext() && !alreadySigned; )
{
ArtifactMetadata metadata = (ArtifactMetadata) i.next();
- alreadySigned = signature.getKey().equals( metadata.getKey() );
+ alreadySigned = signature.getKey().equals(metadata.getKey());
}
if ( !alreadySigned )
{
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java Tue Aug 27 18:25:03 2013
@@ -38,7 +38,7 @@ import org.codehaus.plexus.util.Selector
/**
* Sign project artifact, the POM, and attached artifacts with GnuPG for deployment.
- *
+ *
* @author Jason van Zyl
* @author Jason Dillon
* @author Daniel Kulp
@@ -141,14 +141,14 @@ public class GpgSignAttachedMojo
if ( projectArtifactSignature != null )
{
- signingBundles.add(
- new SigningBundle( artifact.getArtifactHandler().getExtension(), projectArtifactSignature ) );
+ signingBundles.add( new SigningBundle( artifact.getArtifactHandler().getExtension(),
+ projectArtifactSignature ) );
}
}
else if ( project.getAttachedArtifacts().isEmpty() )
{
throw new MojoFailureException( "The project artifact has not been assembled yet. "
- + "Please do not invoke this goal before the lifecycle phase \"package\"." );
+ + "Please do not invoke this goal before the lifecycle phase \"package\"." );
}
else
{
@@ -184,21 +184,18 @@ public class GpgSignAttachedMojo
// Attached artifacts
// ----------------------------------------------------------------------------
- for ( Object o : project.getAttachedArtifacts() )
- {
+ for (Object o : project.getAttachedArtifacts()) {
Artifact artifact = (Artifact) o;
File file = artifact.getFile();
- getLog().debug( "Generating signature for " + file );
+ getLog().debug("Generating signature for " + file);
- File signature = signer.generateSignatureForArtifact( file );
+ File signature = signer.generateSignatureForArtifact(file);
- if ( signature != null )
- {
- signingBundles.add(
- new SigningBundle( artifact.getArtifactHandler().getExtension(), artifact.getClassifier(),
- signature ) );
+ if (signature != null) {
+ signingBundles.add(new SigningBundle(artifact.getArtifactHandler().getExtension(),
+ artifact.getClassifier(), signature));
}
}
@@ -206,28 +203,25 @@ public class GpgSignAttachedMojo
// Attach all the signatures
// ----------------------------------------------------------------------------
- for ( Object signingBundle : signingBundles )
- {
+ for (Object signingBundle : signingBundles) {
SigningBundle bundle = (SigningBundle) signingBundle;
- projectHelper.attachArtifact( project, bundle.getExtension() + GpgSigner.SIGNATURE_EXTENSION,
- bundle.getClassifier(), bundle.getSignature() );
+ projectHelper.attachArtifact(project, bundle.getExtension() + GpgSigner.SIGNATURE_EXTENSION,
+ bundle.getClassifier(), bundle.getSignature());
}
}
/**
* Tests whether or not a name matches against at least one exclude pattern.
- *
+ *
* @param name The name to match. Must not be <code>null</code>.
* @return <code>true</code> when the name matches against at least one exclude pattern, or <code>false</code>
* otherwise.
*/
protected boolean isExcluded( String name )
{
- for ( String exclude : excludes )
- {
- if ( SelectorUtils.matchPath( exclude, name ) )
- {
+ for (String exclude : excludes) {
+ if (SelectorUtils.matchPath(exclude, name)) {
return true;
}
}
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java Tue Aug 27 18:25:03 2013
@@ -58,7 +58,7 @@ import java.util.Map;
/**
* Signs artifacts and installs the artifact in the remote repository.
- *
+ *
* @author Daniel Kulp
* @since 1.0-beta-4
*/
@@ -389,14 +389,12 @@ public class SignAndDeployFileMojo
if ( typesLength != filesLength )
{
throw new MojoExecutionException( "You must specify the same number of entries in 'files' and " +
- "'types' (respectively " + filesLength + " and " + typesLength
- + " entries )" );
+ "'types' (respectively " + filesLength + " and " + typesLength + " entries )" );
}
if ( classifiersLength != filesLength )
{
throw new MojoExecutionException( "You must specify the same number of entries in 'files' and " +
- "'classifiers' (respectively " + filesLength + " and "
- + classifiersLength + " entries )" );
+ "'classifiers' (respectively " + filesLength + " and " + classifiersLength + " entries )" );
}
int fi = 0;
int ti = 0;
@@ -425,16 +423,16 @@ public class SignAndDeployFileMojo
file = new File( project.getBasedir(), files.substring( fi, nfi ) );
}
if ( file.isFile() )
- {
+ {
if ( StringUtils.isWhitespace( classifiers.substring( ci, nci ) ) )
{
projectHelper.attachArtifact( project, types.substring( ti, nti ).trim(), file );
}
else
{
- projectHelper.attachArtifact( project, types.substring( ti, nti ).trim(),
- classifiers.substring( ci, nci ).trim(), file );
- }
+ projectHelper.attachArtifact( project, types.substring( ti, nti).trim(),
+ classifiers.substring( ci, nci ).trim(), file);
+ }
}
else
{
@@ -444,35 +442,31 @@ public class SignAndDeployFileMojo
ti = nti + 1;
ci = nci + 1;
}
- }
- else
- {
+ }
+ else
+ {
if ( types != null )
{
throw new MojoExecutionException( "You must specify 'files' if you specify 'types'" );
- }
+ }
if ( classifiers != null )
- {
+ {
throw new MojoExecutionException( "You must specify 'files' if you specify 'classifiers'" );
- }
- }
+ }
+ }
List attachedArtifacts = project.getAttachedArtifacts();
- for ( Object attachedArtifact : attachedArtifacts )
- {
+ for (Object attachedArtifact : attachedArtifacts) {
Artifact attached = (Artifact) attachedArtifact;
- fileSig = signer.generateSignatureForArtifact( attached.getFile() );
- attached = new AttachedSignedArtifact( attached, new AscArtifactMetadata( attached, fileSig, false ) );
- try
- {
- deploy( attached.getFile(), attached, deploymentRepository, localRepository );
- }
- catch ( ArtifactDeploymentException e )
- {
+ fileSig = signer.generateSignatureForArtifact(attached.getFile());
+ attached = new AttachedSignedArtifact(attached, new AscArtifactMetadata(attached, fileSig, false));
+ try {
+ deploy(attached.getFile(), attached, deploymentRepository, localRepository);
+ } catch (ArtifactDeploymentException e) {
throw new MojoExecutionException(
- "Error deploying attached artifact " + attached.getFile() + ": " + e.getMessage(), e );
+ "Error deploying attached artifact " + attached.getFile() + ": " + e.getMessage(), e);
}
}
@@ -481,7 +475,7 @@ public class SignAndDeployFileMojo
/**
* Gets the path of the specified artifact within the local repository. Note that the returned path need not exist
* (yet).
- *
+ *
* @param artifact The artifact whose local repo path should be determined, must not be <code>null</code>.
* @return The absolute path to the artifact when installed, never <code>null</code>.
*/
@@ -528,7 +522,7 @@ public class SignAndDeployFileMojo
/**
* Extract the model from the specified POM file.
- *
+ *
* @param pomFile The path of the POM file to parse, must not be <code>null</code>.
* @return The model from the POM file, never <code>null</code>.
* @throws MojoExecutionException If the file doesn't exist of cannot be read.
@@ -562,7 +556,7 @@ public class SignAndDeployFileMojo
/**
* Generates a minimal POM from the user-supplied artifact information.
- *
+ *
* @return The path to the generated POM file, never <code>null</code>.
* @throws MojoExecutionException If the generation failed.
*/
@@ -594,7 +588,7 @@ public class SignAndDeployFileMojo
/**
* Validates the user-supplied artifact information.
- *
+ *
* @throws MojoFailureException If any artifact coordinate is invalid.
*/
private void validateArtifactInformation()
@@ -606,8 +600,8 @@ public class SignAndDeployFileMojo
if ( result.getMessageCount() > 0 )
{
- throw new MojoFailureException(
- "The artifact information is incomplete or not valid:\n" + result.render( " " ) );
+ throw new MojoFailureException( "The artifact information is incomplete or not valid:\n"
+ + result.render( " " ) );
}
}
@@ -635,10 +629,10 @@ public class SignAndDeployFileMojo
/**
* Deploy an artifact from a particular file.
*
- * @param source the file to deploy
- * @param artifact the artifact definition
+ * @param source the file to deploy
+ * @param artifact the artifact definition
* @param deploymentRepository the repository to deploy to
- * @param localRepository the local repository to install into
+ * @param localRepository the local repository to install into
* @throws ArtifactDeploymentException if an error occurred deploying the artifact
*/
protected void deploy( File source, Artifact artifact, ArtifactRepository deploymentRepository,
@@ -651,25 +645,23 @@ public class SignAndDeployFileMojo
{
try
{
- if ( count > 0 )
+ if (count > 0)
{
getLog().info(
"Retrying deployment attempt " + ( count + 1 ) + " of " + retryFailedDeploymentCount );
}
deployer.deploy( source, artifact, deploymentRepository, localRepository );
- for ( Object o : artifact.getMetadataList() )
- {
+ for (Object o : artifact.getMetadataList()) {
ArtifactMetadata metadata = (ArtifactMetadata) o;
- getLog().info( "Metadata[" + metadata.getKey() + "].filename = " + metadata.getRemoteFilename() );
+ getLog().info("Metadata[" + metadata.getKey() + "].filename = " + metadata.getRemoteFilename());
}
exception = null;
break;
}
catch ( ArtifactDeploymentException e )
{
- if ( count + 1 < retryFailedDeploymentCount )
- {
- getLog().warn( "Encountered issue during deployment: " + e.getLocalizedMessage() );
+ if (count + 1 < retryFailedDeploymentCount) {
+ getLog().warn( "Encountered issue during deployment: " + e.getLocalizedMessage());
getLog().debug( e );
}
if ( exception == null )
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java Tue Aug 27 18:25:03 2013
@@ -58,9 +58,7 @@ public class ActiveProfilesMojo
// Public methods
// ----------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void execute()
throws MojoExecutionException
{
@@ -76,8 +74,8 @@ public class ActiveProfilesMojo
if ( output != null )
{
StringBuilder sb = new StringBuilder();
- sb.append( "Created by: " ).append( getClass().getName() ).append( "\n" );
- sb.append( "Created on: " ).append( new Date() ).append( "\n" ).append( "\n" );
+ sb.append("Created by: ").append(getClass().getName()).append("\n");
+ sb.append("Created on: ").append(new Date()).append("\n").append( "\n" );
sb.append( message.toString() );
try
@@ -110,22 +108,22 @@ public class ActiveProfilesMojo
/**
* Method to get the active profiles for the project
*
- * @param project the current project
- * @param message the object where the information will be appended to
+ * @param project the current project
+ * @param message the object where the information will be appended to
*/
private void getActiveProfileStatement( MavenProject project, StringBuilder message )
{
Map<String, List<String>> activeProfileIds = new LinkedHashMap<String, List<String>>();
- try
+ try
{
activeProfileIds.putAll( getInjectedProfileIds( project ) );
}
catch ( UnsupportedOperationException uoe )
{
// Fall back to M2 approach
- @SuppressWarnings( "unchecked" ) List<Profile> profiles =
- new ArrayList<Profile>( project.getActiveProfiles() );
-
+ @SuppressWarnings( "unchecked" )
+ List<Profile> profiles = new ArrayList<Profile>( project.getActiveProfiles() );
+
for ( Profile profile : profiles )
{
List<String> profileIds = activeProfileIds.get( profile.getSource() );
@@ -137,10 +135,11 @@ public class ActiveProfilesMojo
profileIds.add( profile.getId() );
}
}
+
message.append( "\n" );
- message.append( "Active Profiles for Project \'" ).append( project.getId() ).append( "\': \n\n" );
+ message.append("Active Profiles for Project \'").append(project.getId()).append("\': \n\n");
if ( activeProfileIds.isEmpty() )
{
@@ -164,8 +163,7 @@ public class ActiveProfilesMojo
}
@SuppressWarnings( "unchecked" )
- private Map<String, List<String>> getInjectedProfileIds( MavenProject project )
- throws UnsupportedOperationException
+ private Map<String, List<String>> getInjectedProfileIds( MavenProject project ) throws UnsupportedOperationException
{
try
{
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java Tue Aug 27 18:25:03 2013
@@ -94,7 +94,7 @@ public class DescribeMojo
* For deprecated values
*/
private static final String NO_REASON = "No reason given";
-
+
private static final Pattern EXPRESSION = Pattern.compile( "^\\$\\{([^}]+)\\}$" );
// ----------------------------------------------------------------------
@@ -147,8 +147,7 @@ public class DescribeMojo
* The local repository ArtifactRepository instance. This is used
* for plugin manager API calls.
*/
- @org.apache.maven.plugins.annotations.Parameter( defaultValue = "${localRepository}", required = true,
- readonly = true )
+ @org.apache.maven.plugins.annotations.Parameter( defaultValue = "${localRepository}", required = true, readonly = true )
private ArtifactRepository localRepository;
/**
@@ -157,7 +156,7 @@ public class DescribeMojo
* @since 2.1
*/
@org.apache.maven.plugins.annotations.Parameter( defaultValue = "${project.remoteArtifactRepositories}",
- required = true, readonly = true )
+ required = true, readonly = true )
private List<ArtifactRepository> remoteRepositories;
/**
@@ -399,13 +398,8 @@ public class DescribeMojo
else
{
- throw new MojoFailureException(
- ( "You must specify either: both 'groupId' and 'artifactId' parameters OR a 'plugin' parameter"
- + " OR a 'cmd' parameter. For instance:\n" ) + " # mvn help:describe -Dcmd=install\n" + "or\n"
- + " # mvn help:describe -Dcmd=help:describe\n" + "or\n"
- + " # mvn help:describe -Dplugin=org.apache.maven.plugins:maven-help-plugin\n" + "or\n"
- + " # mvn help:describe -DgroupId=org.apache.maven.plugins -DartifactId=maven-help-plugin\n\n"
- + "Try 'mvn help:help -Ddetail=true' for more information." );
+ throw new MojoFailureException(("You must specify either: both 'groupId' and 'artifactId' parameters OR a 'plugin' parameter"
+ + " OR a 'cmd' parameter. For instance:\n") + " # mvn help:describe -Dcmd=install\n" + "or\n" + " # mvn help:describe -Dcmd=help:describe\n" + "or\n" + " # mvn help:describe -Dplugin=org.apache.maven.plugins:maven-help-plugin\n" + "or\n" + " # mvn help:describe -DgroupId=org.apache.maven.plugins -DartifactId=maven-help-plugin\n\n" + "Try 'mvn help:help -Ddetail=true' for more information.");
}
if ( descriptor == null && forLookup != null )
@@ -469,7 +463,7 @@ public class DescribeMojo
if ( descriptor == null )
{
throw new MojoFailureException( "Plugin could not be found. If you believe it is correct,"
- + " check your pluginGroups setting, and run with -U to update the remote configuration" );
+ + " check your pluginGroups setting, and run with -U to update the remote configuration" );
}
return descriptor;
@@ -566,7 +560,8 @@ public class DescribeMojo
append( buffer, "Goal Prefix", pd.getGoalPrefix(), 0 );
buffer.append( "\n" );
- @SuppressWarnings( "unchecked" ) List<MojoDescriptor> mojos = pd.getMojos();
+ @SuppressWarnings( "unchecked" )
+ List<MojoDescriptor> mojos = pd.getMojos();
if ( mojos == null )
{
@@ -712,7 +707,8 @@ public class DescribeMojo
private void describeMojoParameters( MojoDescriptor md, StringBuilder buffer )
throws MojoFailureException, MojoExecutionException
{
- @SuppressWarnings( "unchecked" ) List<Parameter> params = md.getParameters();
+ @SuppressWarnings( "unchecked" )
+ List<Parameter> params = md.getParameters();
if ( params == null || params.isEmpty() )
{
@@ -829,12 +825,12 @@ public class DescribeMojo
LifecycleMapping lifecycleMapping =
(LifecycleMapping) session.lookup( LifecycleMapping.ROLE, project.getPackaging() );
- @SuppressWarnings( "unchecked" ) List<String> phases = lifecycle.getPhases();
+ @SuppressWarnings( "unchecked" )
+ List<String> phases = lifecycle.getPhases();
if ( lifecycle.getDefaultPhases() == null )
{
- descriptionBuffer.append( "'" ).append( cmd ).append(
- "' is a phase corresponding to this plugin:\n" );
+ descriptionBuffer.append("'").append(cmd).append("' is a phase corresponding to this plugin:\n");
for ( String key : phases )
{
if ( !key.equals( cmd ) )
@@ -850,12 +846,11 @@ public class DescribeMojo
}
descriptionBuffer.append( "\n" );
- descriptionBuffer.append( "It is a part of the lifecycle for the POM packaging '" ).append(
- project.getPackaging() ).append( "'. This lifecycle includes the following phases:" );
+ descriptionBuffer.append("It is a part of the lifecycle for the POM packaging '").append(project.getPackaging()).append("'. This lifecycle includes the following phases:");
descriptionBuffer.append( "\n" );
for ( String key : phases )
{
- descriptionBuffer.append( "* " ).append( key ).append( ": " );
+ descriptionBuffer.append("* ").append(key).append(": ");
String value = (String) lifecycleMapping.getPhases( "default" ).get( key );
if ( StringUtils.isNotEmpty( value ) )
{
@@ -881,13 +876,12 @@ public class DescribeMojo
}
else
{
- descriptionBuffer.append( "'" ).append( cmd ).append(
- "' is a lifecycle with the following phases: " );
+ descriptionBuffer.append("'").append(cmd).append("' is a lifecycle with the following phases: ");
descriptionBuffer.append( "\n" );
for ( String key : phases )
{
- descriptionBuffer.append( "* " ).append( key ).append( ": " );
+ descriptionBuffer.append("* ").append(key).append(": ");
if ( lifecycle.getDefaultPhases().get( key ) != null )
{
descriptionBuffer.append( lifecycle.getDefaultPhases().get( key ) ).append( "\n" );
@@ -914,7 +908,7 @@ public class DescribeMojo
// goals
MojoDescriptor mojoDescriptor = HelpUtil.getMojoDescriptor( cmd, session, project, cmd, true, false );
- descriptionBuffer.append( "'" ).append( cmd ).append( "' is a plugin goal (aka mojo)" ).append( ".\n" );
+ descriptionBuffer.append("'").append(cmd).append("' is a plugin goal (aka mojo)").append(".\n");
plugin = mojoDescriptor.getPluginDescriptor().getId();
goal = mojoDescriptor.getGoal();
@@ -943,7 +937,9 @@ public class DescribeMojo
new Class[]{ String.class, Integer.TYPE, Integer.TYPE,
Integer.TYPE } );
m.setAccessible( true );
- List<String> output = (List<String>) m.invoke( HelpMojo.class, text, indent, indentSize, lineLength );
+ List<String> output = (List<String>) m.invoke( HelpMojo.class,
+ text, indent, indentSize,
+ lineLength);
if ( output == null )
{
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java Tue Aug 27 18:25:03 2013
@@ -169,31 +169,24 @@ public class EvaluateMojo
// Instance variables
// ----------------------------------------------------------------------
- /**
- * lazy loading evaluator variable
- */
+ /** lazy loading evaluator variable */
private PluginParameterExpressionEvaluator evaluator;
- /**
- * lazy loading xstream variable
- */
+ /** lazy loading xstream variable */
private XStream xstream;
// ----------------------------------------------------------------------
// Public methods
// ----------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void execute()
throws MojoExecutionException, MojoFailureException
{
if ( expression == null && !settings.isInteractiveMode() )
{
- getLog().error( "Maven is configured to NOT interact with the user for input. "
- + "This Mojo requires that 'interactiveMode' in your settings file is flag to 'true'." );
+ getLog().error("Maven is configured to NOT interact with the user for input. " + "This Mojo requires that 'interactiveMode' in your settings file is flag to 'true'.");
return;
}
@@ -209,8 +202,8 @@ public class EvaluateMojo
}
catch ( ProjectBuildingException e )
{
- throw new MojoExecutionException(
- "Unable to get the POM for the artifact '" + artifact + "'. Verify the artifact parameter." );
+ throw new MojoExecutionException( "Unable to get the POM for the artifact '" + artifact
+ + "'. Verify the artifact parameter." );
}
}
@@ -297,9 +290,8 @@ public class EvaluateMojo
classifier = artifactParts[3];
break;
default:
- throw new MojoExecutionException(
- "The artifact parameter '" + artifactString + "' should be conform to: "
- + "'groupId:artifactId[:version][:classifier]'." );
+ throw new MojoExecutionException( "The artifact parameter '" + artifactString
+ + "' should be conform to: " + "'groupId:artifactId[:version][:classifier]'." );
}
if ( StringUtils.isNotEmpty( classifier ) )
@@ -313,7 +305,7 @@ public class EvaluateMojo
/**
* @param artifactObj not null
* @return the POM for the given artifact.
- * @throws MojoExecutionException if the artifact has a system scope.
+ * @throws MojoExecutionException if the artifact has a system scope.
* @throws ProjectBuildingException when building pom.
*/
private MavenProject getMavenProject( Artifact artifactObj )
@@ -338,7 +330,7 @@ public class EvaluateMojo
/**
* @return a lazy loading evaluator object.
* @throws MojoExecutionException if any
- * @throws MojoFailureException if any reflection exceptions occur or missing components.
+ * @throws MojoFailureException if any reflection exceptions occur or missing components.
* @see #getMojoDescriptor(String, MavenSession, MavenProject, String, boolean, boolean)
*/
private PluginParameterExpressionEvaluator getEvaluator()
@@ -349,9 +341,10 @@ public class EvaluateMojo
MojoDescriptor mojoDescriptor =
HelpUtil.getMojoDescriptor( "help:evaluate", session, project, "help:evaluate", true, false );
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
- evaluator = new PluginParameterExpressionEvaluator( session, mojoExecution, pathTranslator,
- loggerRetriever.getLogger(), project,
- session.getExecutionProperties() );
+ evaluator =
+ new PluginParameterExpressionEvaluator( session, mojoExecution, pathTranslator,
+ loggerRetriever.getLogger(), project,
+ session.getExecutionProperties() );
}
return evaluator;
@@ -360,7 +353,7 @@ public class EvaluateMojo
/**
* @param expr the user expression asked.
* @throws MojoExecutionException if any
- * @throws MojoFailureException if any reflection exceptions occur or missing components.
+ * @throws MojoFailureException if any reflection exceptions occur or missing components.
*/
private void handleResponse( String expr )
throws MojoExecutionException, MojoFailureException
@@ -476,7 +469,7 @@ public class EvaluateMojo
/**
* @param expr the user expression.
- * @param obj a not null.
+ * @param obj a not null.
* @return the XML for the given object.
*/
private String toXML( String expr, Object obj )
@@ -589,7 +582,7 @@ public class EvaluateMojo
/**
* @param xstreamObject not null
- * @param jarFile not null
+ * @param jarFile not null
* @param packageFilter a package name to filter.
*/
private void addAlias( XStream xstreamObject, File jarFile, String packageFilter )
@@ -606,7 +599,7 @@ public class EvaluateMojo
String name = jarEntry.getName().substring( 0, jarEntry.getName().indexOf( "." ) );
name = name.replaceAll( "/", "\\." );
- if ( name.contains( packageFilter ) )
+ if (name.contains(packageFilter))
{
try
{
@@ -644,44 +637,49 @@ public class EvaluateMojo
/**
* @return the <code>org.apache.maven:maven-model</code> artifact jar file in the local repository.
- * @throws MojoExecutionException if any
- * @throws ProjectBuildingException if any
+ * @throws MojoExecutionException if any
+ * @throws ProjectBuildingException if any
* @throws ArtifactResolutionException if any
- * @throws ArtifactNotFoundException if any
+ * @throws ArtifactNotFoundException if any
*/
private File getMavenModelJarFile()
- throws MojoExecutionException, ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException
+ throws MojoExecutionException, ProjectBuildingException, ArtifactResolutionException,
+ ArtifactNotFoundException
{
return getArtifactFile( true );
}
/**
* @return the <code>org.apache.maven:maven-settings</code> artifact jar file in the local repository.
- * @throws MojoExecutionException if any
- * @throws ProjectBuildingException if any
+ * @throws MojoExecutionException if any
+ * @throws ProjectBuildingException if any
* @throws ArtifactResolutionException if any
- * @throws ArtifactNotFoundException if any
+ * @throws ArtifactNotFoundException if any
*/
private File getMavenSettingsJarFile()
- throws MojoExecutionException, ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException
+ throws MojoExecutionException, ProjectBuildingException, ArtifactResolutionException,
+ ArtifactNotFoundException
{
return getArtifactFile( false );
}
/**
+ *
* @param isPom <code>true</code> to lookup the <code>maven-model</code> artifact jar, <code>false</code> to
- * lookup the <code>maven-settings</code> artifact jar.
+ * lookup the <code>maven-settings</code> artifact jar.
* @return the <code>org.apache.maven:maven-model|maven-settings</code> artifact jar file for this current
- * HelpPlugin pom.
- * @throws MojoExecutionException if any
- * @throws ProjectBuildingException if any
+ * HelpPlugin pom.
+ * @throws MojoExecutionException if any
+ * @throws ProjectBuildingException if any
* @throws ArtifactResolutionException if any
- * @throws ArtifactNotFoundException if any
+ * @throws ArtifactNotFoundException if any
*/
private File getArtifactFile( boolean isPom )
- throws MojoExecutionException, ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException
+ throws MojoExecutionException, ProjectBuildingException, ArtifactResolutionException,
+ ArtifactNotFoundException
{
- @SuppressWarnings( "unchecked" ) List<Dependency> dependencies = getHelpPluginPom().getDependencies();
+ @SuppressWarnings( "unchecked" )
+ List<Dependency> dependencies = getHelpPluginPom().getDependencies();
for ( Dependency depependency : dependencies )
{
if ( !( depependency.getGroupId().equals( "org.apache.maven" ) ) )
@@ -704,20 +702,21 @@ public class EvaluateMojo
}
}
- Artifact mavenArtifact = getArtifact(
- depependency.getGroupId() + ":" + depependency.getArtifactId() + ":" + depependency.getVersion() );
+ Artifact mavenArtifact =
+ getArtifact( depependency.getGroupId() + ":" + depependency.getArtifactId() + ":"
+ + depependency.getVersion() );
resolver.resolveAlways( mavenArtifact, remoteRepositories, localRepository );
return mavenArtifact.getFile();
}
- throw new MojoExecutionException(
- "Unable to find the 'org.apache.maven:" + ( isPom ? "maven-model" : "maven-settings" ) + "' artifact" );
+ throw new MojoExecutionException( "Unable to find the 'org.apache.maven:"
+ + ( isPom ? "maven-model" : "maven-settings" ) + "' artifact" );
}
/**
* @return the Maven POM for the current help plugin
- * @throws MojoExecutionException if any
+ * @throws MojoExecutionException if any
* @throws ProjectBuildingException if any
*/
private MavenProject getHelpPluginPom()
@@ -743,8 +742,9 @@ public class EvaluateMojo
}
String artifactString =
- properties.getProperty( "groupId", "unknown" ) + ":" + properties.getProperty( "artifactId", "unknown" )
- + ":" + properties.getProperty( "version", "unknown" );
+ properties.getProperty( "groupId", "unknown" ) + ":"
+ + properties.getProperty( "artifactId", "unknown" ) + ":"
+ + properties.getProperty( "version", "unknown" );
helpPluginArtifact = getArtifact( artifactString );
}
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java Tue Aug 27 18:25:03 2013
@@ -44,18 +44,14 @@ import java.util.Map;
public class ExpressionsMojo
extends AbstractHelpMojo
{
- /**
- * English sentence when no description exists
- */
+ /** English sentence when no description exists */
private static final String NO_DESCRIPTION_AVAILABLE = "No description available.";
// ----------------------------------------------------------------------
// Public methods
// ----------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -96,8 +92,8 @@ public class ExpressionsMojo
}
catch ( IOException e )
{
- throw new MojoExecutionException( "Cannot write plugins expressions description to output: " + output,
- e );
+ throw new MojoExecutionException( "Cannot write plugins expressions description to output: "
+ + output, e );
}
if ( getLog().isInfoEnabled() )
@@ -120,7 +116,7 @@ public class ExpressionsMojo
/**
* @return the value of the private static field <code>ExpressionDocumenter#EXPRESSION_ROOTS</code>.
- * @throws MojoFailureException if any reflection exceptions occur
+ * @throws MojoFailureException if any reflection exceptions occur
* @throws MojoExecutionException if no value exists for <code>ExpressionDocumenter#EXPRESSION_ROOTS</code>
*/
private static List<String> getExpressionsRoot()
@@ -133,8 +129,8 @@ public class ExpressionsMojo
String[] value = (String[]) f.get( new ExpressionDocumenter() );
if ( value == null )
{
- throw new MojoExecutionException(
- "org.apache.maven.usability.plugin.ExpressionDocumenter#" + "EXPRESSION_ROOTS has no value." );
+ throw new MojoExecutionException( "org.apache.maven.usability.plugin.ExpressionDocumenter#"
+ + "EXPRESSION_ROOTS has no value." );
}
return Arrays.asList( value );
@@ -160,7 +156,7 @@ public class ExpressionsMojo
/**
* @param description could be null
* @return the given description without any new line, or <code>NO_DESCRIPTION_AVAILABLE</code> value if
- * <code>description</code> is null.
+ * <code>description</code> is null.
* @see #NO_DESCRIPTION_AVAILABLE
*/
private static String trimCDATA( String description )
@@ -172,9 +168,8 @@ public class ExpressionsMojo
StringBuilder sb = new StringBuilder();
String[] lines = StringUtils.split( description, "\r\n" );
- for ( String line : lines )
- {
- sb.append( StringUtils.trim( line ) ).append( " " );
+ for (String line : lines) {
+ sb.append(StringUtils.trim(line)).append(" ");
}
return sb.toString();
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java Tue Aug 27 18:25:03 2013
@@ -44,29 +44,29 @@ import org.codehaus.plexus.component.rep
*/
public class HelpUtil
{
-
+
private HelpUtil()
{
// Utility classes should not have a public or default constructor.
}
-
+
/**
* Invoke the following private method <code>
* DefaultLifecycleExecutor#getMojoDescriptor(String, MavenSession, MavenProject, String, boolean, boolean)</code>
*
- * @param task not null
- * @param session not null
- * @param project not null
- * @param invokedVia not null
- * @param canUsePrefix not null
+ * @param task not null
+ * @param session not null
+ * @param project not null
+ * @param invokedVia not null
+ * @param canUsePrefix not null
* @param isOptionalMojo not null
* @return MojoDescriptor for the task
- * @throws MojoFailureException if can not invoke the method.
+ * @throws MojoFailureException if can not invoke the method.
* @throws MojoExecutionException if no descriptor was found for <code>task</code>.
* @see DefaultLifecycleExecutor#getMojoDescriptor(String, MavenSession, MavenProject, String, boolean, boolean)
*/
protected static MojoDescriptor getMojoDescriptor( String task, MavenSession session, MavenProject project,
- String invokedVia, boolean canUsePrefix, boolean isOptionalMojo )
+ String invokedVia, boolean canUsePrefix, boolean isOptionalMojo )
throws MojoFailureException, MojoExecutionException
{
try
@@ -74,14 +74,16 @@ public class HelpUtil
DefaultLifecycleExecutor lifecycleExecutor =
(DefaultLifecycleExecutor) session.lookup( LifecycleExecutor.ROLE );
- Method m = lifecycleExecutor.getClass().getDeclaredMethod( "getMojoDescriptor",
- new Class[]{ String.class, MavenSession.class,
- MavenProject.class, String.class,
- Boolean.TYPE, Boolean.TYPE } );
+ Method m =
+ lifecycleExecutor.getClass().getDeclaredMethod(
+ "getMojoDescriptor",
+ new Class[] { String.class, MavenSession.class,
+ MavenProject.class, String.class,
+ Boolean.TYPE, Boolean.TYPE } );
m.setAccessible( true );
MojoDescriptor mojoDescriptor =
- (MojoDescriptor) m.invoke( lifecycleExecutor, task, session, project, invokedVia, canUsePrefix,
- isOptionalMojo );
+ (MojoDescriptor) m.invoke( lifecycleExecutor, task, session, project, invokedVia,
+ canUsePrefix, isOptionalMojo);
if ( mojoDescriptor == null )
{
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java Tue Aug 27 18:25:03 2013
@@ -39,18 +39,14 @@ import java.util.Properties;
public class SystemMojo
extends AbstractHelpMojo
{
- /**
- * Magic number to beautify the output
- */
+ /** Magic number to beautify the output */
private static final int REPEAT = 25;
// ----------------------------------------------------------------------
// Public methods
// ----------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void execute()
throws MojoExecutionException
{
@@ -69,11 +65,10 @@ public class SystemMojo
message.append( StringUtils.repeat( "=", LINE_LENGTH ) ).append( '\n' );
Properties systemProperties = System.getProperties();
- for ( Object o1 : systemProperties.keySet() )
- {
+ for (Object o1 : systemProperties.keySet()) {
String key = o1.toString();
- message.append( "\n" );
- message.append( key ).append( "=" ).append( systemProperties.get( key ) );
+ message.append("\n");
+ message.append(key).append("=").append(systemProperties.get(key));
}
message.append( '\n' ).append( '\n' );
@@ -83,11 +78,10 @@ public class SystemMojo
try
{
Properties envVars = CommandLineUtils.getSystemEnvVars();
- for ( Object o : envVars.keySet() )
- {
+ for (Object o : envVars.keySet()) {
String key = o.toString();
- message.append( "\n" );
- message.append( key ).append( "=" ).append( envVars.get( key ) );
+ message.append("\n");
+ message.append(key).append("=").append(envVars.get(key));
}
}
catch ( IOException e )
@@ -103,8 +97,8 @@ public class SystemMojo
if ( output != null )
{
StringBuilder sb = new StringBuilder();
- sb.append( "Created by: " ).append( getClass().getName() ).append( "\n" );
- sb.append( "Created on: " ).append( new Date() ).append( "\n" ).append( "\n" );
+ sb.append("Created by: ").append(getClass().getName()).append("\n");
+ sb.append("Created on: ").append(new Date()).append("\n").append( "\n" );
sb.append( message.toString() );
try
Modified: maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java Tue Aug 27 18:25:03 2013
@@ -43,9 +43,9 @@ public class DescribeMojoTest
{
try
{
- PrivateAccessor.invoke( DescribeMojo.class, "toLines",
- new Class[]{ String.class, Integer.TYPE, Integer.TYPE, Integer.TYPE },
- new Object[]{ "", 2, 2, 80 } );
+ PrivateAccessor.invoke( DescribeMojo.class, "toLines", new Class[] { String.class, Integer.TYPE,
+ Integer.TYPE, Integer.TYPE }, new Object[] { "", 2, 2,
+ 80} );
assertTrue( true );
}
catch ( Throwable e )
@@ -53,7 +53,7 @@ public class DescribeMojoTest
Assert.fail( "The API changes" );
}
}
-
+
public void testValidExpression()
throws Exception
{
@@ -63,24 +63,24 @@ public class DescribeMojoTest
parameter.setName( "name" );
parameter.setExpression( "${valid.expression}" );
md.addParameter( parameter );
-
+
try
{
- PrivateAccessor.invoke( new DescribeMojo(), "describeMojoParameters",
- new Class[]{ MojoDescriptor.class, StringBuilder.class }, new Object[]{ md, sb } );
-
+ PrivateAccessor.invoke( new DescribeMojo(), "describeMojoParameters", new Class[] { MojoDescriptor.class,
+ StringBuilder.class }, new Object[] { md, sb } );
+
assertEquals( " Available parameters:\n" +
- "\n" +
- " name\n" +
- " User property: valid.expression\n" +
- " (no description available)\n", sb.toString() );
+ "\n" +
+ " name\n" +
+ " User property: valid.expression\n" +
+ " (no description available)\n", sb.toString() );
}
catch ( Throwable e )
{
fail( e.getMessage() );
}
}
-
+
public void testInvalidExpression()
throws Exception
{
@@ -90,23 +90,23 @@ public class DescribeMojoTest
parameter.setName( "name" );
parameter.setExpression( "${project.build.directory}/generated-sources/foobar" ); //this is a defaultValue
md.addParameter( parameter );
-
+
try
{
- PrivateAccessor.invoke( new DescribeMojo(), "describeMojoParameters",
- new Class[]{ MojoDescriptor.class, StringBuilder.class }, new Object[]{ md, sb } );
-
+ PrivateAccessor.invoke( new DescribeMojo(), "describeMojoParameters", new Class[] { MojoDescriptor.class,
+ StringBuilder.class }, new Object[] { md, sb } );
+
assertEquals( " Available parameters:\n" +
- "\n" +
- " name\n" +
- " Expression: ${project.build.directory}/generated-sources/foobar\n" +
- " (no description available)\n", sb.toString() );
+ "\n" +
+ " name\n" +
+ " Expression: ${project.build.directory}/generated-sources/foobar\n" +
+ " (no description available)\n", sb.toString() );
}
catch ( Throwable e )
{
fail( e.getMessage() );
}
-
+
}
}