diff --git a/maven-plugin-testing-harness/pom.xml b/maven-plugin-testing-harness/pom.xml index 6abb84a..c7dc1c4 100644 --- a/maven-plugin-testing-harness/pom.xml +++ b/maven-plugin-testing-harness/pom.xml @@ -19,14 +19,19 @@ --> 4.0.0 + org.apache.maven maven-plugin-tools 2.4-SNAPSHOT + maven-plugin-testing-harness Maven Plugin Testing Mechanism + The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo. + + org.apache.maven maven-project @@ -37,44 +42,26 @@ maven-core 2.0 - - junit - junit - 3.8.1 - + + org.codehaus.plexus plexus-utils - 1.4.5 org.codehaus.plexus plexus-archiver 1.0-alpha-7 + + + + junit + junit + 3.8.1 + - - - - org.apache.maven.plugins - maven-jxr-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - http://java.sun.com/j2se/1.4.2/docs/api/ - http://maven.apache.org/ref/current/maven-project/apidocs/ - http://maven.apache.org/ref/current/maven-plugin-api/apidocs/ - http://maven.apache.org/ref/current/maven-artifact/apidocs/ - http://plexus.codehaus.org/plexus-utils/apidocs/ - http://www.junit.org/junit/javadoc/ - - - - - + diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml index b001457..bc9d0a9 100755 --- a/maven-plugin-tools-ant/pom.xml +++ b/maven-plugin-tools-ant/pom.xml @@ -20,14 +20,18 @@ --> + 4.0.0 + maven-plugin-tools org.apache.maven 2.4-SNAPSHOT - 4.0.0 + maven-plugin-tools-ant - Maven Ant Plugin Tools + Maven Plugin Tool for Ant + Ant extractor plugin tool. + org.apache.maven diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml index 3644cb4..e799583 100644 --- a/maven-plugin-tools-api/pom.xml +++ b/maven-plugin-tools-api/pom.xml @@ -20,14 +20,18 @@ --> + 4.0.0 + maven-plugin-tools org.apache.maven 2.4-SNAPSHOT - 4.0.0 + maven-plugin-tools-api Maven Plugin Tools APIs + The Maven Plugin Tools APIs provides APIs to extracte Maven 2 Plugins informations and generate documentation. + org.apache.maven diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java index 75d0098..caa178a 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java @@ -37,6 +37,7 @@ import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringInputStream; import org.codehaus.plexus.util.StringOutputStream; import org.codehaus.plexus.util.StringUtils; +import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter; import org.codehaus.plexus.util.xml.XMLWriter; import org.w3c.tidy.Tidy; @@ -143,7 +144,7 @@ public class PluginXdocGenerator w.startElement( "p" ); w.writeMarkup( mojoDescriptor.getPluginDescriptor().getGroupId() + ":" + mojoDescriptor.getPluginDescriptor().getArtifactId() + ":" - + mojoDescriptor.getPluginDescriptor().getVersion() + ":" + mojoDescriptor.getFullGoalName() ); + + mojoDescriptor.getPluginDescriptor().getVersion() + ":" + mojoDescriptor.getGoal() ); w.endElement(); //p w.startElement( "p" ); diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PrettyPrintXMLWriter.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PrettyPrintXMLWriter.java deleted file mode 100644 index 0d5e87f..0000000 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PrettyPrintXMLWriter.java +++ /dev/null @@ -1,185 +0,0 @@ -package org.apache.maven.tools.plugin.generator; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.PrintWriter; -import java.io.Writer; - -/** - * Copied from plexus-utils 1.3-SNAPSHOT as we can't upgrade it yet. - * This class can be removed when a newer version of plexus-utils is included with Maven - * - * @see org.codehaus.plexus.util.xml.PrettyPrintXMLWriter - */ -public class PrettyPrintXMLWriter - extends org.codehaus.plexus.util.xml.PrettyPrintXMLWriter -{ - - private static final String LS = System.getProperty( "line.separator" ); - - private PrintWriter writer; - - private String lineIndenter; - - private int depth; - - public PrettyPrintXMLWriter( PrintWriter writer, String lineIndenter ) - { - this( writer, lineIndenter, null, null ); - } - - public PrettyPrintXMLWriter( Writer writer, String lineIndenter ) - { - this( new PrintWriter( writer ), lineIndenter ); - } - - public PrettyPrintXMLWriter( PrintWriter writer ) - { - this( writer, null, null ); - } - - public PrettyPrintXMLWriter( Writer writer ) - { - this( new PrintWriter( writer ) ); - } - - public PrettyPrintXMLWriter( PrintWriter writer, String lineIndenter, String encoding, String doctype ) - { - super( writer, lineIndenter, encoding, doctype ); - - setWriter( writer ); - - setLineIndenter( lineIndenter ); - } - - public PrettyPrintXMLWriter( Writer writer, String lineIndenter, String encoding, String doctype ) - { - this( new PrintWriter( writer ), lineIndenter, encoding, doctype ); - } - - public PrettyPrintXMLWriter( PrintWriter writer, String encoding, String doctype ) - { - this( writer, " ", encoding, doctype ); - } - - public PrettyPrintXMLWriter( Writer writer, String encoding, String doctype ) - { - this( new PrintWriter( writer ), encoding, doctype ); - } - - /** - * Write a string to the underlying writer - * - * @param str - */ - private void write( String str ) - { - getWriter().write( str ); - } - - /** - * Get the string used as line indenter - * - * @return the line indenter - */ - protected String getLineIndenter() - { - return lineIndenter; - } - - /** - * Set the string used as line indenter - * - * @param lineIndenter - */ - protected void setLineIndenter( String lineIndenter ) - { - this.lineIndenter = lineIndenter; - } - - /** - * Write the end of line character (using system line separator) - * and start new line with indentation - */ - protected void endOfLine() - { - write( LS ); - - for ( int i = 0; i < getDepth(); i++ ) - { - write( getLineIndenter() ); - } - } - - /** - * Set the underlying writer - * - * @param writer - */ - protected void setWriter( PrintWriter writer ) - { - this.writer = writer; - } - - /** - * Get the underlying writer - * - * @return the underlying writer - */ - protected PrintWriter getWriter() - { - return writer; - } - - /** - * Set the current depth in the xml indentation - * - * @param depth - */ - protected void setDepth( int depth ) - { - this.depth = depth; - } - - /** - * Get the current depth in the xml indentation - * - * @return - */ - protected int getDepth() - { - return depth; - } - - public void startElement( String name ) - { - super.startElement( name ); - - setDepth( getDepth() + 1 ); - } - - public void endElement() - { - super.endElement(); - - setDepth( getDepth() - 1 ); - } - -} diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java index 34afa9b..04c2497 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java @@ -27,10 +27,13 @@ import org.apache.maven.model.Dependency; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.codehaus.plexus.component.repository.ComponentDependency; import org.codehaus.plexus.util.DirectoryScanner; +import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.XMLWriter; /** + * Convenience methods to play with Maven plugins. + * * @author jdcasey * @version $Id$ */ @@ -41,11 +44,22 @@ public final class PluginUtils // nop } + /** + * @param basedir + * @param include + * @return list of included files with default SCM excluded files + */ public static String[] findSources( String basedir, String include ) { return PluginUtils.findSources( basedir, include, null ); } + /** + * @param basedir + * @param include + * @param exclude + * @return list of included files + */ public static String[] findSources( String basedir, String include, String exclude ) { DirectoryScanner scanner = new DirectoryScanner(); @@ -53,12 +67,11 @@ public final class PluginUtils scanner.setIncludes( new String[] { include } ); if ( !StringUtils.isEmpty( exclude ) ) { - // TODO: need default excludes in scanner - scanner.setExcludes( new String[] { exclude, "**/.svn/**" } ); + scanner.setExcludes( new String[] { exclude, StringUtils.join( FileUtils.getDefaultExcludes(), "," ) } ); } else { - scanner.setExcludes( new String[] { "**/.svn/**" } ); + scanner.setExcludes( FileUtils.getDefaultExcludes() ); } scanner.scan(); @@ -66,6 +79,10 @@ public final class PluginUtils return scanner.getIncludedFiles(); } + /** + * @param w not null writer + * @param pluginDescriptor not null + */ public static void writeDependencies( XMLWriter w, PluginDescriptor pluginDescriptor ) { w.startElement( "dependencies" ); @@ -90,6 +107,10 @@ public final class PluginUtils w.endElement(); } + /** + * @param dependencies not null list of Dependency + * @return list of component dependencies + */ public static List toComponentDependencies( List dependencies ) { List componentDeps = new LinkedList(); @@ -111,7 +132,12 @@ public final class PluginUtils return componentDeps; } - private static void element( XMLWriter w, String name, String value ) + /** + * @param w not null writer + * @param name + * @param value + */ + public static void element( XMLWriter w, String name, String value ) { w.startElement( name ); diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml index 4bd82aa..4a1ac53 100644 --- a/maven-plugin-tools-beanshell/pom.xml +++ b/maven-plugin-tools-beanshell/pom.xml @@ -20,27 +20,31 @@ --> + 4.0.0 + maven-plugin-tools org.apache.maven 2.4-SNAPSHOT - 4.0.0 + maven-plugin-tools-beanshell - Maven Plugin Tools for Beanshell + Maven Plugin Tool for Beanshell + Beanshell extractor plugin tool. + org.apache.maven maven-plugin-tools-api + + org.apache.maven + maven-plugin-descriptor + bsh bsh 1.3.0 - - org.apache.maven - maven-plugin-descriptor - diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml index c866941..394f980 100644 --- a/maven-plugin-tools-java/pom.xml +++ b/maven-plugin-tools-java/pom.xml @@ -20,14 +20,18 @@ --> + 4.0.0 + maven-plugin-tools org.apache.maven 2.4-SNAPSHOT - 4.0.0 + maven-plugin-tools-java - Maven Plugin Tools for Java + Maven Plugin Tool for Java + Java extractor plugin tool. + org.apache.maven diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml index fce22bd..08281ac 100755 --- a/maven-plugin-tools-model/pom.xml +++ b/maven-plugin-tools-model/pom.xml @@ -20,20 +20,23 @@ --> + 4.0.0 + maven-plugin-tools org.apache.maven 2.4-SNAPSHOT - 4.0.0 + maven-plugin-tools-model Maven Plugin Metadata Model + org.codehaus.modello modello-maven-plugin - 1.0-alpha-14 + 1.0-alpha-18 src/main/mdo/plugin-metadata.mdo 1.0.0 @@ -50,6 +53,7 @@ + org.apache.maven diff --git a/pom.xml b/pom.xml index fe8f1b5..b02f3ad 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,5 @@ + + - + 4.0.0 + maven-parent org.apache.maven 7 ../pom/maven/pom.xml + org.apache.maven maven-plugin-tools - pom - Maven Plugin Tools 2.4-SNAPSHOT - The Maven Plugin Tools contain the necessary tools to be able to produce Maven 2 Plugins in a variety of languages. + pom + + Maven Plugin Tools + The Maven Plugin Tools contains the necessary tools to be able to produce Maven 2 Plugins in a variety of languages. http://maven.apache.org/plugin-tools/ + 2004 + + + 2.0.6 + + jira http://jira.codehaus.org/browse/MPLUGIN - 2004 + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/ scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/ http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/trunk + Maven User List @@ -53,6 +64,7 @@ http://www.mail-archive.com/users@maven.apache.org/ http://www.nabble.com/Maven---Users-f178.html + http://maven.users.markmail.org/ @@ -61,38 +73,68 @@ dev-unsubscribe@maven.apache.org dev@maven.apache.org http://mail-archives.apache.org/mod_mbox/maven-dev + + http://www.mail-archive.com/dev@maven.apache.org/ + http://www.nabble.com/Maven-Developers-f179.html + http://maven.dev.markmail.org/ + + + + Maven Issues List + issues-subscribe@maven.apache.org + issues-unsubscribe@maven.apache.org + http://mail-archives.apache.org/mod_mbox/maven-issues/ + + http://www.mail-archive.com/issues@maven.apache.org + http://www.nabble.com/Maven---Issues-f15573.html + http://maven.issues.markmail.org/ + Maven Commits List commits-subscribe@maven.apache.org commits-unsubscribe@maven.apache.org - commits@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-dev + http://mail-archives.apache.org/mod_mbox/maven-commits + + http://www.mail-archive.com/commits@maven.apache.org + http://www.nabble.com/Maven---Commits-f15575.html + http://maven.commits.markmail.org/ + - + + Maven Announcements List announce@maven.apache.org announce-subscribe@maven.apache.org announce-unsubscribe@maven.apache.org http://mail-archives.apache.org/mod_mbox/maven-announce/ - - - Maven Issues List - issues@maven.apache.org - issues-subscribe@maven.apache.org - issues-unsubscribe@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-issues/ + + http://www.mail-archive.com/announce@maven.apache.org + http://www.nabble.com/Maven-Announcements-f15617.html + http://maven.announce.markmail.org/ + Maven Notifications List - notifications@maven.apache.org notifications-subscribe@maven.apache.org notifications-unsubscribe@maven.apache.org http://mail-archives.apache.org/mod_mbox/maven-notifications/ + + http://www.mail-archive.com/notifications@maven.apache.org + http://www.nabble.com/Maven---Notifications-f15574.html + http://maven.notifications.markmail.org/ + + + + + apache.website + scp://people.apache.org/www/maven.apache.org/plugin-tools/ + + + @@ -112,6 +154,7 @@ + maven-plugin-plugin maven-plugin-tools-api @@ -121,8 +164,10 @@ maven-plugin-tools-ant maven-plugin-testing-harness + + org.apache.maven maven-plugin-tools-api @@ -148,10 +193,12 @@ maven-plugin-descriptor 2.0.5 + + org.codehaus.plexus plexus-utils - 1.1 + 1.4.9 org.codehaus.plexus