Re-arrange the directories to keep everything for a package together

1 files changed, 132 insertions, 0 deletions

diff --git a/rules/maven-plugin-tools-api-bootstrap/no-maven-core.patch b/rules/maven-plugin-tools-api-bootstrap/no-maven-core.patch
new file mode 100644
index 0000000..71c0785
--- /dev/null
+++ b/rules/maven-plugin-tools-api-bootstrap/no-maven-core.patch
@@ -0,0 +1,132 @@
+diff -ru maven-plugin-tools-api-bootstrap.orig/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java maven-plugin-tools-api-bootstrap/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
+--- maven-plugin-tools-api-bootstrap.orig/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java	2014-05-30 18:58:10.244445086 -0400
++++ maven-plugin-tools-api-bootstrap/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java	2014-05-30 19:01:13.460785611 -0400
+@@ -23,7 +23,6 @@
+ import org.apache.maven.artifact.repository.ArtifactRepository;
+ import org.apache.maven.plugin.descriptor.MojoDescriptor;
+ import org.apache.maven.plugin.descriptor.PluginDescriptor;
+-import org.apache.maven.project.MavenProject;
+ import org.codehaus.plexus.util.ReaderFactory;
+ import org.codehaus.plexus.util.StringUtils;
+ 
+@@ -46,8 +45,6 @@
+ 
+     private PluginDescriptor pluginDescriptor;
+ 
+-    private MavenProject project;
+-
+     private String encoding = DEFAULT_ENCODING;
+ 
+     private boolean skipErrorNoDescriptorsFound;
+@@ -58,12 +55,6 @@
+ 
+     private ArtifactRepository local;
+ 
+-    public DefaultPluginToolsRequest( MavenProject project, PluginDescriptor pluginDescriptor )
+-    {
+-        this.project = project;
+-        this.pluginDescriptor = pluginDescriptor;
+-    }
+-
+     /**
+      * {@inheritDoc}
+      */
+@@ -81,23 +72,6 @@
+         return this;
+     }
+ 
+-    /**
+-     * {@inheritDoc}
+-     */
+-    public MavenProject getProject()
+-    {
+-        return project;
+-    }
+-
+-    /**
+-     * {@inheritDoc}
+-     */
+-    public PluginToolsRequest setProject( MavenProject project )
+-    {
+-        this.project = project;
+-        return this;
+-    }
+-
+     /**
+      * {@inheritDoc}
+      */
+diff -ru maven-plugin-tools-api-bootstrap.orig/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java maven-plugin-tools-api-bootstrap/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
+--- maven-plugin-tools-api-bootstrap.orig/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java	2014-05-30 18:58:10.241111819 -0400
++++ maven-plugin-tools-api-bootstrap/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java	2014-05-30 19:03:29.248082253 -0400
+@@ -29,7 +29,6 @@
+ 
+ import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
+ import org.apache.maven.plugin.descriptor.MojoDescriptor;
+-import org.apache.maven.project.MavenProject;
+ import org.apache.maven.tools.plugin.PluginToolsRequest;
+ import org.codehaus.plexus.logging.AbstractLogEnabled;
+ import org.codehaus.plexus.util.DirectoryScanner;
+@@ -48,34 +47,7 @@
+     public List<MojoDescriptor> execute( PluginToolsRequest request )
+         throws ExtractionException, InvalidPluginDescriptorException
+     {
+-        getLogger().debug( "Running: " + getClass().getName() );
+-        String metadataExtension = getMetadataFileExtension( request );
+-        String scriptExtension = getScriptFileExtension( request );
+-        
+-        MavenProject project = request.getProject();
+-
+-        @SuppressWarnings( "unchecked" )
+-        Map<String, Set<File>> scriptFilesKeyedByBasedir =
+-            gatherFilesByBasedir( project.getBasedir(), project.getScriptSourceRoots(), scriptExtension, request );
+-
+-        List<MojoDescriptor> mojoDescriptors;
+-        if ( !StringUtils.isEmpty( metadataExtension ) )
+-        {
+-            @SuppressWarnings( "unchecked" )
+-            Map<String, Set<File>> metadataFilesKeyedByBasedir =
+-                gatherFilesByBasedir( project.getBasedir(), project.getScriptSourceRoots(), metadataExtension,
+-                                      request );
+-
+-            mojoDescriptors = extractMojoDescriptorsFromMetadata( metadataFilesKeyedByBasedir, request );
+-        }
+-        else
+-        {
+-            mojoDescriptors = extractMojoDescriptors( scriptFilesKeyedByBasedir, request );
+-        }
+-
+-        copyScriptsToOutputDirectory( scriptFilesKeyedByBasedir, project.getBuild().getOutputDirectory(), request );
+-
+-        return mojoDescriptors;
++        throw new RuntimeException("Not implemented");
+     }
+ 
+     /**
+diff -ru maven-plugin-tools-api-bootstrap.orig/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java maven-plugin-tools-api-bootstrap/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java
+--- maven-plugin-tools-api-bootstrap.orig/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java	2014-05-30 18:58:10.237778553 -0400
++++ maven-plugin-tools-api-bootstrap/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java	2014-05-30 19:00:29.474997263 -0400
+@@ -23,7 +23,6 @@
+ import org.apache.maven.artifact.repository.ArtifactRepository;
+ import org.apache.maven.plugin.descriptor.MojoDescriptor;
+ import org.apache.maven.plugin.descriptor.PluginDescriptor;
+-import org.apache.maven.project.MavenProject;
+ 
+ import java.util.List;
+ import java.util.Set;
+@@ -39,16 +38,6 @@
+ {
+ 
+     /**
+-     * Return the current {@link MavenProject} instance in use.
+-     */
+-    MavenProject getProject();
+-
+-    /**
+-     * @see PluginToolsRequest#getProject()
+-     */
+-    PluginToolsRequest setProject( MavenProject project );
+-
+-    /**
+      * Return the {@link PluginDescriptor} currently being populated as part of the build of the
+      * current plugin project.
+      */