Re: [jira] Commented: (SCM-80) [patch] update for the release and clearcase plugins

[Wim Deblauwe]

I'm having problems updating the maven-release-plugin to the latest version. I ran 'update' but the PrepareReleaseMojo.java file remains with a red exclamation mark. I don't know how to solve it. When I look at the file, there are sections who looks like this:

    private void writePom( File pomFile, Model model, String versionName )
        throws MojoExecutionException
    {
<<<<<<< .mine
        ScmHelper scm = getScm( basedir.getAbsolutePath() );
=======
        pomFiles.add( pomFile );

        ScmHelper scm = getScm( basedir.getAbsolutePath() );
>>>>>>> .r348924

regards,

Wim

2005/11/25, Emmanuel Venisse <[EMAIL PROTECTED]>:

if you can test with a simple project and with a project with modules, it will be great.

Emmanuel

Wim Deblauwe a écrit :
> Sure, do you have an example project with modules that I can test?
>
> Wim
>
> 2005/11/25, Emmanuel Venisse <[EMAIL PROTECTED]
> <mailto:[EMAIL PROTECTED]>>:
>
>     Wim,
>
>     Can you test it with clearcase?
>
>     Emmanuel
>
>     Wim Deblauwe (JIRA) a écrit :
>      >     [
>     http://jira.codehaus.org/browse/SCM-80?page=comments#action_51978
>     <http://jira.codehaus.org/browse/SCM-80?page=comments#action_51978 > ]
>      >
>      > Wim Deblauwe commented on SCM-80:
>      > ---------------------------------
>      >
>      > Thanks a  million Emmanuel!
>      >
>      >
>      >>[patch] update for the release and clearcase plugins
>      >>----------------------------------------------------
>      >>
>      >>         Key: SCM-80
>      >>         URL: http://jira.codehaus.org/browse/SCM-80
>     <http://jira.codehaus.org/browse/SCM-80>
>      >>     Project: Maven SCM
>      >>        Type: Task
>      >>    Reporter: Wim Deblauwe
>      >>    Assignee: Emmanuel Venisse
>      >>     Fix For: 1.0-beta-2
>      >> Attachments: clearcase-release.patch , release.patch
>      >>
>      >>
>      >>These are 2 patches. One for the release plugin and one for the
>     clearcase plugin to make the release:prepare goal work on clearcase.
>     This has been tested on my machine and it works, so anybody else
>     willing to test this is very welcome.
>      >>regards,
>      >>Wim
>      >
>      >
>
>