Projects >> flexmojos >>2ef4bf4b1f6a33dde13b7c36e25cfc325fcb24e9

Chunk
Conflicting content 
    {
        Artifact artifact;

<<<<<<< HEAD
        Map artifacts =
            ArtifactUtils.artifactMapByVersionlessId( dependencySorter.getTestArtifacts() );
=======
        Map artifacts = ArtifactUtils.artifactMapByVersionlessId( getDependencyArtifacts() );
>>>>>>> e0c6d6fe4f39341f0a0f608f7ac1d03752e0ba76

        Artifact flexunit = (Artifact) artifacts.get( "com.adobe.flexunit:flexunit" );
        if ( flexunit != null )
Solution content 
    {
        Artifact artifact;

        Map artifacts = ArtifactUtils.artifactMapByVersionlessId( getDependencyArtifacts() );

        Artifact flexunit = (Artifact) artifacts.get( "com.adobe.flexunit:flexunit" );
        if ( flexunit != null )
File
TestCompilerMojo.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private File getDestinationFile( Artifact artifact ) throws MojoExecutionException
    {
        File destFile;
        String defaultFinalName = artifact.getArtifactId() + "-" + artifact.getVersion();  
        MavenProject pomProject = getProject( artifact );
        String finalName = pomProject.getBuild().getFinalName();
        if ( finalName.equals( defaultFinalName ) )
        {
             String classifier = StringUtils.isEmpty( artifact.getClassifier() ) ? "" : "-" + artifact.getClassifier();
             String version = stripVersion ? "" : "-" + artifact.getVersion();
             destFile = new File( webappDirectory, artifact.getArtifactId() + version + classifier + "." + SWF );
        }
        else
        {
    	   if ( stripVersion )
    	   {
              getLog().info( "Copying artifact using final name " + finalName + " ignoring strip version" );
           }
           destFile = new File( webappDirectory, finalName + "." + SWF );
        }

=======
    private File getDestinationFile( Artifact artifact )
        throws MojoExecutionException
    {
        MavenProject pomProject = getProject( artifact );
        String fileName;
        if ( !useFinalName )
        {
            String classifier = StringUtils.isEmpty( artifact.getClassifier() ) ? "" : "-" + artifact.getClassifier();
            String version = stripVersion ? "" : "-" + artifact.getVersion();
            fileName = artifact.getArtifactId() + version + classifier + "." + SWF;
        }
        else
        {
            fileName = pomProject.getBuild().getFinalName() + "." + SWF;
        }

        if ( stripVersion && fileName.contains( artifact.getVersion() ) )
        {
            fileName = fileName.replace( artifact.getVersion() + "-", "" );
            fileName = fileName.replace( "-" + artifact.getVersion(), "" );
            fileName = fileName.replace( artifact.getVersion(), "" );
        }

        File destFile = new File( webappDirectory, fileName );

>>>>>>> e0c6d6fe4f39341f0a0f608f7ac1d03752e0ba76
        return destFile;
    }
Solution content 
        }
    }

    private File getDestinationFile( Artifact artifact )
        throws MojoExecutionException
    {
        MavenProject pomProject = getProject( artifact );
        String fileName;
        if ( !useFinalName )
        {
            String classifier = StringUtils.isEmpty( artifact.getClassifier() ) ? "" : "-" + artifact.getClassifier();
            String version = stripVersion ? "" : "-" + artifact.getVersion();
            fileName = artifact.getArtifactId() + version + classifier + "." + SWF;
        }
        else
        {
            fileName = pomProject.getBuild().getFinalName() + "." + SWF;
        }

        if ( stripVersion && fileName.contains( artifact.getVersion() ) )
        {
            fileName = fileName.replace( artifact.getVersion() + "-", "" );
            fileName = fileName.replace( "-" + artifact.getVersion(), "" );
            fileName = fileName.replace( artifact.getVersion(), "" );
        }

        File destFile = new File( webappDirectory, fileName );

        return destFile;
    }
File
CopyMojo.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Method signature
Variable