Uploaded image for project: 'Lucene - Core'
  1. Lucene - Core
  2. LUCENE-7693

revisit "org.apache." logic in GetMavenDependenciesTask.java

    Details

    • Type: Wish
    • Status: Resolved
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 7.0, 6.5
    • Component/s: None
    • Labels:
      None
    • Lucene Fields:
      New

      Description

      Objective:

      • replace the ... "org.apache." + ... logic in GetMavenDependenciesTask.java at L399 and L584

      Motivation:

      • support for custom solr/contrib/...-myteam modules where the custom modules have dependencies between them and the package structure is com.mycompany.myteam rather than org.apache.solr

      Approach:

      • step 1:
        • in GetMavenDependenciesTask.java build a map out of all the ivy.xml files' info elements e.g.
          <ivy-module version="2.0">
            <info organisation="org.apache.lucene" module="core"/>
          </ivy-module>
          
        • temporarily instrument GetMavenDependenciesTask.java to help determine how the info element mappings differ from the current in-code logic
      • step 2:
        • adjust selected ivy.xml files to minimise differences
      • step 3:
        • switch over to 'new way' logic where this matches current in-code logic
        • remove the temporary instrumentation
      1. LUCENE-7693.patch
        8 kB
        Christine Poerschke
      2. LUCENE-7693-step1.patch
        7 kB
        Christine Poerschke
      3. LUCENE-7693-step2.patch
        2 kB
        Christine Poerschke

        Activity

        Hide
        cpoerschke Christine Poerschke added a comment -

        Daniel Collins and I are collaborating on this and attached are patches for the steps 1 and 2 described above.

        Steve Rowe - would you have any thoughts on the approach and/or the work-in-progress patches? Thanks.

        Show
        cpoerschke Christine Poerschke added a comment - Daniel Collins and I are collaborating on this and attached are patches for the steps 1 and 2 described above. Steve Rowe - would you have any thoughts on the approach and/or the work-in-progress patches? Thanks.
        Hide
        steve_rowe Steve Rowe added a comment -

        The idea seems okay (as long as it doesn't cause trouble for the native modules; I assume we're on the same page here).

        I skimmed the patches, and they look reasonable.

        I'll take another look once the patches are complete - should be simple enough to compare POM output before and after.

        Show
        steve_rowe Steve Rowe added a comment - The idea seems okay (as long as it doesn't cause trouble for the native modules; I assume we're on the same page here). I skimmed the patches, and they look reasonable. I'll take another look once the patches are complete - should be simple enough to compare POM output before and after.
        Hide
        cpoerschke Christine Poerschke added a comment -

        Thanks Steve for the quick reply.

        Attached is the proposed complete patch. ant precommit passes and the POM output before and after matches as far as I can tell via essentially:

        git checkout master
        ant clean-maven-build
        ant get-maven-poms
        mv maven-build maven-build-before
        
        git checkout master-LUCENE-7693
        ant clean-maven-build
        ant get-maven-poms
        
        for lhs in `find . -name pom.xml`
        do
          rhs=`echo $lhs | sed 's/\-before//g'`
          diff $lhs $rhs
        done
        
        Show
        cpoerschke Christine Poerschke added a comment - Thanks Steve for the quick reply. Attached is the proposed complete patch. ant precommit passes and the POM output before and after matches as far as I can tell via essentially: git checkout master ant clean-maven-build ant get-maven-poms mv maven-build maven-build-before git checkout master-LUCENE-7693 ant clean-maven-build ant get-maven-poms for lhs in `find . -name pom.xml` do rhs=`echo $lhs | sed 's/\-before //g'` diff $lhs $rhs done
        Hide
        steve_rowe Steve Rowe added a comment -

        +1, LGTM, diff says the native POMs are identical.

        Show
        steve_rowe Steve Rowe added a comment - +1, LGTM, diff says the native POMs are identical.
        Hide
        jira-bot ASF subversion and git services added a comment -

        Commit 738da0998a7fc02fd9eadfbe21108cf5087b4f17 in lucene-solr's branch refs/heads/master from Christine Poerschke
        [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=738da09 ]

        LUCENE-7693: Replace "org.apache." logic in GetMavenDependenciesTask. (Daniel Collins, Christine Poerschke)

        Show
        jira-bot ASF subversion and git services added a comment - Commit 738da0998a7fc02fd9eadfbe21108cf5087b4f17 in lucene-solr's branch refs/heads/master from Christine Poerschke [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=738da09 ] LUCENE-7693 : Replace "org.apache." logic in GetMavenDependenciesTask. (Daniel Collins, Christine Poerschke)
        Hide
        jira-bot ASF subversion and git services added a comment -

        Commit 1c1af99c65a11c00243a8589aa6a3e5453803971 in lucene-solr's branch refs/heads/branch_6x from Christine Poerschke
        [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=1c1af99 ]

        LUCENE-7693: Replace "org.apache." logic in GetMavenDependenciesTask. (Daniel Collins, Christine Poerschke)

        Show
        jira-bot ASF subversion and git services added a comment - Commit 1c1af99c65a11c00243a8589aa6a3e5453803971 in lucene-solr's branch refs/heads/branch_6x from Christine Poerschke [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=1c1af99 ] LUCENE-7693 : Replace "org.apache." logic in GetMavenDependenciesTask. (Daniel Collins, Christine Poerschke)
        Hide
        cpoerschke Christine Poerschke added a comment -

        Thanks for your input Steve.

        Show
        cpoerschke Christine Poerschke added a comment - Thanks for your input Steve.

          People

          • Assignee:
            cpoerschke Christine Poerschke
            Reporter:
            cpoerschke Christine Poerschke
          • Votes:
            1 Vote for this issue
            Watchers:
            4 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development