| [Arakhnę-Dev] [226] Update version of dependencies and related codes to ensure compat with MAVEN 3 .0.3 |
[ Thread Index |
Date Index
| More arakhne.org/dev Archives
]
- To: dev@xxxxxxxxxxx
- Subject: [Arakhnę-Dev] [226] Update version of dependencies and related codes to ensure compat with MAVEN 3 .0.3
- From: subversion@xxxxxxxxxxxxx
- Date: Tue, 26 Jul 2011 16:21:05 +0200
Revision: 226
Author: labset
Date: 2011-07-26 16:21:05 +0200 (Tue, 26 Jul 2011)
Log Message:
-----------
Update version of dependencies and related codes to ensure compat with MAVEN 3.0.3
Modified Paths:
--------------
trunk/maven-license-install-plugin/pom.xml
trunk/maven-license-install-plugin/src/main/java/org/arakhne/maven/maven_license_install_plugin/InstallLicenseMojo.java
trunk/pom.xml
Modified: trunk/maven-license-install-plugin/pom.xml
===================================================================
--- trunk/maven-license-install-plugin/pom.xml 2011-06-03 17:32:38 UTC (rev 225)
+++ trunk/maven-license-install-plugin/pom.xml 2011-07-26 14:21:05 UTC (rev 226)
@@ -1,55 +1,71 @@
<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>afc</artifactId>
- <groupId>org.arakhne.afc</groupId>
- <version>3.2-SNAPSHOT</version>
- </parent>
- <groupId>org.arakhne.afc</groupId>
- <artifactId>maven-license-install-plugin</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
- <name>maven-license-install-plugin Maven Plugin</name>
- <url>http://maven.apache.org</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";
+ xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>afc</artifactId>
+ <groupId>org.arakhne.afc</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.arakhne.afc</groupId>
+ <artifactId>maven-license-install-plugin</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+ <name>maven-license-install-plugin Maven Plugin</name>
+ <url>http://maven.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0</version>
+ <version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0</version>
+ <version>2.2.1</version>
</dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.5.1</version>
- <executions>
- <execution>
- <id>generated-helpmojo</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <goalPrefix>license-install</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>generated-helpmojo</id>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <goalPrefix>license-install</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/maven-license-install-plugin/src/main/java/org/arakhne/maven/maven_license_install_plugin/InstallLicenseMojo.java
===================================================================
--- trunk/maven-license-install-plugin/src/main/java/org/arakhne/maven/maven_license_install_plugin/InstallLicenseMojo.java 2011-06-03 17:32:38 UTC (rev 225)
+++ trunk/maven-license-install-plugin/src/main/java/org/arakhne/maven/maven_license_install_plugin/InstallLicenseMojo.java 2011-07-26 14:21:05 UTC (rev 226)
@@ -26,10 +26,9 @@
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -97,14 +96,12 @@
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
public void execute() throws MojoExecutionException {
if ("pom".equalsIgnoreCase(this.mavenProject.getPackaging())) { //$NON-NLS-1$
- String key = ArtifactUtils.artifactId(
+ String key = ArtifactUtils.key(
this.mavenProject.getGroupId(),
this.mavenProject.getArtifactId(),
- this.mavenProject.getPackaging(),
this.mavenProject.getVersion());
info("Ignoring project ", //$NON-NLS-1$
key,
@@ -266,7 +263,7 @@
authorsText.append("\n\n"); //$NON-NLS-1$
authorsText.append(getLString(InstallLicenseMojo.class, "DEVELOPER_TITLE", this.name)); //$NON-NLS-1$
authorsText.append("\n\n"); //$NON-NLS-1$
- for(Developer developer : (List<Developer>)this.mavenProject.getDevelopers()) {
+ for(Developer developer : this.mavenProject.getDevelopers()) {
authorsText.append(getLString(InstallLicenseMojo.class,
"DEVELOPER", //$NON-NLS-1$
developer.getName(),
@@ -277,7 +274,7 @@
authorsText.append("\n\n\n"); //$NON-NLS-1$
authorsText.append(getLString(InstallLicenseMojo.class, "CONTRIBUTOR_TITLE", this.name)); //$NON-NLS-1$
authorsText.append("\n\n"); //$NON-NLS-1$
- for(Contributor contributor : (List<Contributor>)this.mavenProject.getContributors()) {
+ for(Contributor contributor : this.mavenProject.getContributors()) {
authorsText.append(getLString(InstallLicenseMojo.class,
"DEVELOPER", //$NON-NLS-1$
contributor.getName(),
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-06-03 17:32:38 UTC (rev 225)
+++ trunk/pom.xml 2011-07-26 14:21:05 UTC (rev 226)
@@ -139,7 +139,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>