Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release procedure for branches and some javadoc #627

Merged
merged 31 commits into from Sep 9, 2016
Merged

Commits on Sep 6, 2016

  1. Releasing from branches

    Ensured it is possible to release from release branches.
    mockitoguy committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    d106296 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a04949b View commit details
    Browse the repository at this point in the history
  3. Ensured mockito is not published to bintray when using release dryRun

    v2.1.0-beta.121 is in bintray/central but does not have docs / release notes due to this bug
    
    After 2.1.0 is out I will overhaul the release logic and make it perfect :D
    mockitoguy committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    4ef48f2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c680d2a View commit details
    Browse the repository at this point in the history
  5. Updated the message emitted from the build

    Otherwise I was confused with bintrayUpload task behavior.
    mockitoguy committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    ab7bf1d View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2016

  1. Removed the dry run hack

    I found an idea to test the release without spoling the release/2.x branch
    mockitoguy committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    362ca52 View commit details
    Browse the repository at this point in the history
  2. Manually bumped version.properties

    Testing the release logic is hard. We need to make it easier!
    mockitoguy committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    d75fe9c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dff5452 View commit details
    Browse the repository at this point in the history
  4. Updated the javadoc

     - removed 2.0 version
     - small change that allows me to test releasing from release/test branch
    mockitoguy committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    351a2ab View commit details
    Browse the repository at this point in the history
  5. Updated the javadoc

      - removed 2.0 version, added TODO for tomorrow
      - small change that allows me to test releasing from release/test branch
    mockitoguy committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    7f28839 View commit details
    Browse the repository at this point in the history
  6. Manual bump of version.properties

    (release process tweaking)
    mockitoguy committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    1c26e40 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    61a855e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7688e0d View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2016

  1. Releasing from branches

    Ensured it is possible to release from release branches.
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    6d36dfd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e69e91b View commit details
    Browse the repository at this point in the history
  3. Ensured mockito is not published to bintray when using release dryRun

    v2.1.0-beta.121 is in bintray/central but does not have docs / release notes due to this bug
    
    After 2.1.0 is out I will overhaul the release logic and make it perfect :D
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    c96b3ba View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0f1b010 View commit details
    Browse the repository at this point in the history
  5. Updated the message emitted from the build

    Otherwise I was confused with bintrayUpload task behavior.
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    7cd1d2b View commit details
    Browse the repository at this point in the history
  6. Removed the dry run hack

    I found an idea to test the release without spoling the release/2.x branch
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    b7f284a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1bfc1af View commit details
    Browse the repository at this point in the history
  8. Updated the javadoc

     - removed 2.0 version
     - small change that allows me to test releasing from release/test branch
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    425aef8 View commit details
    Browse the repository at this point in the history
  9. Updated the javadoc

      - removed 2.0 version, added TODO for tomorrow
      - small change that allows me to test releasing from release/test branch
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    b5dd574 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    eeac5e5 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    13f58aa View commit details
    Browse the repository at this point in the history
  12. Ensured mockito is not published to bintray when using release dryRun

    v2.1.0-beta.121 is in bintray/central but does not have docs / release notes due to this bug
    
    After 2.1.0 is out I will overhaul the release logic and make it perfect :D
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    289c86e View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    d42dd20 View commit details
    Browse the repository at this point in the history
  14. Updated the message emitted from the build

    Otherwise I was confused with bintrayUpload task behavior.
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    1f9ffed View commit details
    Browse the repository at this point in the history
  15. Removed the dry run hack

    I found an idea to test the release without spoling the release/2.x branch
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    f4f2804 View commit details
    Browse the repository at this point in the history
  16. Merge branch 'release/test' of github.com:mockito/mockito into releas…

    …e/test
    
    Conflicts:
    	doc/release-notes/official.md
    mockitoguy committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    54394ee View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    46ae97d View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    0a8f060 View commit details
    Browse the repository at this point in the history