Uploaded image for project: 'Solr'
  1. Solr
  2. SOLR-2448

Upgrade Carrot2 to version 3.5.0

Details

    • Task
    • Status: Closed
    • Minor
    • Resolution: Fixed
    • None
    • 3.2, 4.0-ALPHA
    • contrib - Clustering
    • None

    Description

      Carrot2 version 3.5.0 should be available very soon. After the upgrade, it will be possible to implement a few improvements to the clustering plugin; I'll file separate issues for these.

      Attachments

        1. SOLR-2448-2449-2450-2505-branch_3x.patch
          82 kB
          Stanislaw Osinski
        2. SOLR-2448-2449-2450-2505-trunk.patch
          75 kB
          Stanislaw Osinski
        3. carrot2-core-3.5.0.jar
          958 kB
          Stanislaw Osinski

        Issue Links

          Activity

            Oh, is there any way to assign this issue to myself? It looks like I don't have this permission now.

            stanislaw.osinski Stanislaw Osinski added a comment - Oh, is there any way to assign this issue to myself? It looks like I don't have this permission now.
            rcmuir Robert Muir added a comment -

            Hi, i tried to give you access (i think Grant tried to give me administrator access but it seems to only work for Lucene, Solr shows up under administration but gives me a JIRA error)

            Can someone else with admin access to Solr grant access here?

            rcmuir Robert Muir added a comment - Hi, i tried to give you access (i think Grant tried to give me administrator access but it seems to only work for Lucene, Solr shows up under administration but gives me a JIRA error) Can someone else with admin access to Solr grant access here?
            rcmuir Robert Muir added a comment -

            Stanislaw: can you try now and see if you can assign jira issues?

            rcmuir Robert Muir added a comment - Stanislaw: can you try now and see if you can assign jira issues?

            Yes, thanks!

            stanislaw.osinski Stanislaw Osinski added a comment - Yes, thanks!

            Initial patch (git) based on Carrot2 3.5.0-dev, against Solr trunk. As soon as we make the stable 3.5.0 release, I'll submit the final patch for your review.

            stanislaw.osinski Stanislaw Osinski added a comment - Initial patch (git) based on Carrot2 3.5.0-dev, against Solr trunk. As soon as we make the stable 3.5.0 release, I'll submit the final patch for your review.

            Hi, we've finally released Carrot2 3.5.0, so I'm attaching the patch (git) against Solr trunk for your review. The patch contains several separate commits related to the upgrade (SOLR-2448, SOLR-2449, SOLR-2450, SOLR-2505), I hope it will be easier to review this way.

            One thing I'm wondering about is Maven artifact generation that seems to be gone from trunk contribs (compared to the 3.x branch). Let me know if I need to update the dependencies/version numbers anywhere.

            The patch for Solr 3.x is in the works, we need to release JDK1.5-compatible version of some of the dependencies (HPPC) to make it happen.

            stanislaw.osinski Stanislaw Osinski added a comment - Hi, we've finally released Carrot2 3.5.0 , so I'm attaching the patch (git) against Solr trunk for your review. The patch contains several separate commits related to the upgrade ( SOLR-2448 , SOLR-2449 , SOLR-2450 , SOLR-2505 ), I hope it will be easier to review this way. One thing I'm wondering about is Maven artifact generation that seems to be gone from trunk contribs (compared to the 3.x branch). Let me know if I need to update the dependencies/version numbers anywhere. The patch for Solr 3.x is in the works, we need to release JDK1.5-compatible version of some of the dependencies (HPPC) to make it happen.
            sarowe Steven Rowe added a comment -

            Hi Stanisław,

            One thing I'm wondering about is Maven artifact generation that seems to be gone from trunk contribs (compared to the 3.x branch).

            I'll look into it.

            sarowe Steven Rowe added a comment - Hi Stanisław, One thing I'm wondering about is Maven artifact generation that seems to be gone from trunk contribs (compared to the 3.x branch). I'll look into it.
            sarowe Steven Rowe added a comment -

            One thing I'm wondering about is Maven artifact generation that seems to be gone from trunk contribs (compared to the 3.x branch).

            So, I first tried running ant generate-maven-artifacts from solr/ on trunk, without applying your patches, and all artifacts, including contribs, are generated under solr/package/maven/. Are you using a different Ant target for Maven artifact generation?

            sarowe Steven Rowe added a comment - One thing I'm wondering about is Maven artifact generation that seems to be gone from trunk contribs (compared to the 3.x branch). So, I first tried running ant generate-maven-artifacts from solr/ on trunk, without applying your patches, and all artifacts, including contribs, are generated under solr/package/maven/. Are you using a different Ant target for Maven artifact generation?
            sarowe Steven Rowe added a comment -

            Hi, we've finally released Carrot2 3.5.0, so I'm attaching the patch (git) against Solr trunk for your review.

            I've never used git. I took a peek at the patch and there is zero chance of using it directly with Subversion. Do you know how I can convert it to use with Subversion?

            sarowe Steven Rowe added a comment - Hi, we've finally released Carrot2 3.5.0, so I'm attaching the patch (git) against Solr trunk for your review. I've never used git. I took a peek at the patch and there is zero chance of using it directly with Subversion. Do you know how I can convert it to use with Subversion?

            Hi Steven,

            Thanks for you help and apologies for git confusion, here's the SVN patch. After patching, you'd also need to delete:

            trunk/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar
            trunk/solr/contrib/clustering/lib/hppc-0.3.1.jar

            and replace them with new versions:

            http://repo1.maven.org/maven2/org/carrot2/carrot2-core/3.5.0/carrot2-core-3.5.0.jar
            http://repo1.maven.org/maven2/com/carrotsearch/hppc/0.3.3/hppc-0.3.3.jar

            stanislaw.osinski Stanislaw Osinski added a comment - Hi Steven, Thanks for you help and apologies for git confusion, here's the SVN patch. After patching, you'd also need to delete: trunk/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar trunk/solr/contrib/clustering/lib/hppc-0.3.1.jar and replace them with new versions: http://repo1.maven.org/maven2/org/carrot2/carrot2-core/3.5.0/carrot2-core-3.5.0.jar http://repo1.maven.org/maven2/com/carrotsearch/hppc/0.3.3/hppc-0.3.3.jar

            So, I first tried running ant generate-maven-artifacts from solr/ on trunk, without applying your patches, and all artifacts, including contribs, are generated under solr/package/maven/. Are you using a different Ant target for Maven artifact generation?

            The target runs fine for me too (on the patched code). I just wanted to update the version number of the Carrot2 dependency, but couldn't find any file referencing the old number (3.4.2). Now I see that the generated solr-clustering POM XML has carrot2-core as a dependency, but does not specify the exact version number. I guess there's some more Maven magic I need to learn to understand this

            stanislaw.osinski Stanislaw Osinski added a comment - So, I first tried running ant generate-maven-artifacts from solr/ on trunk, without applying your patches, and all artifacts, including contribs, are generated under solr/package/maven/. Are you using a different Ant target for Maven artifact generation? The target runs fine for me too (on the patched code). I just wanted to update the version number of the Carrot2 dependency, but couldn't find any file referencing the old number (3.4.2). Now I see that the generated solr-clustering POM XML has carrot2-core as a dependency, but does not specify the exact version number. I guess there's some more Maven magic I need to learn to understand this
            sarowe Steven Rowe added a comment -

            Versions for all dependencies for both Solr and Lucene are specified in one place: the grandparent POM, in the root of the sources. Here's the carrot2-core dependency (in the POM template under dev-tools/maven/): http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?view=markup#l305

            sarowe Steven Rowe added a comment - Versions for all dependencies for both Solr and Lucene are specified in one place: the grandparent POM, in the root of the sources. Here's the carrot2-core dependency (in the POM template under dev-tools/maven/ ): http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?view=markup#l305

            Versions for all dependencies for both Solr and Lucene are specified in one place: the grandparent POM, in the root of the sources.

            Everything is clear then, thanks! I'll update the version number and remove Carrot2 Maven repository, the latest Carrot2 binaries are now available from Maven central.

            stanislaw.osinski Stanislaw Osinski added a comment - Versions for all dependencies for both Solr and Lucene are specified in one place: the grandparent POM, in the root of the sources. Everything is clear then, thanks! I'll update the version number and remove Carrot2 Maven repository, the latest Carrot2 binaries are now available from Maven central.
            sarowe Steven Rowe added a comment -

            I'll [...] remove Carrot2 Maven repository, the latest Carrot2 binaries are now available from Maven central.

            Excellent!

            sarowe Steven Rowe added a comment - I'll [...] remove Carrot2 Maven repository, the latest Carrot2 binaries are now available from Maven central. Excellent!

            Hi, here's another set of patches (svn this time) against trunk and branch_3x. I've corrected Maven configs and checked that the project builds fine using mvn install.

            After applying the patches you'd need to manually update the JARs:

            In trunk, delete:

            trunk/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar
            trunk/solr/contrib/clustering/lib/hppc-0.3.1.jar

            and replace them with new versions:

            http://repo1.maven.org/maven2/org/carrot2/carrot2-core/3.5.0/carrot2-core-3.5.0.jar
            http://repo1.maven.org/maven2/com/carrotsearch/hppc/0.3.3/hppc-0.3.3.jar

            In branch_3x, delete:

            branch_3x/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar
            branch_3x/solr/contrib/clustering/lib/hppc-0.3.1.jar

            and replace them with new versions:

            carrot2-core-3.5.0.jar attached (jdk15 backport)
            http://repo1.maven.org/maven2/com/carrotsearch/hppc/0.3.4/hppc-0.3.4-jdk15.jar

            It'd be great if someone could review these before I make the commit.

            Thanks!

            S.

            stanislaw.osinski Stanislaw Osinski added a comment - Hi, here's another set of patches (svn this time) against trunk and branch_3x. I've corrected Maven configs and checked that the project builds fine using mvn install. After applying the patches you'd need to manually update the JARs: In trunk, delete: trunk/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar trunk/solr/contrib/clustering/lib/hppc-0.3.1.jar and replace them with new versions: http://repo1.maven.org/maven2/org/carrot2/carrot2-core/3.5.0/carrot2-core-3.5.0.jar http://repo1.maven.org/maven2/com/carrotsearch/hppc/0.3.3/hppc-0.3.3.jar In branch_3x, delete: branch_3x/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar branch_3x/solr/contrib/clustering/lib/hppc-0.3.1.jar and replace them with new versions: carrot2-core-3.5.0.jar attached (jdk15 backport) http://repo1.maven.org/maven2/com/carrotsearch/hppc/0.3.4/hppc-0.3.4-jdk15.jar It'd be great if someone could review these before I make the commit. Thanks! S.

            Hi, if there are no objections, I'd like to commit this patch later today. Thanks! S.

            stanislaw.osinski Stanislaw Osinski added a comment - Hi, if there are no objections, I'd like to commit this patch later today. Thanks! S.

            Committed to trunk and branch_3x.

            stanislaw.osinski Stanislaw Osinski added a comment - Committed to trunk and branch_3x.
            rcmuir Robert Muir added a comment -

            Bulk close for 3.2

            rcmuir Robert Muir added a comment - Bulk close for 3.2

            People

              stanislaw.osinski Stanislaw Osinski
              stanislaw.osinski Stanislaw Osinski
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: