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 08:35:01 UTC
svn commit: r1080476 - in /lucene/dev/branches/branch_3x: ./
dev-tools/maven/ dev-tools/maven/solr/contrib/analysis-extras/
dev-tools/maven/solr/contrib/clustering/
dev-tools/maven/solr/contrib/dataimporthandler/src/
dev-tools/maven/solr/contrib/dataim...
Author: sarowe
Date: Fri Mar 11 07:35:00 2011
New Revision: 1080476
URL: http://svn.apache.org/viewvc?rev=1080476&view=rev
Log:
version fixups: 3.1->3.2; Solr DIH and Clustering contribs need jetty test scope dependencies to pass tests, since solr-core's jetty dependencies are now optional
Modified:
lucene/dev/branches/branch_3x/build.xml
lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template
Modified: lucene/dev/branches/branch_3x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/build.xml?rev=1080476&r1=1080475&r2=1080476&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/build.xml (original)
+++ lucene/dev/branches/branch_3x/build.xml Fri Mar 11 07:35:00 2011
@@ -39,7 +39,7 @@
</sequential>
</target>
- <property name="version" value="3.1-SNAPSHOT"/>
+ <property name="version" value="3.2-SNAPSHOT"/>
<target name="get-maven-poms"
description="Copy Maven POMs from dev-tools/maven/ to their target locations">
<copy todir="." overwrite="true">
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template?rev=1080476&r1=1080475&r2=1080476&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template Fri Mar 11 07:35:00 2011
@@ -37,7 +37,7 @@
<module>solr</module>
</modules>
<properties>
- <base.specification.version>3.1.0</base.specification.version>
+ <base.specification.version>3.2.0</base.specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.5</java.compat.version>
<jetty.version>6.1.26</jetty.version>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1080476&r1=1080475&r2=1080476&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Fri Mar 11 07:35:00 2011
@@ -34,7 +34,7 @@
<properties>
<module-directory>solr/contrib/analysis-extras</module-directory>
<build-directory>build</build-directory>
- <tests.luceneMatchVersion>3.1</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>3.2</tests.luceneMatchVersion>
</properties>
<dependencies>
<dependency>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1080476&r1=1080475&r2=1080476&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template Fri Mar 11 07:35:00 2011
@@ -34,7 +34,7 @@
<properties>
<module-directory>solr/contrib/clustering</module-directory>
<build-directory>build</build-directory>
- <tests.luceneMatchVersion>3.1</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>3.2</tests.luceneMatchVersion>
</properties>
<dependencies>
<dependency>
@@ -102,6 +102,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template?rev=1080476&r1=1080475&r2=1080476&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template Fri Mar 11 07:35:00 2011
@@ -34,7 +34,7 @@
<properties>
<module-directory>solr/contrib/dataimporthandler/src/extras</module-directory>
<build-directory>../../target/extras</build-directory>
- <tests.luceneMatchVersion>3.1</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>3.2</tests.luceneMatchVersion>
</properties>
<dependencies>
<dependency>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1080476&r1=1080475&r2=1080476&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Fri Mar 11 07:35:00 2011
@@ -34,7 +34,7 @@
<properties>
<module-directory>solr/contrib/dataimporthandler</module-directory>
<build-directory>../target</build-directory>
- <tests.luceneMatchVersion>3.1</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>3.2</tests.luceneMatchVersion>
</properties>
<dependencies>
<dependency>
@@ -93,6 +93,16 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1080476&r1=1080475&r2=1080476&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template Fri Mar 11 07:35:00 2011
@@ -37,7 +37,7 @@
<properties>
<module-directory>solr/contrib/extraction</module-directory>
<build-directory>build</build-directory>
- <tests.luceneMatchVersion>3.1</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>3.2</tests.luceneMatchVersion>
</properties>
<dependencies>
<dependency>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template?rev=1080476&r1=1080475&r2=1080476&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template Fri Mar 11 07:35:00 2011
@@ -34,7 +34,7 @@
<properties>
<module-directory>solr</module-directory>
<build-directory>../build</build-directory>
- <tests.luceneMatchVersion>3.1</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>3.2</tests.luceneMatchVersion>
</properties>
<dependencies>
<dependency>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1080476&r1=1080475&r2=1080476&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template Fri Mar 11 07:35:00 2011
@@ -34,7 +34,7 @@
<properties>
<module-directory>solr/src/solrj</module-directory>
<build-directory>../../build/solrj</build-directory>
- <tests.luceneMatchVersion>3.1</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>3.2</tests.luceneMatchVersion>
</properties>
<dependencies>
<dependency>