Git Plugin with push merges back + Release plugin

classic Classic list List threaded Threaded
11 messages Options
Reply | Threaded
Open this post in threaded view
|

Git Plugin with push merges back + Release plugin

Johannes Schneider
Hi,

I have successfully introduced merge before build and push merges back
to origin. Thanks for the great work! Really love it.

Unfortunately I am not able to release using the Maven Release plugin.

I don't know wheter the error might be. The revision
37dcb17e54fd1c10512a6017d4d1c8ac23669179 is the head of both the master
and the pu branch.
I have configured maven to merge pu to master and push master then back
to origin...


This is the result:


[INFO]
------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO]
------------------------------------------------------------------------
[INFO] Unable to commit files
Provider message:
The git-push command failed.
Command output:
To ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
 ! [rejected]        master -> master (non-fast forward)
error: failed to push some refs to
'ssh://git.cedarsoft.com/git/com.cedarsoft.serialization'




At the beginning, everything looks good:

Started by user johannes
Checkout:workspace /
/var/lib/hudson/jobs/com.cedarsoft.serialization/workspace -
hudson.remoting.LocalChannel@24d3e83f
Last Build : #75
Last Built Revision: Revision 37dcb17e54fd1c10512a6017d4d1c8ac23669179
(origin/pu )
Checkout:workspace /
/var/lib/hudson/jobs/com.cedarsoft.serialization/workspace -
hudson.remoting.LocalChannel@24d3e83f
Fetching changes from the remote Git repository
Fetching upstream changes from
ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
[workspace] $ git fetch
ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
+refs/heads/*:refs/remotes/origin/*
[workspace] $ git ls-tree HEAD
Seen branch in repository origin/master
Seen branch in repository origin/pu
Commencing build of Revision 37dcb17e54fd1c10512a6017d4d1c8ac23669179
(origin/pu )
Merging Revision 37dcb17e54fd1c10512a6017d4d1c8ac23669179 (origin/pu )
onto master
[workspace] $ git rev-parse master
[workspace] $ git checkout -f 265bda79ff838b1fe36966c3478329c64e4acb65
[workspace] $ git merge 37dcb17e54fd1c10512a6017d4d1c8ac23669179
[workspace] $ git tag -a -f -m "Hudson Build #76"
hudson-com.cedarsoft.serialization-76
Warning : There are multiple branch changesets here
[workspace] $ git log --numstat -M --summary --pretty=raw
37dcb17e54fd1c10512a6017d4d1c8ac23669179..37dcb17e54fd1c10512a6017d4d1c8ac23669179
Seen branch in repository origin/master
Seen branch in repository origin/pu
Parsing POMs



Regards,

Johannes

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Nigel Magnay
Does the git provider in maven actually work with maven release?

I thought it was fairly tied to the SVN world view, where release:prepare committed 2 further changes (1 in a branch for the release, 1 to 'trunk' ) and it tries to do a 'push' during this process (because in SVN you don't have local branches...)

This may have been fixed - but it's worth a try..

On Thu, Jan 7, 2010 at 5:00 PM, Johannes Schneider <[hidden email]> wrote:
Hi,

I have successfully introduced merge before build and push merges back
to origin. Thanks for the great work! Really love it.

Unfortunately I am not able to release using the Maven Release plugin.

I don't know wheter the error might be. The revision
37dcb17e54fd1c10512a6017d4d1c8ac23669179 is the head of both the master
and the pu branch.
I have configured maven to merge pu to master and push master then back
to origin...


This is the result:


[INFO]
------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO]
------------------------------------------------------------------------
[INFO] Unable to commit files
Provider message:
The git-push command failed.
Command output:
To ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
 ! [rejected]        master -> master (non-fast forward)
error: failed to push some refs to
'ssh://git.cedarsoft.com/git/com.cedarsoft.serialization'




At the beginning, everything looks good:

Started by user johannes
Checkout:workspace /
/var/lib/hudson/jobs/com.cedarsoft.serialization/workspace -
hudson.remoting.LocalChannel@24d3e83f
Last Build : #75
Last Built Revision: Revision 37dcb17e54fd1c10512a6017d4d1c8ac23669179
(origin/pu )
Checkout:workspace /
/var/lib/hudson/jobs/com.cedarsoft.serialization/workspace -
hudson.remoting.LocalChannel@24d3e83f
Fetching changes from the remote Git repository
Fetching upstream changes from
ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
[workspace] $ git fetch
ssh://<a href="http://git.cedarsoft.com/git/com.cedarsoft.serialization +refs/heads/*:refs/remotes/origin/*" target="_blank">git.cedarsoft.com/git/com.cedarsoft.serialization
+refs/heads/*:refs/remotes/origin/*
[workspace] $ git ls-tree HEAD
Seen branch in repository origin/master
Seen branch in repository origin/pu
Commencing build of Revision 37dcb17e54fd1c10512a6017d4d1c8ac23669179
(origin/pu )
Merging Revision 37dcb17e54fd1c10512a6017d4d1c8ac23669179 (origin/pu )
onto master
[workspace] $ git rev-parse master
[workspace] $ git checkout -f 265bda79ff838b1fe36966c3478329c64e4acb65
[workspace] $ git merge 37dcb17e54fd1c10512a6017d4d1c8ac23669179
[workspace] $ git tag -a -f -m "Hudson Build #76"
hudson-com.cedarsoft.serialization-76
Warning : There are multiple branch changesets here
[workspace] $ git log --numstat -M --summary --pretty=raw
37dcb17e54fd1c10512a6017d4d1c8ac23669179..37dcb17e54fd1c10512a6017d4d1c8ac23669179
Seen branch in repository origin/master
Seen branch in repository origin/pu
Parsing POMs



Regards,

Johannes

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]


Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Peter Collingbourne
In reply to this post by Johannes Schneider
On Thu, Jan 07, 2010 at 06:00:47PM +0100, Johannes Schneider wrote:

> Hi,
>
> I have successfully introduced merge before build and push merges back
> to origin. Thanks for the great work! Really love it.
>
> Unfortunately I am not able to release using the Maven Release plugin.
>
> I don't know wheter the error might be. The revision
> 37dcb17e54fd1c10512a6017d4d1c8ac23669179 is the head of both the master
> and the pu branch.
> I have configured maven to merge pu to master and push master then back
> to origin...
...
> The git-push command failed.
> Command output:
> To ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
>  ! [rejected]        master -> master (non-fast forward)
> error: failed to push some refs to
> 'ssh://git.cedarsoft.com/git/com.cedarsoft.serialization'

Hi Johannes,

The problem appears to be due to a known bug in the git plugin.
Further details and a patch:

http://issues.hudson-ci.org/browse/HUDSON-4805

You can either use the patch in the bug report or a more elaborate
fix in the current development version:

git://github.com/magnayn/Hudson-GIT-plugin.git

(the specific commit that fixes the bug is
abf5d3395cc7320a436392ad36a5600e143dde72 should you wish to be
selective)

Thanks,
--
Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Johannes Schneider
In reply to this post by Nigel Magnay
On 01/07/2010 06:29 PM, Nigel Magnay wrote:
> Does the git provider in maven actually work with maven release?

Yes, that works well. I can release a new version with my desktop
without any problems. This was a problem about a year ago.

> I thought it was fairly tied to the SVN world view, where
> release:prepare committed 2 further changes (1 in a branch for the
> release, 1 to 'trunk' ) and it tries to do a 'push' during this process
> (because in SVN you don't have local branches...)

With git there aren't any branches created. Just some commits and a push.

>
> This may have been fixed - but it's worth a try..
>
> On Thu, Jan 7, 2010 at 5:00 PM, Johannes Schneider
> <[hidden email] <mailto:[hidden email]>> wrote:
>
>     Hi,
>
>     I have successfully introduced merge before build and push merges back
>     to origin. Thanks for the great work! Really love it.
>
>     Unfortunately I am not able to release using the Maven Release plugin.
>
>     I don't know wheter the error might be. The revision
>     37dcb17e54fd1c10512a6017d4d1c8ac23669179 is the head of both the master
>     and the pu branch.
>     I have configured maven to merge pu to master and push master then back
>     to origin...
>
>
>     This is the result:
>
>
>     [INFO]
>     ------------------------------------------------------------------------
>     [ERROR] BUILD FAILURE
>     [INFO]
>     ------------------------------------------------------------------------
>     [INFO] Unable to commit files
>     Provider message:
>     The git-push command failed.
>     Command output:
>     To ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
>     <http://git.cedarsoft.com/git/com.cedarsoft.serialization>
>      ! [rejected]        master -> master (non-fast forward)
>     error: failed to push some refs to
>     'ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
>     <http://git.cedarsoft.com/git/com.cedarsoft.serialization>'
>
>
>
>
>     At the beginning, everything looks good:
>
>     Started by user johannes
>     Checkout:workspace /
>     /var/lib/hudson/jobs/com.cedarsoft.serialization/workspace -
>     hudson.remoting.LocalChannel@24d3e83f
>     Last Build : #75
>     Last Built Revision: Revision 37dcb17e54fd1c10512a6017d4d1c8ac23669179
>     (origin/pu )
>     Checkout:workspace /
>     /var/lib/hudson/jobs/com.cedarsoft.serialization/workspace -
>     hudson.remoting.LocalChannel@24d3e83f
>     Fetching changes from the remote Git repository
>     Fetching upstream changes from
>     ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
>     <http://git.cedarsoft.com/git/com.cedarsoft.serialization>
>     [workspace] $ git fetch
>     ssh://git.cedarsoft.com/git/com.cedarsoft.serialization
>     +refs/heads/*:refs/remotes/origin/*
>     <http://git.cedarsoft.com/git/com.cedarsoft.serialization
>     +refs/heads/*:refs/remotes/origin/*>
>     [workspace] $ git ls-tree HEAD
>     Seen branch in repository origin/master
>     Seen branch in repository origin/pu
>     Commencing build of Revision 37dcb17e54fd1c10512a6017d4d1c8ac23669179
>     (origin/pu )
>     Merging Revision 37dcb17e54fd1c10512a6017d4d1c8ac23669179 (origin/pu )
>     onto master
>     [workspace] $ git rev-parse master
>     [workspace] $ git checkout -f 265bda79ff838b1fe36966c3478329c64e4acb65
>     [workspace] $ git merge 37dcb17e54fd1c10512a6017d4d1c8ac23669179
>     [workspace] $ git tag -a -f -m "Hudson Build #76"
>     hudson-com.cedarsoft.serialization-76
>     Warning : There are multiple branch changesets here
>     [workspace] $ git log --numstat -M --summary --pretty=raw
>     37dcb17e54fd1c10512a6017d4d1c8ac23669179..37dcb17e54fd1c10512a6017d4d1c8ac23669179
>     Seen branch in repository origin/master
>     Seen branch in repository origin/pu
>     Parsing POMs
>
>
>
>     Regards,
>
>     Johannes
>
>     ---------------------------------------------------------------------
>     To unsubscribe, e-mail: [hidden email]
>     <mailto:[hidden email]>
>     For additional commands, e-mail: [hidden email]
>     <mailto:[hidden email]>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Johannes Schneider
In reply to this post by Peter Collingbourne
On 01/07/2010 06:33 PM, Peter Collingbourne wrote:
> The problem appears to be due to a known bug in the git plugin.
> Further details and a patch:
>
> http://issues.hudson-ci.org/browse/HUDSON-4805

I will wait for the next release. Hope that will be soon?


Thanks,

Johannes

>
> You can either use the patch in the bug report or a more elaborate
> fix in the current development version:
>
> git://github.com/magnayn/Hudson-GIT-plugin.git
>
> (the specific commit that fixes the bug is
> abf5d3395cc7320a436392ad36a5600e143dde72 should you wish to be
> selective)
>
> Thanks,

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Nigel Magnay
In reply to this post by Johannes Schneider
On Thu, Jan 7, 2010 at 7:37 PM, Johannes Schneider <[hidden email]> wrote:
On 01/07/2010 06:29 PM, Nigel Magnay wrote:
> Does the git provider in maven actually work with maven release?

Yes, that works well. I can release a new version with my desktop
without any problems. This was a problem about a year ago.

 
Ah - cool - the last time I tried, it still bombed out.

Rather nicely, it does now work; so much so that I was able to use release:perform to issue an 0.8 update of the git plugin. This should appear in the next few hours on the update site.

Summary of changes:

git shortlog git-0.7.3..git-0.8
Ishaaq Chandy (12):
      Fix serialization problem
      Enabled api calls to the git plugin
      minor compiler warning, codestyle fixes  - removed redundant import statements  - added servial version ids to serializable classes
      Issue 3353: we should fetch all tags and be able to build from tags not just branches.
      Refactoring: migrated away from deprecated APIs.
      Moved the call to computer.currentComputer() to before the  the polling executor.
      Sometimes (especially in cases where branches have been rebased) the plugin is unable to work out the changeset - it should not fail the build just because of this.
      Fixed bug I introduced a few commits ago. doh!
      ability to init a repo. more consise launch method calls
      Added tests for GitSCM. Currently only testing simple project configuration, more detailed testing around complex projects with multiple repos, multiple branch specs and non-default refspecs would be nice to have as well...
      more error logging
      fixed regression and added test for it

Josh Beitelspacher (5):
      Improve change set displays
      Add clean option
      Clone BuildData before making changes
      Set user email from Git email
      Add simple usecase support to BuildChooser

Kohsuke Kawaguchi (1):
      [FIXED HUDSON-4885] applied a patch from pcc

Nigel Magnay (9):
      Add a note to SVN users to beware of being mastered in git now.
      Add eclipse project files and maven target directory to .gitignore
      Add code to allow migration from old config to new config with a version number so it's easier to detect what needs to be done.
      Issue 4193 - Change log enhancements to display affected file paths.
      Update to Hudson 1.322
      From: Mike Robinet <[hidden email]>
      Merge branch 'patches''
      Create a parallel release branch, to cut releases from directly from GIT rather than hassle with SVN.
      [maven-release-plugin] prepare release git-0.8

Peter Collingbourne (4):
      [FIXED HUDSON-4805] Allow the user to specify which remote repository is merged and pushed to
      [FIXED HUDSON-5003] Implemented MockStaplerRequest.getOriginalRestOfPath and getStapler
      [FIXED HUDSON-5006] Build the same commit as the parent if this is a matrix build
      Obtain workspace, gitExe and environment on the master as this information is not available on the slave

R. Tyler Ballance (1):
      Add the ~/.m2/settings.xml that I needed on my fresh Linux machine in order to properly build the plugin standalone

david_calavera (3):
      snapshot needed to release it, scm config is inherited from the parent project
      [maven-release-plugin] prepare release git-0.7.3
      [maven-release-plugin] prepare for next development iteration

kohsuke (11):
      bumping up POM version
      bumping up POM version
      bumping up POM version
      bumping up POM version
      bumping up POM version
      bumping up POM version
      bumping up POM version
      bumping up POM version
      bumping up POM version
      bumping up POM version
      bumping up POM version

mdonohue (1):
      Fix issue 4028 This propagates the Hudson environment to the execution steps of the git plugin


HTH!

Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Mark Waite


From: Nigel Magnay <[hidden email]>
To: [hidden email]
Sent: Thu, January 7, 2010 2:32:31 PM
Subject: Re: Git Plugin with push merges back + Release plugin

On Thu, Jan 7, 2010 at 7:37 PM, Johannes Schneider <[hidden email]> wrote:
On 01/07/2010 06:29 PM, Nigel Magnay wrote:
> Does the git provider in maven actually work with maven release?

Yes, that works well. I can release a new version with my desktop
without any problems. This was a problem about a year ago.

 
Ah - cool - the last time I tried, it still bombed out.

Rather nicely, it does now work; so much so that I was able to use release:perform to issue an 0.8 update of the git plugin. This should appear in the next few hours on the update site.


I was hoping to see the new version of the Git plugin visible from the Update Center in my Hudson installation.  Unfortunately, it does not appear from any of the servers I have running.  Are others seeing it in their Update Center?

Mark Waite



Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Nigel Magnay
It definitely hit the site:

How does the update site generate the list?



On Fri, Jan 8, 2010 at 2:10 PM, Mark Waite <[hidden email]> wrote:


From: Nigel Magnay <[hidden email]>
To: [hidden email]
Sent: Thu, January 7, 2010 2:32:31 PM
Subject: Re: Git Plugin with push merges back + Release plugin

On Thu, Jan 7, 2010 at 7:37 PM, Johannes Schneider <[hidden email]> wrote:
On 01/07/2010 06:29 PM, Nigel Magnay wrote:
> Does the git provider in maven actually work with maven release?

Yes, that works well. I can release a new version with my desktop
without any problems. This was a problem about a year ago.

 
Ah - cool - the last time I tried, it still bombed out.

Rather nicely, it does now work; so much so that I was able to use release:perform to issue an 0.8 update of the git plugin. This should appear in the next few hours on the update site.


I was hoping to see the new version of the Git plugin visible from the Update Center in my Hudson installation.  Unfortunately, it does not appear from any of the servers I have running.  Are others seeing it in their Update Center?

Mark Waite




Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Johannes Schneider
I am installing the plugin right now.
So by now the update site has been updated...


Thanks for your work.

Johannes

On 01/08/2010 03:16 PM, Nigel Magnay wrote:

> It definitely hit the site:
>
> https://hudson.dev.java.net/servlets/NewsItemView?newsItemID=7993
>
> How does the update site generate the list?
>
>
>
> On Fri, Jan 8, 2010 at 2:10 PM, Mark Waite <[hidden email]
> <mailto:[hidden email]>> wrote:
>
>
>
>         *From:* Nigel Magnay <[hidden email]
>         <mailto:[hidden email]>>
>         *To:* [hidden email] <mailto:[hidden email]>
>         *Sent:* Thu, January 7, 2010 2:32:31 PM
>         *Subject:* Re: Git Plugin with push merges back + Release plugin
>
>         On Thu, Jan 7, 2010 at 7:37 PM, Johannes Schneider
>         <[hidden email] <mailto:[hidden email]>> wrote:
>
>             On 01/07/2010 06:29 PM, Nigel Magnay wrote:
>             > Does the git provider in maven actually work with maven
>             release?
>
>             Yes, that works well. I can release a new version with my
>             desktop
>             without any problems. This was a problem about a year ago.
>
>          
>         Ah - cool - the last time I tried, it still bombed out.
>
>         Rather nicely, it does now work; so much so that I was able to
>         use release:perform to issue an 0.8 update of the git plugin.
>         This should appear in the next few hours on the update site.
>
>
>     I was hoping to see the new version of the Git plugin visible from
>     the Update Center in my Hudson installation.  Unfortunately, it does
>     not appear from any of the servers I have running.  Are others
>     seeing it in their Update Center?
>
>     Mark Waite
>
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Johannes Schneider
In reply to this post by Nigel Magnay
I think you might have forgotten to remove some debug statements?

---
[poll] Last Built Revision: Revision
dabf06d388aad35725ce395cf47e11198a1e26a6 (origin/master)
GitAPI created
Env: _=/usr/bin/daemon
Env: HOME=/var/lib/hudson
Env: HUDSON_HOME=/var/lib/hudson
Env: LANG=en_US.UTF-8
Env:
LD_LIBRARY_PATH=/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/../lib/amd64
Env: LESSCLOSE=/usr/bin/lesspipe %s %s
Env: LESSOPEN=| /usr/bin/lesspipe %s
Env: LOGNAME=hudson
Env:
LS_COLORS=no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.svgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;
36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:
Env: MAIL=/var/mail/hudson
Env: NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat
Env:
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
Env: PWD=/etc/security
Env: SHELL=/bin/bash
Env: SHLVL=3
Env: TERM=xterm
Env: USER=hudson
Env: XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt
Fetching changes from the remote Git repositories
---



On 01/07/2010 10:32 PM, Nigel Magnay wrote:

> On Thu, Jan 7, 2010 at 7:37 PM, Johannes Schneider
> <[hidden email] <mailto:[hidden email]>> wrote:
>
>     On 01/07/2010 06:29 PM, Nigel Magnay wrote:
>     > Does the git provider in maven actually work with maven release?
>
>     Yes, that works well. I can release a new version with my desktop
>     without any problems. This was a problem about a year ago.
>
>  
> Ah - cool - the last time I tried, it still bombed out.
>
> Rather nicely, it does now work; so much so that I was able to use
> release:perform to issue an 0.8 update of the git plugin. This should
> appear in the next few hours on the update site.
>
> Summary of changes:
>
> git shortlog git-0.7.3..git-0.8
> Ishaaq Chandy (12):
>       Fix serialization problem
>       Enabled api calls to the git plugin
>       minor compiler warning, codestyle fixes  - removed redundant
> import statements  - added servial version ids to serializable classes
>       Issue 3353: we should fetch all tags and be able to build from
> tags not just branches.
>       Refactoring: migrated away from deprecated APIs.
>       Moved the call to computer.currentComputer() to before the  the
> polling executor.
>       Sometimes (especially in cases where branches have been rebased)
> the plugin is unable to work out the changeset - it should not fail the
> build just because of this.
>       Fixed bug I introduced a few commits ago. doh!
>       ability to init a repo. more consise launch method calls
>       Added tests for GitSCM. Currently only testing simple project
> configuration, more detailed testing around complex projects with
> multiple repos, multiple branch specs and non-default refspecs would be
> nice to have as well...
>       more error logging
>       fixed regression and added test for it
>
> Josh Beitelspacher (5):
>       Improve change set displays
>       Add clean option
>       Clone BuildData before making changes
>       Set user email from Git email
>       Add simple usecase support to BuildChooser
>
> Kohsuke Kawaguchi (1):
>       [FIXED HUDSON-4885] applied a patch from pcc
>
> Nigel Magnay (9):
>       Add a note to SVN users to beware of being mastered in git now.
>       Add eclipse project files and maven target directory to .gitignore
>       Add code to allow migration from old config to new config with a
> version number so it's easier to detect what needs to be done.
>       Issue 4193 - Change log enhancements to display affected file paths.
>       Update to Hudson 1.322
>       From: Mike Robinet <[hidden email]
> <mailto:[hidden email]>>
>       Merge branch 'patches''
>       Create a parallel release branch, to cut releases from directly
> from GIT rather than hassle with SVN.
>       [maven-release-plugin] prepare release git-0.8
>
> Peter Collingbourne (4):
>       [FIXED HUDSON-4805] Allow the user to specify which remote
> repository is merged and pushed to
>       [FIXED HUDSON-5003] Implemented
> MockStaplerRequest.getOriginalRestOfPath and getStapler
>       [FIXED HUDSON-5006] Build the same commit as the parent if this is
> a matrix build
>       Obtain workspace, gitExe and environment on the master as this
> information is not available on the slave
>
> R. Tyler Ballance (1):
>       Add the ~/.m2/settings.xml that I needed on my fresh Linux machine
> in order to properly build the plugin standalone
>
> david_calavera (3):
>       snapshot needed to release it, scm config is inherited from the
> parent project
>       [maven-release-plugin] prepare release git-0.7.3
>       [maven-release-plugin] prepare for next development iteration
>
> kohsuke (11):
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>
> mdonohue (1):
>       Fix issue 4028 This propagates the Hudson environment to the
> execution steps of the git plugin
>
>
> HTH!
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Git Plugin with push merges back + Release plugin

Johannes Schneider
In reply to this post by Nigel Magnay
Great! It works (at least with a minimalic pom project) - have released
a project successfully with maven.


Thanks a lot!

On 01/07/2010 10:32 PM, Nigel Magnay wrote:

> On Thu, Jan 7, 2010 at 7:37 PM, Johannes Schneider
> <[hidden email] <mailto:[hidden email]>> wrote:
>
>     On 01/07/2010 06:29 PM, Nigel Magnay wrote:
>     > Does the git provider in maven actually work with maven release?
>
>     Yes, that works well. I can release a new version with my desktop
>     without any problems. This was a problem about a year ago.
>
>  
> Ah - cool - the last time I tried, it still bombed out.
>
> Rather nicely, it does now work; so much so that I was able to use
> release:perform to issue an 0.8 update of the git plugin. This should
> appear in the next few hours on the update site.
>
> Summary of changes:
>
> git shortlog git-0.7.3..git-0.8
> Ishaaq Chandy (12):
>       Fix serialization problem
>       Enabled api calls to the git plugin
>       minor compiler warning, codestyle fixes  - removed redundant
> import statements  - added servial version ids to serializable classes
>       Issue 3353: we should fetch all tags and be able to build from
> tags not just branches.
>       Refactoring: migrated away from deprecated APIs.
>       Moved the call to computer.currentComputer() to before the  the
> polling executor.
>       Sometimes (especially in cases where branches have been rebased)
> the plugin is unable to work out the changeset - it should not fail the
> build just because of this.
>       Fixed bug I introduced a few commits ago. doh!
>       ability to init a repo. more consise launch method calls
>       Added tests for GitSCM. Currently only testing simple project
> configuration, more detailed testing around complex projects with
> multiple repos, multiple branch specs and non-default refspecs would be
> nice to have as well...
>       more error logging
>       fixed regression and added test for it
>
> Josh Beitelspacher (5):
>       Improve change set displays
>       Add clean option
>       Clone BuildData before making changes
>       Set user email from Git email
>       Add simple usecase support to BuildChooser
>
> Kohsuke Kawaguchi (1):
>       [FIXED HUDSON-4885] applied a patch from pcc
>
> Nigel Magnay (9):
>       Add a note to SVN users to beware of being mastered in git now.
>       Add eclipse project files and maven target directory to .gitignore
>       Add code to allow migration from old config to new config with a
> version number so it's easier to detect what needs to be done.
>       Issue 4193 - Change log enhancements to display affected file paths.
>       Update to Hudson 1.322
>       From: Mike Robinet <[hidden email]
> <mailto:[hidden email]>>
>       Merge branch 'patches''
>       Create a parallel release branch, to cut releases from directly
> from GIT rather than hassle with SVN.
>       [maven-release-plugin] prepare release git-0.8
>
> Peter Collingbourne (4):
>       [FIXED HUDSON-4805] Allow the user to specify which remote
> repository is merged and pushed to
>       [FIXED HUDSON-5003] Implemented
> MockStaplerRequest.getOriginalRestOfPath and getStapler
>       [FIXED HUDSON-5006] Build the same commit as the parent if this is
> a matrix build
>       Obtain workspace, gitExe and environment on the master as this
> information is not available on the slave
>
> R. Tyler Ballance (1):
>       Add the ~/.m2/settings.xml that I needed on my fresh Linux machine
> in order to properly build the plugin standalone
>
> david_calavera (3):
>       snapshot needed to release it, scm config is inherited from the
> parent project
>       [maven-release-plugin] prepare release git-0.7.3
>       [maven-release-plugin] prepare for next development iteration
>
> kohsuke (11):
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>       bumping up POM version
>
> mdonohue (1):
>       Fix issue 4028 This propagates the Hudson environment to the
> execution steps of the git plugin
>
>
> HTH!
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]