Lucene - Core
  1. Lucene - Core
  2. LUCENE-5902

Add bumpVersion script to increment version after release branch creation

    Details

    • Type: Bug Bug
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 5.0, 6.0
    • Component/s: None
    • Labels:
      None
    • Lucene Fields:
      New

      Description

      Thanks to LUCENE-5898 there are many less places to increment version. However, I still think this script can be useful in automating the entire process (minus the commit). This would:

      • Add new sections to lucene/CHANGES.txt and solr/CHANGES.txt
      • Add new version constant
      • Change LATEST value
      • Change version.base in lucene/version.properties
      • Change version used in solr example configs
      • Create a BWC index and test if necessary
      1. LUCENE-5902.patch
        26 kB
        Ryan Ernst
      2. LUCENE-5902.patch
        26 kB
        Ryan Ernst

        Activity

        Hide
        Ryan Ernst added a comment -

        I have most of this ready to go, but I want to get opinions are part of the workflow. My current idea is to run this on the most specific branch first. So if it is a bugfix release, it would be run on the release branch. You would then run the script again on 4x, with the commit id of the change to the release branch. It would do the merge, and make the appropriate changes on 4x (ie not changing LATEST or example configs). Does this seem like a reasonable workflow? I just want to minimize the extra work that people have to do, even in merging upwards.

        Show
        Ryan Ernst added a comment - I have most of this ready to go, but I want to get opinions are part of the workflow. My current idea is to run this on the most specific branch first. So if it is a bugfix release, it would be run on the release branch. You would then run the script again on 4x, with the commit id of the change to the release branch. It would do the merge, and make the appropriate changes on 4x (ie not changing LATEST or example configs). Does this seem like a reasonable workflow? I just want to minimize the extra work that people have to do, even in merging upwards.
        Hide
        Ryan Ernst added a comment -

        Here's an initial patch. This does all the things I mentioned above. For major version bumps, it prints a list of things to do manually at the end.

        Also, to handle creating backcompat indexes, this adds the ability to disable the security manager when running tests with -Dtests.useSecurityManager=false. It also changes the test class pattern to run whatever was passed to -Dtestcase=, regardless of whether it matches the normal pattern *Test.class | Test*.class

        Show
        Ryan Ernst added a comment - Here's an initial patch. This does all the things I mentioned above. For major version bumps, it prints a list of things to do manually at the end. Also, to handle creating backcompat indexes, this adds the ability to disable the security manager when running tests with -Dtests.useSecurityManager=false . It also changes the test class pattern to run whatever was passed to -Dtestcase= , regardless of whether it matches the normal pattern *Test.class | Test*.class
        Hide
        Ryan Ernst added a comment -

        The output looks something like this:

        Ryans-MacBook-Pro:lucene-solr-branch_4x rjernst$ py3 ../lucene-solr/dev-tools/scripts/bumpVersion.py 4.11.0
        
        Adding new version 4.11.0
          adding new section to lucene/CHANGES.txt...done
          adding new section to solr/CHANGES.txt...done
          adding constant LUCENE_4_11_0...done
        
        Updating latest version
          changing version.base...done
          changing Version.LATEST to LUCENE_4_11_0...done
          updating example solrconfig.xml files
            solr/example/example-DIH/solr/db/conf/solrconfig.xml...done
            solr/example/example-DIH/solr/mail/conf/solrconfig.xml...done
            solr/example/example-DIH/solr/rss/conf/solrconfig.xml...done
            solr/example/example-DIH/solr/solr/conf/solrconfig.xml...done
            solr/example/example-DIH/solr/tika/conf/solrconfig.xml...done
            solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml...done
            solr/example/multicore/core0/conf/solrconfig.xml...done
            solr/example/multicore/core1/conf/solrconfig.xml...done
            solr/example/solr/collection1/conf/solrconfig.xml...done
        
        Creating backwards compatibility tests
          creating index.410.cfs.zip...done
          creating index.410.nocfs.zip...done
          adding new indexes to backcompat tests...done
        
        Testing changes
          checking lucene version tests...ok
          checking solr version tests...ok
          checking backcompat tests...ok
        
        Show
        Ryan Ernst added a comment - The output looks something like this: Ryans-MacBook-Pro:lucene-solr-branch_4x rjernst$ py3 ../lucene-solr/dev-tools/scripts/bumpVersion.py 4.11.0 Adding new version 4.11.0 adding new section to lucene/CHANGES.txt...done adding new section to solr/CHANGES.txt...done adding constant LUCENE_4_11_0...done Updating latest version changing version.base...done changing Version.LATEST to LUCENE_4_11_0...done updating example solrconfig.xml files solr/example/example-DIH/solr/db/conf/solrconfig.xml...done solr/example/example-DIH/solr/mail/conf/solrconfig.xml...done solr/example/example-DIH/solr/rss/conf/solrconfig.xml...done solr/example/example-DIH/solr/solr/conf/solrconfig.xml...done solr/example/example-DIH/solr/tika/conf/solrconfig.xml...done solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml...done solr/example/multicore/core0/conf/solrconfig.xml...done solr/example/multicore/core1/conf/solrconfig.xml...done solr/example/solr/collection1/conf/solrconfig.xml...done Creating backwards compatibility tests creating index.410.cfs.zip...done creating index.410.nocfs.zip...done adding new indexes to backcompat tests...done Testing changes checking lucene version tests...ok checking solr version tests...ok checking backcompat tests...ok
        Hide
        Ryan Ernst added a comment -

        Another patch fixing some silly mistakes.

        Show
        Ryan Ernst added a comment - Another patch fixing some silly mistakes.
        Hide
        Michael McCandless added a comment -

        +1, this looks really nice! It's great that it adds new back compat test indices ...

        Show
        Michael McCandless added a comment - +1, this looks really nice! It's great that it adds new back compat test indices ...
        Hide
        ASF subversion and git services added a comment -

        Commit 1622546 from Ryan Ernst in branch 'dev/trunk'
        [ https://svn.apache.org/r1622546 ]

        LUCENE-5902: Add bumpVersion.py script

        Show
        ASF subversion and git services added a comment - Commit 1622546 from Ryan Ernst in branch 'dev/trunk' [ https://svn.apache.org/r1622546 ] LUCENE-5902 : Add bumpVersion.py script
        Hide
        ASF subversion and git services added a comment -

        Commit 1622572 from Uwe Schindler in branch 'dev/trunk'
        [ https://svn.apache.org/r1622572 ]

        LUCENE-5902: Make loadresource quiet

        Show
        ASF subversion and git services added a comment - Commit 1622572 from Uwe Schindler in branch 'dev/trunk' [ https://svn.apache.org/r1622572 ] LUCENE-5902 : Make loadresource quiet
        Hide
        ASF subversion and git services added a comment -

        Commit 1622595 from Ryan Ernst in branch 'dev/branches/branch_4x'
        [ https://svn.apache.org/r1622595 ]

        LUCENE-5902: Add bumpVersion.py script (merged 1622546 from trunk)

        Show
        ASF subversion and git services added a comment - Commit 1622595 from Ryan Ernst in branch 'dev/branches/branch_4x' [ https://svn.apache.org/r1622595 ] LUCENE-5902 : Add bumpVersion.py script (merged 1622546 from trunk)
        Hide
        ASF subversion and git services added a comment -

        Commit 1622604 from Ryan Ernst in branch 'dev/trunk'
        [ https://svn.apache.org/r1622604 ]

        LUCENE-5902: Handle different location for backcompat tests in trunk vs branch_4x

        Show
        ASF subversion and git services added a comment - Commit 1622604 from Ryan Ernst in branch 'dev/trunk' [ https://svn.apache.org/r1622604 ] LUCENE-5902 : Handle different location for backcompat tests in trunk vs branch_4x
        Hide
        ASF subversion and git services added a comment -

        Commit 1622605 from Ryan Ernst in branch 'dev/branches/branch_4x'
        [ https://svn.apache.org/r1622605 ]

        LUCENE-5902: Handle different location for backcompat tests in trunk vs branch_4x (merged 1622604 from trunk)

        Show
        ASF subversion and git services added a comment - Commit 1622605 from Ryan Ernst in branch 'dev/branches/branch_4x' [ https://svn.apache.org/r1622605 ] LUCENE-5902 : Handle different location for backcompat tests in trunk vs branch_4x (merged 1622604 from trunk)
        Hide
        ASF subversion and git services added a comment -

        Commit 1622606 from Ryan Ernst in branch 'dev/trunk'
        [ https://svn.apache.org/r1622606 ]

        LUCENE-5902: Fix bug in previous commit

        Show
        ASF subversion and git services added a comment - Commit 1622606 from Ryan Ernst in branch 'dev/trunk' [ https://svn.apache.org/r1622606 ] LUCENE-5902 : Fix bug in previous commit
        Hide
        ASF subversion and git services added a comment -

        Commit 1622607 from Ryan Ernst in branch 'dev/branches/branch_4x'
        [ https://svn.apache.org/r1622607 ]

        LUCENE-5902: Fix bug in previous commit

        Show
        ASF subversion and git services added a comment - Commit 1622607 from Ryan Ernst in branch 'dev/branches/branch_4x' [ https://svn.apache.org/r1622607 ] LUCENE-5902 : Fix bug in previous commit
        Hide
        ASF subversion and git services added a comment -

        Commit 1622609 from Ryan Ernst in branch 'dev/trunk'
        [ https://svn.apache.org/r1622609 ]

        LUCENE-5902: Correct module name for backcompat codecs

        Show
        ASF subversion and git services added a comment - Commit 1622609 from Ryan Ernst in branch 'dev/trunk' [ https://svn.apache.org/r1622609 ] LUCENE-5902 : Correct module name for backcompat codecs
        Hide
        ASF subversion and git services added a comment -

        Commit 1622611 from Ryan Ernst in branch 'dev/branches/branch_4x'
        [ https://svn.apache.org/r1622611 ]

        LUCENE-5902: Make loadresource quiet (merged 1622572)

        Show
        ASF subversion and git services added a comment - Commit 1622611 from Ryan Ernst in branch 'dev/branches/branch_4x' [ https://svn.apache.org/r1622611 ] LUCENE-5902 : Make loadresource quiet (merged 1622572)
        Hide
        ASF subversion and git services added a comment -

        Commit 1622685 from Uwe Schindler in branch 'dev/trunk'
        [ https://svn.apache.org/r1622685 ]

        LUCENE-5902: Simplify the property handling by having a default; only add explicitclass include if actually given; refactor filterchain (TODO: maybe use a one-line groovy for this, we already have groovy loaded before running tests...?)

        Show
        ASF subversion and git services added a comment - Commit 1622685 from Uwe Schindler in branch 'dev/trunk' [ https://svn.apache.org/r1622685 ] LUCENE-5902 : Simplify the property handling by having a default; only add explicitclass include if actually given; refactor filterchain (TODO: maybe use a one-line groovy for this, we already have groovy loaded before running tests...?)
        Hide
        ASF subversion and git services added a comment -

        Commit 1622686 from Uwe Schindler in branch 'dev/branches/branch_4x'
        [ https://svn.apache.org/r1622686 ]

        Merged revision(s) 1622685 from lucene/dev/trunk:
        LUCENE-5902: Simplify the property handling by having a default; only add explicitclass include if actually given; refactor filterchain (TODO: maybe use a one-line groovy for this, we already have groovy loaded before running tests...?)

        Show
        ASF subversion and git services added a comment - Commit 1622686 from Uwe Schindler in branch 'dev/branches/branch_4x' [ https://svn.apache.org/r1622686 ] Merged revision(s) 1622685 from lucene/dev/trunk: LUCENE-5902 : Simplify the property handling by having a default; only add explicitclass include if actually given; refactor filterchain (TODO: maybe use a one-line groovy for this, we already have groovy loaded before running tests...?)
        Hide
        Ryan Ernst added a comment -

        After talking to some people about this script, I've realized the name may be a little confusing, since the version is only bumped on one of the branches. I'd like to rename this to addVersion.py. If there are no objections, I will do so tomorrow morning PST.

        Show
        Ryan Ernst added a comment - After talking to some people about this script, I've realized the name may be a little confusing, since the version is only bumped on one of the branches. I'd like to rename this to addVersion.py. If there are no objections, I will do so tomorrow morning PST.
        Hide
        ASF subversion and git services added a comment -

        Commit 1627439 from Ryan Ernst in branch 'dev/trunk'
        [ https://svn.apache.org/r1627439 ]

        LUCENE-5902: rename to addVersion.py

        Show
        ASF subversion and git services added a comment - Commit 1627439 from Ryan Ernst in branch 'dev/trunk' [ https://svn.apache.org/r1627439 ] LUCENE-5902 : rename to addVersion.py
        Hide
        ASF subversion and git services added a comment -

        Commit 1627440 from Ryan Ernst in branch 'dev/branches/branch_5x'
        [ https://svn.apache.org/r1627440 ]

        LUCENE-5902: rename to addVersion.py

        Show
        ASF subversion and git services added a comment - Commit 1627440 from Ryan Ernst in branch 'dev/branches/branch_5x' [ https://svn.apache.org/r1627440 ] LUCENE-5902 : rename to addVersion.py
        Hide
        Anshum Gupta added a comment -

        Bulk close after 5.0 release.

        Show
        Anshum Gupta added a comment - Bulk close after 5.0 release.

          People

          • Assignee:
            Ryan Ernst
            Reporter:
            Ryan Ernst
          • Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development