Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/pretested-integration-plugin
  Commit: e7e028e33dfbcfd14b7f117019684db0b06fad2f
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/e7e028e33dfbcfd14b7f117019684db0b06fad2f
  Author: Mads Nielsen <m...@praqma.net>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/PretestedIntegrationBuildWrapper.java

  Log Message:
  -----------
  Fix for JENKINS-27516


  Commit: effcecf63a08fd3dc4c944b6e24cb166b4e1a19f
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/effcecf63a08fd3dc4c944b6e24cb166b4e1a19f
  Author: Mads Nielsen <m...@praqma.net>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M pom.xml
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/PretestedIntegrationBuildWrapper.java

  Log Message:
  -----------
  For JENKINS-27516, remove semaphore


  Commit: 87c781b35fd1cf7cae830bc67e853482e4408512
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/87c781b35fd1cf7cae830bc67e853482e4408512
  Author: Bue Petersen <b...@praqma.net>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    A check_for_changelog.rb

  Log Message:
  -----------
  Ruby script to check for changelog entry:

Simple ruby script that expect the plugin url of the wiki source page
(Confluence markdown), and checks that there is a changelog entry.

Supposed to be used to ensure there is a changelog entry on the plugin
wiki page before the relase is executed on the Jenkins job.


  Commit: 86363f8bca0c02b92930af8d5cc5051f93780155
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/86363f8bca0c02b92930af8d5cc5051f93780155
  Author: Bue Petersen <b...@praqma.net>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    M check_for_changelog.rb

  Log Message:
  -----------
  Improved Ruby script to check for changelog entry


  Commit: 5f8d7fd28abccf60a7e1b2edf552716306ca02d8
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/5f8d7fd28abccf60a7e1b2edf552716306ca02d8
  Author: ReleasePraqma <rele...@praqma.net>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release pretested-integration-2.2.3


  Commit: 9e872bca9b20ada8cb6362b9efef3431fee24f57
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/9e872bca9b20ada8cb6362b9efef3431fee24f57
  Author: ReleasePraqma <rele...@praqma.net>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: a73d23b93b371f70cbad305acf44696e6176d8bd
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/a73d23b93b371f70cbad305acf44696e6176d8bd
  Author: Bue Petersen <b...@praqma.net>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    A check_for_changelog.rb
    M pom.xml
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/PretestedIntegrationBuildWrapper.java

  Log Message:
  -----------
  [JENKINS-27516] Merged in maintenance changes:

Merged branch 'pretested-integration-2.2.1-maintenance' with fix for the
[JENKINS-27516] bug fix related to hanging builds if using the plugin
with later Jenkins cores (1.596)

Conflicts:
        pom.xml


  Commit: f7ba320ba50ca28d904592ba22a627240a136d32
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/f7ba320ba50ca28d904592ba22a627240a136d32
  Author: Bue Petersen <b...@praqma.net>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/PretestedIntegrationBuildWrapper.java

  Log Message:
  -----------
  Checkstyle fixes for prior commit on [JENKINS-27516]


  Commit: 539efc71abbbfe48744d03d471b93ff7772fe1db
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/539efc71abbbfe48744d03d471b93ff7772fe1db
  Author: Bue Petersen <b...@praqma.net>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Plugin added to name in updatecenter

To follow the ordinary plugin naming convention, we was missing 'Plugin'
as part of the plugin.


  Commit: 79f125e99c537f93cb8a6faf26c805a4859f63a0
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/79f125e99c537f93cb8a6faf26c805a4859f63a0
  Author: Bue Petersen <b...@praqma.net>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

  Changed paths:
    M pom.xml
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/PretestedIntegrationPostCheckout.java
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/AccumulatedCommitStrategy.java
    A 
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/FindCommitAuthorCallback.java
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java
    M 
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/MultipleScm_threeRepos_IT.java
    M 
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/StaticGitRepositoryTestBase.java
    A 
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/UseAuthorOfLastCommit.java
    A src/test/resources/useAuthorOfLastCommit-repo_description.log
    A src/test/resources/useAuthorOfLastCommit.md
    A src/test/resources/useAuthorOfLastCommit.sh
    A src/test/resources/useAuthorOfLastCommit.zip

  Log Message:
  -----------
  JENKINS-28590 Re-use author on commit and refactor:

The integration commit will have the author of the last commit on the
development branch being integrated.
In both accumulated and squash strategy the author of the last commit is
collected and used with the '--author' switch during commit of the
integration commit.

The implementation includes large refactoring to improve logging,
console output FIXME

- Maven pom file, updated java ncss tool from version 2.0 to 2.1 as it
  failed to parse java 7 multi catch constructs

Logging changes in general:

- user information that is written to job console is now also logged
- LOG_PREFIX which equals '[PREINT]' is added to all changed logging
  lines for consistency

Accumulated and squash strategy implementations:

- changed, restructured the work flow reporting to the job console
- made output to job console almost identical between the two strategies
- added more progress and logging during the work flow
- separated merge and commit in two phases, each handling exceptions and
  git command exit codes individually
- splitting merge and commit needed to allow to use the option --author
  to set the author of the commit

Finding the author:

- implemented as a call back method, to support remoting
- copy and re-use from a like method

GitBridge - the post-build step pushing integration branch and deleting
development branch:

- added better error reporting, showing output message and exception if
  failing

Test MultipleScm_threeRepos_IT:

- improved the wait for activity function to only return if result is
  valid, not only when there is a temporary one and the job is still
building


  Commit: 8702ef4257fb87b5a02ebcc7a8d0834fec4c44e4
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/8702ef4257fb87b5a02ebcc7a8d0834fec4c44e4
  Author: Bue Petersen <b...@praqma.net>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

  Changed paths:
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/AccumulatedCommitStrategy.java
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java

  Log Message:
  -----------
  JENKINS-28590 Fixed few checkstyle errors


  Commit: ea943f30080a2f2db70625db83fe8882d742d021
      
https://github.com/jenkinsci/pretested-integration-plugin/commit/ea943f30080a2f2db70625db83fe8882d742d021
  Author: Bue Petersen <b...@praqma.net>
  Date:   2015-06-29 (Mon, 29 Jun 2015)

  Changed paths:
    M 
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GetAllCommitsFromBranchCallback.java
    A 
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CustomIntegrationBranch.java
    M 
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/StaticGitRepositoryTestBase.java
    M 
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestUtilsFactory.java
    A src/test/resources/customIntegrationBranch-repo_description.log
    A src/test/resources/customIntegrationBranch.md
    A src/test/resources/customIntegrationBranch.sh
    A src/test/resources/customIntegrationBranch.zip

  Log Message:
  -----------
  JENKINS-28596 Fix for hardcoded branch name:

When resolving accumulated commit messages, branch name was hardcoded to
master.

This change will allow custom named integration branch.


Compare: 
https://github.com/jenkinsci/pretested-integration-plugin/compare/bba993008f51...ea943f30080a

-- 
You received this message because you are subscribed to the Google Groups 
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to