You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/03/11 17:32:57 UTC
svn commit: r1080648 - in /lucene/dev/branches/lucene_solr_3_1: ./
dev-tools/maven/ dev-tools/maven/solr/contrib/clustering/ lucene/ solr/
solr/contrib/clustering/lib/
Author: sarowe
Date: Fri Mar 11 16:32:57 2011
New Revision: 1080648
URL: http://svn.apache.org/viewvc?rev=1080648&view=rev
Log:
LUCENE-2957: Renamed carrot2-core to org.apache.solr:solr-carrot2-core:<solr-version>; enabled maven filtering of solr-carrot2-core pom to substitute the project version in the POM for local installation through the 'bootstrap' profile; included solr-carrot2-core jar in generate-maven-artifacts
Added:
lucene/dev/branches/lucene_solr_3_1/solr/contrib/clustering/lib/solr-carrot2-core-pom.xml.template
- copied unchanged from r1080646, lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/solr-carrot2-core-pom.xml.template
Removed:
lucene/dev/branches/lucene_solr_3_1/solr/contrib/clustering/lib/carrot2-core-3.4.2.pom
Modified:
lucene/dev/branches/lucene_solr_3_1/ (props changed)
lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/lucene_solr_3_1/lucene/ (props changed)
lucene/dev/branches/lucene_solr_3_1/solr/ (props changed)
lucene/dev/branches/lucene_solr_3_1/solr/build.xml
lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml
Modified: lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template?rev=1080648&r1=1080647&r2=1080648&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template Fri Mar 11 16:32:57 2011
@@ -297,9 +297,9 @@
<version>3.3.1</version>
</dependency>
<dependency>
- <groupId>org.carrot2</groupId>
- <artifactId>carrot2-core</artifactId>
- <version>3.4.2</version>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-carrot2-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -374,7 +374,7 @@
</dependencies>
</dependencyManagement>
<build>
- <directory>lucene/build/lucene-parent</directory>
+ <directory>lucene/build/lucene-solr-grandparent</directory>
<pluginManagement>
<plugins>
<plugin>
@@ -591,6 +591,33 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter-carrot2-core-pom</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource> <!-- Filter carrot2-core POM, for local install -->
+ <directory>solr/contrib/clustering/lib</directory>
+ <includes>
+ <include>*pom.xml.template</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -701,18 +728,16 @@
<!-- use the org.carrot2:carrot2-core .jar compiled with -->
<!-- Java5 in solr/contrib/clustering/lib/ - the .jar in -->
<!-- the central Maven repository was compiled with Java6. -->
+ <!-- The version in the carrot2-core POM file is filtered -->
+ <!-- so that the version is the same as this project's. -->
<id>install-java5-carrot2-core</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
- <groupId>org.carrot2</groupId>
- <artifactId>carrot2-core</artifactId>
- <version>3.4.2</version>
- <packaging>jar</packaging>
<file>solr/contrib/clustering/lib/carrot2-core-3.4.2.jar</file>
- <pomFile>solr/contrib/clustering/lib/carrot2-core-3.4.2.pom</pomFile>
+ <pomFile>lucene/build/lucene-solr-grandparent/solr-carrot2-core-pom.xml.template</pomFile>
</configuration>
</execution>
<execution>
Modified: lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1080648&r1=1080647&r2=1080648&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/clustering/pom.xml.template Fri Mar 11 16:32:57 2011
@@ -72,8 +72,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.carrot2</groupId>
- <artifactId>carrot2-core</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-carrot2-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.lucene</groupId>
Modified: lucene/dev/branches/lucene_solr_3_1/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/build.xml?rev=1080648&r1=1080647&r2=1080648&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/build.xml Fri Mar 11 16:32:57 2011
@@ -1010,6 +1010,9 @@
<m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-core-pom.xml.template"
jar.file="contrib/uima/lib/uima-core.jar" />
+ <m2-deploy-with-pom-template pom.xml="contrib/clustering/lib/solr-carrot2-core-pom.xml.template"
+ jar.file="contrib/clustering/lib/carrot2-core-3.4.2.jar" />
+
<!-- ========== SOLR ARTIFACTS ========== -->
<m2-deploy pom.xml="contrib/dataimporthandler/src/pom.xml"
Modified: lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml?rev=1080648&r1=1080647&r2=1080648&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml Fri Mar 11 16:32:57 2011
@@ -398,6 +398,9 @@
<filterset begintoken="@" endtoken="@">
<filter token="version" value="${version}"/>
</filterset>
+ <filterset begintoken="$${" endtoken="}">
+ <filter token="project.version" value="${version}"/>
+ </filterset>
</copy>
<artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
<artifact:pom id="maven.project" file="${maven.build.dir}/@{pom.xml}" />