Projects >> maven-marklogic-plugin >>e076134ca59d19a2fbed90f94769b06b1bd9df8e

Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    /**
     * Invoke server modules.
     *
     * TODO: Create configuration object instead of using PlexusConfiguration - ModuleExecution perhaps.
     */
    protected void invokeModules() {
=======
    protected void invokeModules() throws MojoExecutionException {
>>>>>>> b6602a01aa03b5f3c8190391dd2c3bebf1461078
        PlexusConfiguration invokes = getCurrentEnvironment().getModuleInvokes();

        if (invokes == null || invokes.getChildCount() == 0) {
Solution content 
        }
    }

    /**
     * Invoke server modules.
     *
     * TODO: Create configuration object instead of using PlexusConfiguration - ModuleExecution perhaps.
     */
    protected void invokeModules() throws MojoExecutionException {
        PlexusConfiguration invokes = getCurrentEnvironment().getModuleInvokes();

        if (invokes == null || invokes.getChildCount() == 0) {
File
AbstractInstallMojo.java
Developer's decision
Combination
Kind of conflict
Comment
Method signature
Chunk
Conflicting content 
                	getLog().info(item.asString());
                }
            } catch (PlexusConfigurationException e) {
<<<<<<< HEAD
                getLog().error(e);
            } catch (RequestException e) {
                getLog().error(e);
=======
            	e.printStackTrace();
                throw new MojoExecutionException(e.getLocalizedMessage(), e);
            } catch (RequestException e) {
            	e.printStackTrace();
                throw new MojoExecutionException(e.getLocalizedMessage(), e);
>>>>>>> b6602a01aa03b5f3c8190391dd2c3bebf1461078
            }
        }
    }
Solution content 
                	getLog().info(item.asString());
                }
            } catch (PlexusConfigurationException e) {
                getLog().error(e);
                throw new MojoExecutionException(e.getLocalizedMessage(), e);
            } catch (RequestException e) {
                getLog().error(e);
                throw new MojoExecutionException(e.getLocalizedMessage(), e);
            }
        }
    }
File
AbstractInstallMojo.java
Developer's decision
Combination
Kind of conflict
Catch clause
Method invocation
Throw statement