Projects >> clojure-maven-plugin >>5baf76b60d069ebb6d867a60e217fcb4eccda107

Chunk
Conflicting content 
 * @requiresDependencyResolution compile
 */
public class ClojureCompilerMojo extends AbstractClojureCompilerMojo {
<<<<<<< HEAD
=======
    /**
     * Location of the file.
     *
     * @parameter default-value="${project.build.outputDirectory}"
     * @required
     */
    private File outputDirectory;

    /**
     * Base directory of the project.
     *
     * @parameter expression="${basedir}"
     * @required
     * @readonly
     */
    private File baseDirectory;

    /**
     * Location of the source files.
     *
     * @parameter
     */
    private File[] sourceDirectories = new File[] {
        new File(baseDirectory, "src/main/clojure")
    };

    /**
     * Location of the generated source files.
     *
     * @parameter default-value="${project.build.outputDirectory}/../generated-sources"
     * @required
     */
    private File generatedSourceDirectory;

    /**
     * Project classpath.
     *
     * @parameter default-value="${project.compileClasspathElements}"
     * @required
     * @readonly
     */
    private List classpathElements;

    /**
     * Should we compile all namespaces or only those defined?
     * @parameter defaut-value="false"
     */
    private boolean compileDeclaredNamespaceOnly;

    /**
     * A list of namespaces to compile
     *
     * @parameter
     */
    private String[] namespaces;
>>>>>>> 2720e9fff5200bd443fb0d537dd8d975d42c9a0f

    public void execute() throws MojoExecutionException {
        List dirs = new ArrayList();
Solution content 
 * @requiresDependencyResolution compile
 */
public class ClojureCompilerMojo extends AbstractClojureCompilerMojo {

    public void execute() throws MojoExecutionException {
        List dirs = new ArrayList();
File
ClojureCompilerMojo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
 * @requiresDependencyResolution test
 */
public class ClojureGenDocMojo extends AbstractClojureCompilerMojo {
<<<<<<< HEAD
=======
    /**
     * Location of the file.
     *
     * @parameter default-value="${project.build.outputDirectory}"
     * @required
     */
    private File outputDirectory;

    /**
     * Base directory of the project.
     *
     * @parameter expression="${basedir}"
     * @required
     * @readonly
     */
    private File baseDirectory;

    /**
     * Location of the source files.
     *
     * @parameter
     */
    private File[] sourceDirectories = new File[] {
        new File(baseDirectory, "src/main/clojure")
    };

    /**
     * Location of the test source files.
     *
     * @parameter
     */
    private File[] testSourceDirectories = new File[] {
        new File(baseDirectory, "src/test/clojure")
    };

    /**
     * Location of the generated source files.
     *
     * @parameter default-value="${project.build.outputDirectory}/../generated-sources"
     * @required
     */
    private File generatedSourceDirectory;

    /**
     * Project classpath.
     *
     * @parameter default-value="${project.compileClasspathElements}"
     * @required
     * @readonly
     */
    private List classpathElements;

    /**
     * Should we compile all namespaces or only those defined?
     *
     * @parameter defaut-value="false"
     */
    private boolean compileDeclaredNamespaceOnly;
>>>>>>> 2720e9fff5200bd443fb0d537dd8d975d42c9a0f

    /**
     * Should we compile all namespaces or only those defined?
Solution content 
 * @requiresDependencyResolution test
 */
public class ClojureGenDocMojo extends AbstractClojureCompilerMojo {

    /**
     * Should we compile all namespaces or only those defined?
File
ClojureGenDocMojo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
 * @requiresDependencyResolution compile
 */
public class ClojureNailgunMojo extends AbstractClojureCompilerMojo {
<<<<<<< HEAD
=======
    /**
     * Location of the file.
     *
     * @parameter default-value="${project.build.outputDirectory}"
     * @required
     */
    private File outputDirectory;

    /**
     * Base directory of the project.
     *
     * @parameter expression="${basedir}"
     * @required
     * @readonly
     */
    private File baseDirectory;

    /**
     * Location of the source files.
     *
     * @parameter
     */
    private File[] sourceDirectories = new File[] {
        new File(baseDirectory, "src/main/clojure")
    };

    /**
     * Location of the test source files.
     *
     * @parameter
     */
    private File[] testSourceDirectories = new File[] {
        new File(baseDirectory, "src/test/clojure")
    };

    /**
     * Location of the generated source files.
     *
     * @parameter default-value="${project.build.outputDirectory}/../generated-sources"
     * @required
     */
    private File generatedSourceDirectory;

    /**
     * Project classpath.
     *
     * @parameter default-value="${project.compileClasspathElements}"
     * @required
     * @readonly
     */
    private List classpathElements;

>>>>>>> 2720e9fff5200bd443fb0d537dd8d975d42c9a0f

    /**
     * The clojure script to preceding the switch to the repl
Solution content 
 * @requiresDependencyResolution compile
 */
public class ClojureNailgunMojo extends AbstractClojureCompilerMojo {

    /**
     * The clojure script to preceding the switch to the repl
File
ClojureNailgunMojo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
 * @requiresDependencyResolution compile
 */
public class ClojureReplMojo extends AbstractClojureCompilerMojo {
<<<<<<< HEAD
=======
    /**
     * Location of the file.
     *
     * @parameter default-value="${project.build.outputDirectory}"
     * @required
     */
    private File outputDirectory;

    /**
     * Base directory of the project.
     *
     * @parameter expression="${basedir}"
     * @required
     * @readonly
     */
    private File baseDirectory;

    /**
     * Location of the source files.
     *
     * @parameter
     */
    private File[] sourceDirectories = new File[] {
        new File(baseDirectory, "src/main/clojure")
    };

    /**
     * Location of the test source files.
     *
     * @parameter
     */
    private File[] testSourceDirectories = new File[] {
        new File(baseDirectory, "src/test/clojure")
    };

    /**
     * Location of the generated source files.
     *
     * @parameter default-value="${project.build.outputDirectory}/../generated-sources"
     * @required
     */
    private File generatedSourceDirectory;
>>>>>>> 2720e9fff5200bd443fb0d537dd8d975d42c9a0f

    /**
     * The clojure script to preceding the switch to the repl
Solution content 
 * @requiresDependencyResolution compile
 */
public class ClojureReplMojo extends AbstractClojureCompilerMojo {

    /**
     * The clojure script to preceding the switch to the repl
File
ClojureReplMojo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
 * @requiresDependencyResolution compile
 */
public class ClojureRunMojo extends AbstractClojureCompilerMojo {
<<<<<<< HEAD
=======
    /**
     * Location of the file.
     *
     * @parameter default-value="${project.build.outputDirectory}"
     * @required
     */
    private File outputDirectory;

    /**
     * Base directory of the project.
     *
     * @parameter expression="${basedir}"
     * @required
     * @readonly
     */
    private File baseDirectory;

    /**
     * Location of the source files.
     *
     * @parameter
     */
    private File[] sourceDirectories = new File[] {
        new File(baseDirectory, "src/main/clojure")
    };

    /**
     * Location of the generated source files.
     *
     * @parameter default-value="${project.build.outputDirectory}/../generated-sources"
     * @required
     */
    private File generatedSourceDirectory;

    /**
     * Project classpath.
     *
     * @parameter default-value="${project.compileClasspathElements}"
     * @required
     * @readonly
     */
    private List classpathElements;
>>>>>>> 2720e9fff5200bd443fb0d537dd8d975d42c9a0f

    /**
     * The main clojure script to run
Solution content 
 * @requiresDependencyResolution compile
 */
public class ClojureRunMojo extends AbstractClojureCompilerMojo {

    /**
     * The main clojure script to run
File
ClojureRunMojo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
    private boolean skip;

    /**
<<<<<<< HEAD
=======
     * Location of the source files.
     *
     * @parameter default-value="${project.build.testSourceDirectory}"
     * @required
     */
    private File baseTestSourceDirectory;

    /**
     * Base directory of the project.
     *
     * @parameter expression="${basedir}"
     * @required
     * @readonly
     */
    private File baseDirectory;

    /**
     * Location of the source files.
     *
     * @parameter
     */
    private File[] sourceDirectories = new File[] {
        new File(baseDirectory, "src/main/clojure")
    };

    /**
     * Location of the test source files.
     *
     * @parameter
     */
    private File[] testSourceDirectories = new File[] {
        new File(baseDirectory, "src/test/clojure")
    };

    /**
     * Project classpath.
     *
     * @parameter default-value="${project.testClasspathElements}"
     * @required
     * @readonly
     */
    private List classpathElements;

    /**
>>>>>>> 2720e9fff5200bd443fb0d537dd8d975d42c9a0f
     * The main clojure script to run
     *
     * @parameter
Solution content 
    private boolean skip;

    /**
     * The main clojure script to run
     *
     * @parameter
File
ClojureRunTestMojo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
 * @requiresDependencyResolution compile
 */
public class ClojureSwankMojo extends AbstractClojureCompilerMojo {
<<<<<<< HEAD
=======

    /**
     * Base directory of the project.
     *
     * @parameter expression="${basedir}"
     * @required
     * @readonly
     */
    private File baseDirectory;

    /**
     * Location of the file.
     *
     * @parameter default-value="${project.build.outputDirectory}"
     * @required
     */
    private File outputDirectory;

    /**
     * Location of the source files.
     *
     * @parameter
     */
    private File[] sourceDirectories = new File[] {
        new File(baseDirectory, "src/main/clojure")
    };

    /**
     * Location of the test source files.
     *
     * @parameter
     */
    private File[] testSourceDirectories = new File[] {
        new File(baseDirectory, "src/test/clojure")
    };

    /**
     * Location of the generated source files.
     *
     * @parameter default-value="${project.build.outputDirectory}/../generated-sources"
     * @required
     */
    private File generatedSourceDirectory;
>>>>>>> 2720e9fff5200bd443fb0d537dd8d975d42c9a0f

    /**
     * The clojure script to preceding the switch to the repl
Solution content 
 * @requiresDependencyResolution compile
 */
public class ClojureSwankMojo extends AbstractClojureCompilerMojo {

    /**
     * The clojure script to preceding the switch to the repl
File
ClojureSwankMojo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
     */
    private boolean skip;

<<<<<<< HEAD
=======
    /**
     * Base directory of the project.
     *
     * @parameter expression="${basedir}"
     * @required
     * @readonly
     */
    private File baseDirectory;

    /**
     * Location of the source files.
     *
     * @parameter
     */
    private File[] sourceDirectories = new File[] {
        new File(baseDirectory, "src/main/clojure")
    };

    /**
     * Location of the test source files.
     *
     * @parameter
     */
    private File[] testSourceDirectories = new File[] {
        new File(baseDirectory, "src/test/clojure")
    };

    /**
     * Project classpath.
     *
     * @parameter expression="${project.testClasspathElements}"
     * @required
     * @readonly
     */
    private List classpathElements;

    /**
     * Should we compile all namespaces or only those defined?
     * @parameter defaut-value="false"
     */
    private boolean compileDeclaredNamespaceOnly;

    /**
     * A list of namespaces to compile
     *
     * @parameter
     */
    private String[] namespaces;

>>>>>>> 2720e9fff5200bd443fb0d537dd8d975d42c9a0f
    public void execute() throws MojoExecutionException {
        if (skip) {
            getLog().info("Test compiliation is skipped");
Solution content 
     */
    private boolean skip;

    public void execute() throws MojoExecutionException {
        if (skip) {
            getLog().info("Test compiliation is skipped");
File
TestClojureCompilerMojo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation