Author: tchemit Date: 2012-11-11 20:24:40 +0100 (Sun, 11 Nov 2012) New Revision: 1378 Url: http://nuiton.org/repositories/revision/mavenpom/1378 Log: fixes #2423: Add Apache Public License 2.0 to licenseMerge fixes #2419: Updates to helper-m-p 2.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 10:10:35 UTC (rev 1377) +++ trunk/pom.xml 2012-11-11 19:24:40 UTC (rev 1378) @@ -241,7 +241,7 @@ <antVersion>1.8.3</antVersion> <!-- our plugins --> - <helperPluginVersion>1.6</helperPluginVersion> + <helperPluginVersion>2.0</helperPluginVersion> <jredminePluginVersion>1.5.1</jredminePluginVersion> <jrstPluginVersion>2.0.1</jrstPluginVersion> @@ -585,7 +585,7 @@ <dependencies> <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> + <artifactId>helper-maven-plugin-api</artifactId> <version>${helperPluginVersion}</version> </dependency> </dependencies> @@ -1097,7 +1097,7 @@ <configuration> <licenseMerges> <licenseMerge> - The Apache Software License, Version 2.0|Apache License, Version 2.0|Apache License V2.0|Apache 2|ASF 2.0|apache-2.0 + The Apache Software License, Version 2.0|Apache License, Version 2.0|Apache License V2.0|Apache 2|ASF 2.0|apache-2.0|Apache Public License 2.0 </licenseMerge> <licenseMerge>BSD License|BSD license|BSD</licenseMerge> <licenseMerge>MIT License|MIT license|MIT</licenseMerge>