Solr
  1. Solr
  2. SOLR-3294

Remove binary carrot2.jar and replace it with a maven dependency.

    Details

    • Type: Task Task
    • Status: Closed
    • Priority: Blocker Blocker
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 3.6
    • Component/s: contrib - Clustering
    • Labels:
      None

      Description

      The repo contains a manually retrowoven Carrot2 JAR which does not have a corresponding artefact in Maven Central (so won't work for ivy).
      We will make a release with 1.5 backport (I hate this!).

      http://issues.carrot2.org/browse/CARROT-902

      1. SOLR-3294.patch
        15 kB
        Dawid Weiss

        Activity

        Hide
        Robert Muir added a comment -

        Thanks for looking into this!

        Show
        Robert Muir added a comment - Thanks for looking into this!
        Hide
        Dawid Weiss added a comment -

        A patch replacing Carrot2 with (maven central released) 3.5.0.1.

        A feeble attempt to fix maven descriptors as well, but Steve – help, help – did I get it right?

        I've just pushed 3.5.0.1 to MC so it'll be there in an hour or so (rsync). You can grab it from
        https://oss.sonatype.org/content/repositories/releases/org/carrot2/carrot2-core/3.5.0.1/ too.

        Show
        Dawid Weiss added a comment - A patch replacing Carrot2 with (maven central released) 3.5.0.1. A feeble attempt to fix maven descriptors as well, but Steve – help, help – did I get it right? I've just pushed 3.5.0.1 to MC so it'll be there in an hour or so (rsync). You can grab it from https://oss.sonatype.org/content/repositories/releases/org/carrot2/carrot2-core/3.5.0.1/ too.
        Hide
        Dawid Weiss added a comment -

        Oh, there are also binary file changes:

        c:\Work\lucene-solr>git st
        #       new file:   solr/contrib/clustering/lib/carrot2-core-3.5.0.1.jar
        #       deleted:    solr/contrib/clustering/lib/carrot2-core-3.5.0.jar
        #       deleted:    solr/contrib/clustering/lib/jackson-core-asl-1.5.2.jar
        #       new file:   solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar
        #       deleted:    solr/contrib/clustering/lib/jackson-mapper-asl-1.5.2.jar
        #       new file:   solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar
        #       deleted:    solr/contrib/clustering/lib/solr-carrot2-core-pom.xml.template
        

        These can be fetched from Maven Central and Carrot2 pom has these dependencies too. I've excluded everything else.

        Show
        Dawid Weiss added a comment - Oh, there are also binary file changes: c:\Work\lucene-solr>git st # new file: solr/contrib/clustering/lib/carrot2-core-3.5.0.1.jar # deleted: solr/contrib/clustering/lib/carrot2-core-3.5.0.jar # deleted: solr/contrib/clustering/lib/jackson-core-asl-1.5.2.jar # new file: solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar # deleted: solr/contrib/clustering/lib/jackson-mapper-asl-1.5.2.jar # new file: solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar # deleted: solr/contrib/clustering/lib/solr-carrot2-core-pom.xml.template These can be fetched from Maven Central and Carrot2 pom has these dependencies too. I've excluded everything else.
        Hide
        Steve Rowe added a comment -

        A patch replacing Carrot2 with (maven central released) 3.5.0.1.

        A feeble attempt to fix maven descriptors as well, but Steve – help, help – did I get it right?

        I've just pushed 3.5.0.1 to MC so it'll be there in an hour or so (rsync). You can grab it from
        https://oss.sonatype.org/content/repositories/releases/org/carrot2/carrot2-core/3.5.0.1/ too.

        As of this writing, the new artifacts haven't made it to MC yet. The Maven build (compile/install/test) works, under both Java5 and Java6, if I temporarily add this to the top-level POM:

        <repository>
          <id>sonatype.oss.releases</id>
          <name>Sonatype OSS releases</name>
          <url>https://oss.sonatype.org/content/repositories/releases</url>
          <releases><enabled>true</enabled></releases>
          <snapshots><enabled>false</enabled></snapshots>
        </repository>
        

        One small thing: the dist-maven specialization can be removed entirely from clustering/build.xml:

        <target name="dist-maven" depends="common.dist-maven">
          <!--
          <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-carrot2-core-pom.xml.template"
                                       jar.file="${antfile.dir}/lib/carrot2-core-3.5.0.jar" />
            -->
        </target>
        

        I also tried the Ant build (ant test under solr/contrib/clustering/) under both Java5 and Java6 (after populating clustering/lib/ from my local Maven repo), and it succeeded for me.

        Show
        Steve Rowe added a comment - A patch replacing Carrot2 with (maven central released) 3.5.0.1. A feeble attempt to fix maven descriptors as well, but Steve – help, help – did I get it right? I've just pushed 3.5.0.1 to MC so it'll be there in an hour or so (rsync). You can grab it from https://oss.sonatype.org/content/repositories/releases/org/carrot2/carrot2-core/3.5.0.1/ too. As of this writing, the new artifacts haven't made it to MC yet. The Maven build (compile/install/test) works, under both Java5 and Java6, if I temporarily add this to the top-level POM: <repository> <id> sonatype.oss.releases </id> <name> Sonatype OSS releases </name> <url> https://oss.sonatype.org/content/repositories/releases </url> <releases> <enabled> true </enabled> </releases> <snapshots> <enabled> false </enabled> </snapshots> </repository> One small thing: the dist-maven specialization can be removed entirely from clustering/build.xml : <target name= "dist-maven" depends= "common.dist-maven" > <!-- <m2-deploy-with-pom-template pom.xml= "${antfile.dir}/lib/solr-carrot2-core-pom.xml.template" jar.file= "${antfile.dir}/lib/carrot2-core-3.5.0.jar" /> --> </target> I also tried the Ant build ( ant test under solr/contrib/clustering/ ) under both Java5 and Java6 (after populating clustering/lib/ from my local Maven repo), and it succeeded for me.
        Hide
        Steve Rowe added a comment -

        I just checked, and Maven Central now has the new release. I'll remove my <repository> entry and retry.

        Show
        Steve Rowe added a comment - I just checked, and Maven Central now has the new release. I'll remove my <repository> entry and retry.
        Hide
        Dawid Weiss added a comment -

        Thanks Steven! Since you have it open would you commit it in too? Remove that 'dist-maven' section, it isn't needed indeed. Thanks!

        Show
        Dawid Weiss added a comment - Thanks Steven! Since you have it open would you commit it in too? Remove that 'dist-maven' section, it isn't needed indeed. Thanks!
        Hide
        Steve Rowe added a comment -

        Since you have it open would you commit it in too? Remove that 'dist-maven' section, it isn't needed indeed. Thanks!

        Will do.

        Show
        Steve Rowe added a comment - Since you have it open would you commit it in too? Remove that 'dist-maven' section, it isn't needed indeed. Thanks! Will do.
        Hide
        Steve Rowe added a comment -

        Committed to branch_3x.

        Show
        Steve Rowe added a comment - Committed to branch_3x.

          People

          • Assignee:
            Steve Rowe
            Reporter:
            Dawid Weiss
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development