Author: hboutemy
Date: Thu Oct 30 10:07:02 2014
New Revision: 1635447
URL: http://svn.apache.org/r1635447
Log:
updated parent pom
Modified:
maven/plugins/trunk/maven-toolchains-plugin/pom.xml
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
Modified: maven/plugins/trunk/maven-toolchains-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/pom.xml?rev=1635447&r1=1635446&r2=1635447&view=diff
==============================================================================
--- maven/plugins/trunk/maven-toolchains-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-toolchains-plugin/pom.xml Thu Oct 30 10:07:02 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>25</version>
+ <version>26</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -57,7 +57,6 @@ under the License.
<properties>
<mavenVersion>2.0.9</mavenVersion>
- <mavenPluginVersion>3.2</mavenPluginVersion>
</properties>
<dependencies>
@@ -74,7 +73,6 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>${mavenPluginVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -85,37 +83,6 @@ under the License.
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginVersion}</version>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
<profiles>
<profile>
<id>run-its</id>
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java?rev=1635447&r1=1635446&r2=1635447&view=diff
==============================================================================
---
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java
Thu Oct 30 10:07:02 2014
@@ -74,20 +74,25 @@ public class ToolchainConverter
{
Map map = new HashMap();
PlexusConfiguration[] tools = configuration.getChildren();
- for (PlexusConfiguration tool : tools) {
+ for ( PlexusConfiguration tool : tools )
+ {
String type = tool.getName();
PlexusConfiguration[] params = tool.getChildren();
Map parameters = new HashMap();
- for (PlexusConfiguration param : params) {
- try {
+ for ( PlexusConfiguration param : params )
+ {
+ try
+ {
String name = param.getName();
String val = param.getValue();
- parameters.put(name, val);
- } catch (PlexusConfigurationException ex) {
- throw new ComponentConfigurationException(ex);
+ parameters.put( name, val );
+ }
+ catch ( PlexusConfigurationException ex )
+ {
+ throw new ComponentConfigurationException( ex );
}
}
- map.put(type, parameters);
+ map.put( type, parameters );
}
chain.toolchains = map;
}
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java?rev=1635447&r1=1635446&r2=1635447&view=diff
==============================================================================
---
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
Thu Oct 30 10:07:02 2014
@@ -83,10 +83,12 @@ public class ToolchainMojo
Map params = toolchains.getParams( type );
ToolchainPrivate[] tcs = getToolchains( type );
boolean matched = false;
- for (ToolchainPrivate tc : tcs) {
- if (tc.matchesRequirements(params)) {
- getLog().info("Toolchain (" + type + ") matched:"
+ tc);
- toolchainManager.storeToolchainToBuildContext(tc,
session);
+ for ( ToolchainPrivate tc : tcs )
+ {
+ if ( tc.matchesRequirements( params ) )
+ {
+ getLog().info( "Toolchain (" + type + ") matched:"
+ tc );
+ toolchainManager.storeToolchainToBuildContext( tc,
session );
matched = true;
break;
}
@@ -103,22 +105,26 @@ public class ToolchainMojo
}
if ( !nonMatchedTypes.isEmpty() )
{
- //TODO add the default toolchain instance if defined??
+ // TODO add the default toolchain instance if defined??
StringBuilder buff = new StringBuilder();
buff.append( "Cannot find matching toolchain definitions for
the following toolchain types:" );
- for (Object nonMatchedType : nonMatchedTypes) {
+ for ( Object nonMatchedType : nonMatchedTypes )
+ {
String type = (String) nonMatchedType;
- buff.append('\n');
- buff.append(type);
- Map params = toolchains.getParams(type);
- if (params.size() > 0) {
+ buff.append( '\n' );
+ buff.append( type );
+ Map params = toolchains.getParams( type );
+ if ( params.size() > 0 )
+ {
Iterator it2 = params.keySet().iterator();
- buff.append(" [");
- while (it2.hasNext()) {
+ buff.append( " [" );
+ while ( it2.hasNext() )
+ {
String string = (String) it2.next();
- buff.append("
").append(string).append("='").append(params.get(string)).append("' ");
+ buff.append( " " ).append( string ).append( "='"
).append( params.get( string ) );
+ buff.append( "' " );
}
- buff.append(']');
+ buff.append( ']' );
}
}
getLog().error( buff.toString() );
@@ -145,14 +151,14 @@ public class ToolchainMojo
Method newMethod =
managerClass.getMethod( "getToolchainsForType", new
Class[] { String.class, MavenSession.class } );
- return (ToolchainPrivate[]) newMethod.invoke(
toolchainManager, type, session);
+ return (ToolchainPrivate[]) newMethod.invoke(
toolchainManager, type, session );
}
catch ( NoSuchMethodException e )
{
// try 2.x style API
Method oldMethod = managerClass.getMethod(
"getToolchainsForType", new Class[] { String.class } );
- return (ToolchainPrivate[]) oldMethod.invoke(
toolchainManager, type);
+ return (ToolchainPrivate[]) oldMethod.invoke(
toolchainManager, type );
}
}
catch ( NoSuchMethodException e )
