Projects >> maven-mule-plugin >>f7823b459ed3ea7d5fb489a89d3391c451179a00

Chunk
Conflicting content 
    {
        addLib(file,file.getName());
    }
<<<<<<< HEAD
    public void addLib(final File file,final String fileName) throws ArchiverException
    {
        addFile(file, LIB_LOCATION +fileName);
    }
    
=======

    public void addLibraryArtifact(final Artifact artifact) throws ArchiverException
    {
        String filename = filenameInArchive(artifact);
        addFile(artifact.getFile(), filename);
    }

    private String filenameInArchive(Artifact artifact)
    {
        StringBuilder buf = new StringBuilder(LIB_LOCATION);
        if (prependGroupId)
        {
            buf.append(artifact.getGroupId());
            buf.append(".");
        }
        buf.append(artifact.getFile().getName());
        return buf.toString();
    }

>>>>>>> 5647e29ed7fa063329e59a10607bf4b4d54ada87
    public void addLibs(final File directoryName, final String[] includes, final String[] excludes) throws ArchiverException
    {
        addDirectory(directoryName, LIB_LOCATION, includes, addDefaultExcludes(excludes));
Solution content 
    {
        addFile(file, LIB_LOCATION + file.getName());
    }

    public void addLibraryArtifact(final Artifact artifact) throws ArchiverException
    {
        String filename = filenameInArchive(artifact);
        addFile(artifact.getFile(), filename);
    }

    private String filenameInArchive(Artifact artifact)
    {
        StringBuilder buf = new StringBuilder(LIB_LOCATION);
        if (prependGroupId)
        {
            buf.append(artifact.getGroupId());
            buf.append(".");
        }
        buf.append(artifact.getFile().getName());
        return buf.toString();
    }

    public void addLibs(final File directoryName, final String[] includes, final String[] excludes) throws ArchiverException
    {
        addDirectory(directoryName, LIB_LOCATION, includes, addDefaultExcludes(excludes));
File
MuleArchiver.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
        {
            String message = String.format("Adding <%1s> as a lib", artifact.getId());
            getLog().info(message);
<<<<<<< HEAD
            File file = artifact.getFile();
            if(prependGroupId){
            	archiver.addLib(file,artifact.getGroupId()+"."+file.getName());
            }
            else {
            	archiver.addLib(file);
            }
            
=======

            archiver.addLibraryArtifact(artifact);
>>>>>>> 5647e29ed7fa063329e59a10607bf4b4d54ada87
        }
    }
Solution content 
        {
            String message = String.format("Adding <%1s> as a lib", artifact.getId());
            getLog().info(message);

            archiver.addLibraryArtifact(artifact);
        }
    }
File
MuleMojo.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable