- Maven-license-plugin-commits - mailman.cloud.codelutin.com

r1871 - trunk/src/main/java/org/nuiton/license/plugin
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 22:08:53 +0100 (Thu, 11 Nov 2010) New Revision: 1871 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1871 Log: Anomalie #1008: Remove **/i18n/*.properties from the excludes Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateFileHeaderMojo.java Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateFileHeaderMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/UpdateFileHeaderMojo.java 2010-11-02 15:06:42 UTC (rev 1870) +++ trunk/src/main/java/org/nuiton/license/plugin/UpdateFileHeaderMojo.java 2010-11-11 21:08:53 UTC (rev 1871) @@ -233,7 +233,6 @@ * <ul> * <li>modelisation</li> * <li>images</li> - * <li>i18n properties</li> * </ul> * <p/> * <b>Note:</b> This parameter is not useable if you are still using a project file descriptor. @@ -309,7 +308,6 @@ public static final String[] DEFAULT_EXCLUDES = new String[]{ "**/*.zargo", "**/*.uml", "**/*.umldi", "**/*.xmi", /* modelisation */ "**/*.img", "**/*.png", "**/*.jpg", "**/*.jpeg", "**/*.gif", /* images */ - "**/i18n/*.properties", "**/*.zip" };

1 0

r1870 - in trunk/src/site: apt fr/apt
by sletellier＠users.nuiton.org Nov. 2, 2010

Nov. 2, 2010

Author: sletellier Date: 2010-11-02 16:06:42 +0100 (Tue, 02 Nov 2010) New Revision: 1870 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1870 Log: - Replace License-Ignore by Ignore-License - Update documentation Modified: trunk/src/site/apt/header.apt trunk/src/site/fr/apt/header.apt Modified: trunk/src/site/apt/header.apt =================================================================== --- trunk/src/site/apt/header.apt 2010-10-29 22:02:15 UTC (rev 1869) +++ trunk/src/site/apt/header.apt 2010-11-02 15:06:42 UTC (rev 1870) @@ -148,7 +148,8 @@ -------------------------------------------------------------------------------- - %%License-Ignore + %%Ignore-License -------------------------------------------------------------------------------- + Note : Don't use start (1) and end (7 in exemple) balise You can change it with <<ignoreTag>> property. Modified: trunk/src/site/fr/apt/header.apt =================================================================== --- trunk/src/site/fr/apt/header.apt 2010-10-29 22:02:15 UTC (rev 1869) +++ trunk/src/site/fr/apt/header.apt 2010-11-02 15:06:42 UTC (rev 1870) @@ -148,7 +148,8 @@ -------------------------------------------------------------------------------- - %%License-Ignore + %%Ignore-License -------------------------------------------------------------------------------- + Note : Ne pas utiliser la balise de dépard (1) et de fin (7 dans l'exemple) Vous pouvez le changer avec la propriété <<ignoreTag>>.

1 0

r1869 - trunk/src/main/java/org/nuiton/license/plugin
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-30 00:02:15 +0200 (Sat, 30 Oct 2010) New Revision: 1869 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1869 Log: introduce ArtifactHelper + fix Anomalie #1007: THIRD-PARTY.properties files overwritten Added: trunk/src/main/java/org/nuiton/license/plugin/ArtifactHelper.java Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-10-29 08:29:07 UTC (rev 1868) +++ trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-10-29 22:02:15 UTC (rev 1869) @@ -36,8 +36,6 @@ import java.util.TreeMap; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; @@ -258,11 +256,13 @@ if (isGenerateBundle()) { - File bundleFile = - PluginHelper.getFile(getOutputDirectory(), getBundleThirdPartyPath()); + File bundleFile = PluginHelper.getFile(getOutputDirectory(), + getBundleThirdPartyPath() + ); if (isVerbose()) { - log.info("bundle third-party file : " + bundleFile.lastModified()); + log.info("bundle third-party file : " + + bundleFile.lastModified()); } setDoGenerateBundle(isForce() || !bundleFile.exists() || @@ -310,43 +310,12 @@ for (MavenProject dep : unsafeDependencies) { // no license found for the dependency - log.warn(" - " + getArtifactId(dep.getArtifact())); + log.warn(" - " + ArtifactHelper.getArtifactId(dep.getArtifact())); } } return unsafe; } - public static String getArtifactId(Artifact artifact) { - StringBuilder sb = new StringBuilder(); - sb.append(artifact.getGroupId()); - sb.append("--"); - sb.append(artifact.getArtifactId()); - sb.append("--"); - sb.append(artifact.getVersion()); - if (!StringUtils.isEmpty(artifact.getClassifier())) { - sb.append("--"); - sb.append(artifact.getClassifier()); - } - return sb.toString(); - } - - public static String getArtifactName(MavenProject project) { - StringBuilder sb = new StringBuilder(); - sb.append(project.getName()); - sb.append(" ("); - sb.append(project.getGroupId()); - sb.append(":"); - sb.append(project.getArtifactId()); - sb.append(":"); - sb.append(project.getVersion()); - sb.append(" - "); - String url = project.getUrl(); - sb.append(url == null ? "no url defined" : url); - sb.append(")"); - - return sb.toString(); - } - protected void writeThirdPartyFile() throws IOException { Log log = getLog(); @@ -369,7 +338,7 @@ for (MavenProject mavenProject : projects) { - String s = getArtifactName(mavenProject); + String s = ArtifactHelper.getArtifactName(mavenProject); sb.append("\n * ").append(s); } } @@ -385,7 +354,7 @@ List<String> lines = new ArrayList<String>(); for (Map.Entry<MavenProject, String[]> entry : map.entrySet()) { - String artifact = getArtifactName(entry.getKey()); + String artifact = ArtifactHelper.getArtifactName(entry.getKey()); StringBuilder buffer = new StringBuilder(); for (String license : entry.getValue()) { buffer.append(" (").append(license).append(")"); Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-10-29 08:29:07 UTC (rev 1868) +++ trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-10-29 22:02:15 UTC (rev 1869) @@ -25,17 +25,6 @@ package org.nuiton.license.plugin; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.artifact.Artifact; @@ -47,6 +36,16 @@ import org.apache.maven.project.ProjectBuildingException; import org.nuiton.io.SortedProperties; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.SortedSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; + /** * Le goal pour copier le fichier THIRD-PARTY.txt (contenant les licenses de * toutes les dependances du projet) dans le classpath (et le generer s'il @@ -140,18 +139,20 @@ // no information can be retrive from anywhere)... continue; } - String id = getArtifactId(artifact); + String id = ArtifactHelper.getArtifactId(artifact); + if (isVerbose()) { + getLog().info("detected artifact " + id); + } - // Check if the project should be included // If there is no specified artifacts and group to include, include all boolean isToInclude = haveNoIncludedArtifacts && haveNoIncludedGroups - || isIncludable(artifact, includedGroupPattern, includedArtifactPattern); + || isIncludable(artifact, includedGroupPattern, includedArtifactPattern); // Check if the project should be excluded boolean isToExclude = isToInclude - && haveExclusions - && isExcludable(artifact, excludedGroupPattern, excludedArtifactPattern); + && haveExclusions + && isExcludable(artifact, excludedGroupPattern, excludedArtifactPattern); if (isToInclude && !isToExclude) { MavenProject project = addArtifact(id, artifact); @@ -167,7 +168,7 @@ SortedProperties unsafeMappings = getLicenseMap().loadUnsafeMapping(getEncoding(), - getMissingFile()); + getMissingFile()); SortedSet<MavenProject> unsafeDependencies = getUnsafeDependencies(); @@ -185,15 +186,14 @@ setDoGenerateMissing(isUseMissingFile() && !CollectionUtils.isEmpty(unsafeDependencies)); } - return unsafeMappings; } @Override protected boolean checkSkip() { if (!isDoGenerate() && - !isDoGenerateBundle() && - !isDoGenerateMissing()) { + !isDoGenerateBundle() && + !isDoGenerateMissing()) { getLog().info("All files are up to date, skip goal execution."); return false; @@ -232,14 +232,13 @@ FileWriter writer = new FileWriter(file); try { StringBuilder sb = new StringBuilder(" Generated by " + getClass().getName()); - Set<String> licenses = licenseMap.keySet(); + List<String> licenses = new ArrayList<String>(licenseMap.keySet()); + licenses.remove(LicenseMap.getUnknownLicenseMessage()); if (!licenses.isEmpty()) { sb.append("\n-------------------------------------------------------------------------------"); sb.append("\n Already used licenses in project :"); for (String license : licenses) { - if (!LicenseMap.getUnknownLicenseMessage().equals(license)) { - sb.append("\n - ").append(license); - } + sb.append("\n - ").append(license); } } sb.append("\n-------------------------------------------------------------------------------"); @@ -305,7 +304,7 @@ } catch (PatternSyntaxException e) { getLog().warn("The pattern specified by expression <" - + includedGroups + "> seems to be invalid."); + + includedGroups + "> seems to be invalid."); } } @@ -323,7 +322,7 @@ } catch (PatternSyntaxException e) { getLog().warn("The pattern specified by expression <" - + includedArtifacts + "> seems to be invalid."); + + includedArtifacts + "> seems to be invalid."); } } @@ -350,7 +349,7 @@ } catch (PatternSyntaxException e) { getLog().warn("The pattern specified by expression <" - + excludedGroups + "> seems to be invalid."); + + excludedGroups + "> seems to be invalid."); } } @@ -368,7 +367,7 @@ } catch (PatternSyntaxException e) { getLog().warn("The pattern specified by expression <" - + excludedArtifacts + "> seems to be invalid."); + + excludedArtifacts + "> seems to be invalid."); } } Added: trunk/src/main/java/org/nuiton/license/plugin/ArtifactHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/ArtifactHelper.java (rev 0) +++ trunk/src/main/java/org/nuiton/license/plugin/ArtifactHelper.java 2010-10-29 22:02:15 UTC (rev 1869) @@ -0,0 +1,69 @@ +package org.nuiton.license.plugin; + +import org.apache.commons.lang.StringUtils; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.project.MavenProject; + +import java.util.Comparator; + +/** + * A helper for artifacts. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4.2 + */ +public class ArtifactHelper { + + protected static Comparator<MavenProject> projectComparator; + + public static String getArtifactId(Artifact artifact) { + StringBuilder sb = new StringBuilder(); + sb.append(artifact.getGroupId()); + sb.append("--"); + sb.append(artifact.getArtifactId()); + sb.append("--"); + sb.append(artifact.getVersion()); + String type = artifact.getType(); + if (!StringUtils.isEmpty(type) && !"pom".equals(type)) { + sb.append("--"); + sb.append(artifact.getType()); + } + if (!StringUtils.isEmpty(artifact.getClassifier())) { + sb.append("--"); + sb.append(artifact.getClassifier()); + } + return sb.toString(); + } + + public static String getArtifactName(MavenProject project) { + StringBuilder sb = new StringBuilder(); + sb.append(project.getName()); + sb.append(" ("); + sb.append(project.getGroupId()); + sb.append(":"); + sb.append(project.getArtifactId()); + sb.append(":"); + sb.append(project.getVersion()); + sb.append(" - "); + String url = project.getUrl(); + sb.append(url == null ? "no url defined" : url); + sb.append(")"); + + return sb.toString(); + } + + public static Comparator<MavenProject> getProjectComparator() { + if (projectComparator == null) { + projectComparator = new Comparator<MavenProject>() { + @Override + public int compare(MavenProject o1, MavenProject o2) { + + String id1 = getArtifactId(o1.getArtifact()); + String id2 = getArtifactId(o2.getArtifact()); + return id1.compareTo(id2); + } + }; + } + return projectComparator; + } +} Modified: trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java 2010-10-29 08:29:07 UTC (rev 1868) +++ trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java 2010-10-29 22:02:15 UTC (rev 1869) @@ -38,7 +38,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -47,10 +46,6 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; - /** * Map of artifacts (stub in mavenproject) group by their license. * @@ -94,7 +89,7 @@ for (Object o : licenses) { String id; - id = AbstractAddThirdPartyMojo.getArtifactId(project.getArtifact()); + id = ArtifactHelper.getArtifactId(project.getArtifact()); if (o == null) { getLog().warn("could not acquire the license for " + id); continue; @@ -131,7 +126,7 @@ for (MavenProject dep : unsafeDependencies) { // no license found for the dependency - log.debug(" - " + AbstractAddThirdPartyMojo.getArtifactId(dep.getArtifact())); + log.debug(" - " + ArtifactHelper.getArtifactId(dep.getArtifact())); } } } @@ -139,7 +134,8 @@ return unsafeDependencies; } - protected SortedProperties loadUnsafeMapping(String encoding, File missingFile) throws IOException, ProjectBuildingException { + protected SortedProperties loadUnsafeMapping(String encoding, + File missingFile) throws IOException, ProjectBuildingException { SortedSet<MavenProject> unsafeDependencies = getUnsafeDependencies(); @@ -186,14 +182,13 @@ if (unsafeDependencies.isEmpty()) { - // no more unknown license in map remove(getUnknownLicenseMessage()); } else { // add a "with no value license" for missing dependencies for (MavenProject project : unsafeDependencies) { - String id = AbstractAddThirdPartyMojo.getArtifactId(project.getArtifact()); + String id = ArtifactHelper.getArtifactId(project.getArtifact()); unsafeMappings.setProperty(id, ""); } } @@ -201,11 +196,12 @@ } public SortedSet<MavenProject> put(String key, MavenProject value) { + // handle multiple values as a set to avoid duplicates SortedSet<MavenProject> valueList = get(key); if (valueList == null) { - valueList = new TreeSet<MavenProject>(getProjectComparator()); + valueList = new TreeSet<MavenProject>(ArtifactHelper.getProjectComparator()); } if (getLog().isDebugEnabled()) { getLog().debug("key:" + key + ",value: " + value); @@ -216,7 +212,7 @@ public SortedMap<MavenProject, String[]> toDependencyMap() { SortedMap<MavenProject, Set<String>> tmp = - new TreeMap<MavenProject, Set<String>>(getProjectComparator()); + new TreeMap<MavenProject, Set<String>>(ArtifactHelper.getProjectComparator()); for (Map.Entry<String, SortedSet<MavenProject>> entry : entrySet()) { String license = entry.getKey(); @@ -232,7 +228,7 @@ } SortedMap<MavenProject, String[]> result = - new TreeMap<MavenProject, String[]>(getProjectComparator()); + new TreeMap<MavenProject, String[]>(ArtifactHelper.getProjectComparator()); for (Map.Entry<MavenProject, Set<String>> entry : tmp.entrySet()) { List<String> value = new ArrayList<String>(entry.getValue()); Collections.sort(value); @@ -246,23 +242,6 @@ return unknownLicenseMessage; } - protected static transient Comparator<MavenProject> projectComparator; - - public static Comparator<MavenProject> getProjectComparator() { - if (projectComparator == null) { - projectComparator = new Comparator<MavenProject>() { - @Override - public int compare(MavenProject o1, MavenProject o2) { - - String id1 = AbstractAddThirdPartyMojo.getArtifactId(o1.getArtifact()); - String id2 = AbstractAddThirdPartyMojo.getArtifactId(o2.getArtifact()); - return id1.compareTo(id2); - } - }; - } - return projectComparator; - } - public void mergeLicenses(String... licenses) { if (licenses.length == 0) { return; @@ -272,7 +251,7 @@ SortedSet<MavenProject> mainSet = get(mainLicense); if (mainSet == null) { getLog().warn("No license [" + mainLicense + "] found, will create it."); - mainSet = new TreeSet<MavenProject>(getProjectComparator()); + mainSet = new TreeSet<MavenProject>(ArtifactHelper.getProjectComparator()); put(mainLicense, mainSet); } int size = licenses.length;

1 0

r1868 - trunk
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-29 10:29:07 +0200 (Fri, 29 Oct 2010) New Revision: 1868 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1868 Log: Update mavenpom4redmineAndCentral to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:58:50 UTC (rev 1867) +++ trunk/pom.xml 2010-10-29 08:29:07 UTC (rev 1868) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <artifactId>maven-license-plugin</artifactId>

1 0

r1867 - trunk
by tchemit＠users.nuiton.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 14:58:50 +0200 (Tue, 26 Oct 2010) New Revision: 1867 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1867 Log: fix build (use inheritance from mavenpom for commons libs) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-25 06:47:26 UTC (rev 1866) +++ trunk/pom.xml 2010-10-26 12:58:50 UTC (rev 1867) @@ -130,13 +130,11 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.5</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> </dependency>  @@ -191,7 +189,6 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> <scope>runtime</scope> </dependency> @@ -295,8 +292,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> </dependency> </dependencies>

1 0

r1866 - trunk
by tchemit＠users.nuiton.org Oct. 25, 2010

Oct. 25, 2010

Author: tchemit Date: 2010-10-25 08:47:26 +0200 (Mon, 25 Oct 2010) New Revision: 1866 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1866 Log: Evolution #984: Updates processor to 1.0.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-23 11:47:46 UTC (rev 1865) +++ trunk/pom.xml 2010-10-25 06:47:26 UTC (rev 1866) @@ -366,7 +366,7 @@ <properties>  - <processorVersion>1.0.2</processorVersion> + <processorVersion>1.0.4-SNAPSHOT</processorVersion>  <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion>

1 0

r1865 - in trunk: . src/license
by tchemit＠users.nuiton.org Oct. 23, 2010

Oct. 23, 2010

Author: tchemit Date: 2010-10-23 13:47:46 +0200 (Sat, 23 Oct 2010) New Revision: 1865 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1865 Log: Evolution #973: Optimize dependencies Evolution #977: Updates mavenpom4redmineAndCentral to 2.4 Evolution #978: Updates maven-helper-plugin to 1.3 Modified: trunk/pom.xml trunk/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-18 15:05:45 UTC (rev 1864) +++ trunk/pom.xml 2010-10-23 11:47:46 UTC (rev 1865) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>maven-license-plugin</artifactId> @@ -45,14 +45,14 @@ <dependency> <groupId>org.nuiton.processor</groupId> <artifactId>nuiton-processor</artifactId> - <version>${processor.version}</version> + <version>${processorVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -127,6 +127,18 @@ </exclusions> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> +  <dependency> <groupId>org.codehaus.plexus</groupId> @@ -138,28 +150,49 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> + <scope>runtime</scope> </dependency>  @@ -167,7 +200,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <scope>test</scope> <classifier>tests</classifier> <exclusions> @@ -333,11 +366,10 @@ <properties>  - <processor.version>1.0.2</processor.version> - + <processorVersion>1.0.2</processorVersion> +  - <helper.version>1.2.8</helper.version> - <jredmine.version>1.1.4</jredmine.version> + <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion>  <mdoVersion>1.0.0</mdoVersion> Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2010-10-18 15:05:45 UTC (rev 1864) +++ trunk/src/license/THIRD-PARTY.properties 2010-10-23 11:47:46 UTC (rev 1865) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit +# Copyright (C) 2008 - 2010 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as @@ -34,14 +34,16 @@ # - MIT License # - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Sep 08 10:42:10 CEST 2010 +#Fri Oct 22 20:37:18 CEST 2010 classworlds--classworlds--1.1=http\://classworlds.codehaus.org/license.html classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/lice… commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 +commons-collections--commons-collections--3.1=The Apache Software License, Version 2. nekohtml--xercesMinimal--1.9.6.2=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 @@ -49,3 +51,4 @@ org.slf4j--slf4j-api--1.5.6=MIT License org.slf4j--slf4j-jdk14--1.5.6=MIT License org.slf4j--slf4j-nop--1.5.3=MIT License +oro--oro--2.0.8=The Apache Software License, Version 2.0

1 0

r1864 - trunk/src/main/java/org/nuiton/license/plugin/header/transformer
by tchemit＠users.nuiton.org Oct. 18, 2010

Oct. 18, 2010

Author: tchemit Date: 2010-10-18 17:05:45 +0200 (Mon, 18 Oct 2010) New Revision: 1864 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1864 Log: Evolution #959: Add jsp as default extension for comment style xml Modified: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/XmlFileHeaderTransformer.java Modified: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/XmlFileHeaderTransformer.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/header/transformer/XmlFileHeaderTransformer.java 2010-10-17 01:41:27 UTC (rev 1863) +++ trunk/src/main/java/org/nuiton/license/plugin/header/transformer/XmlFileHeaderTransformer.java 2010-10-18 15:05:45 UTC (rev 1864) @@ -62,6 +62,7 @@ "xhtml", "mxlm", "dtd", + "jsp", "jspx", "fml", "xsl",

1 0

r1863 - trunk
by tchemit＠users.nuiton.org Oct. 17, 2010

Oct. 17, 2010

Author: tchemit Date: 2010-10-17 03:41:27 +0200 (Sun, 17 Oct 2010) New Revision: 1863 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1863 Log: remove unecessary license plugin Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:38:18 UTC (rev 1862) +++ trunk/pom.xml 2010-10-17 01:41:27 UTC (rev 1863) @@ -348,8 +348,6 @@  <locales>en,fr</locales> -  - <license.licenseName>lgpl_v3</license.licenseName> </properties> <build>

1 0

r1862 - trunk
by tchemit＠users.nuiton.org Oct. 17, 2010

Oct. 17, 2010

Author: tchemit Date: 2010-10-17 03:38:18 +0200 (Sun, 17 Oct 2010) New Revision: 1862 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1862 Log: Update mavenpom4redmineAndCentral to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:13:24 UTC (rev 1861) +++ trunk/pom.xml 2010-10-17 01:38:18 UTC (rev 1862) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <artifactId>maven-license-plugin</artifactId>

1 0