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/11/04 21:06:03 UTC
svn commit: r1197734 - in /lucene/dev/trunk/dev-tools/maven:
lucene/contrib/misc/pom.xml.template
lucene/contrib/spatial/pom.xml.template lucene/src/pom.xml.template
lucene/src/test-framework/pom.xml.template solr/core/pom.xml.template
Author: sarowe
Date: Fri Nov 4 20:06:03 2011
New Revision: 1197734
URL: http://svn.apache.org/viewvc?rev=1197734&view=rev
Log:
LUCENE-3490: Maven configuration
Modified:
lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/src/test-framework/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template?rev=1197734&r1=1197733&r2=1197734&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template Fri Nov 4 20:06:03 2011
@@ -53,6 +53,11 @@
<outputDirectory>${build-directory}/classes/java</outputDirectory>
<testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
<sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ </resource>
+ </resources>
<testSourceDirectory>src/test</testSourceDirectory>
<testResources>
<testResource>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1197734&r1=1197733&r2=1197734&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Fri Nov 4 20:06:03 2011
@@ -38,14 +38,14 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template?rev=1197734&r1=1197733&r2=1197734&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template Fri Nov 4 20:06:03 2011
@@ -57,16 +57,24 @@
<outputDirectory>${build-directory}/classes/java</outputDirectory>
<testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
<sourceDirectory>java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>resources</directory>
+ </resource>
+ </resources>
<testSourceDirectory>test</testSourceDirectory>
<testResources>
<testResource>
- <directory>${project.build.testSourceDirectory}</directory>
+ <directory>test-framework/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>test-framework/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
<testResource>
- <directory>test-framework</directory>
+ <directory>${project.build.testSourceDirectory}</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/src/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/src/test-framework/pom.xml.template?rev=1197734&r1=1197733&r2=1197734&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/src/test-framework/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/src/test-framework/pom.xml.template Fri Nov 4 20:06:03 2011
@@ -53,9 +53,12 @@
<build>
<directory>${build-directory}</directory>
<outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
- <sourceDirectory>.</sourceDirectory>
+ <sourceDirectory>java</sourceDirectory>
<resources>
<resource>
+ <directory>resources</directory>
+ </resource>
+ <resource>
<directory>${project.build.sourceDirectory}</directory>
<excludes>
<exclude>**/*.java</exclude>
Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template?rev=1197734&r1=1197733&r2=1197734&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Fri Nov 4 20:06:03 2011
@@ -37,6 +37,12 @@
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>solr-solrj</artifactId>
<version>${project.version}</version>
Re: svn commit: r1197734 - in /lucene/dev/trunk/dev-tools/maven:
lucene/contrib/misc/pom.xml.template lucene/contrib/spatial/pom.xml.template
lucene/src/pom.xml.template lucene/src/test-framework/pom.xml.template solr/core/pom.xml.template
Posted by Robert Muir <rc...@gmail.com>.
TestImpersonation will fail if this isn't right, as will 25% of other
tests if they try to write something
On Sat, Nov 5, 2011 at 6:22 AM, Uwe Schindler <uw...@thetaphi.de> wrote:
> Hi Steven,
>
> I just wanted a confirmation that the classpath for tests lists the test-framework *before* the lucene-core classpath. Otherwise the Preflex-RW codec does not take precedence (as SPI loads the first codec registered as "Lucene3x" on the classpath, but if lucene-core is before in classpath, this would load the read-only default core codec not the test-private RW mock).
>
> From the maven config I have no idea how it orders classpath, so I just wanted an explanation how this works there. Order of classpath is in most cases not important, but for this special case its important!
>
> Uwe
>
> -----
> Uwe Schindler
> H.-H.-Meier-Allee 63, D-28213 Bremen
> http://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>> -----Original Message-----
>> From: sarowe@apache.org [mailto:sarowe@apache.org]
>> Sent: Friday, November 04, 2011 9:06 PM
>> To: commits@lucene.apache.org
>> Subject: svn commit: r1197734 - in /lucene/dev/trunk/dev-tools/maven:
>> lucene/contrib/misc/pom.xml.template
>> lucene/contrib/spatial/pom.xml.template lucene/src/pom.xml.template
>> lucene/src/test-framework/pom.xml.template solr/core/pom.xml.template
>>
>> Author: sarowe
>> Date: Fri Nov 4 20:06:03 2011
>> New Revision: 1197734
>>
>> URL: http://svn.apache.org/viewvc?rev=1197734&view=rev
>> Log:
>> LUCENE-3490: Maven configuration
>>
>> Modified:
>> lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
>> lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
>> lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template
>> lucene/dev/trunk/dev-tools/maven/lucene/src/test-
>> framework/pom.xml.template
>> lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
>>
>> Modified: lucene/dev/trunk/dev-
>> tools/maven/lucene/contrib/misc/pom.xml.template
>> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
>> tools/maven/lucene/contrib/misc/pom.xml.template?rev=1197734&r1=119773
>> 3&r2=1197734&view=diff
>> ================================================================
>> ==============
>> --- lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
>> (original)
>> +++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
>> Fri Nov 4 20:06:03 2011
>> @@ -53,6 +53,11 @@
>> <outputDirectory>${build-directory}/classes/java</outputDirectory>
>> <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
>> <sourceDirectory>src/java</sourceDirectory>
>> + <resources>
>> + <resource>
>> + <directory>src/resources</directory>
>> + </resource>
>> + </resources>
>> <testSourceDirectory>src/test</testSourceDirectory>
>> <testResources>
>> <testResource>
>>
>> Modified: lucene/dev/trunk/dev-
>> tools/maven/lucene/contrib/spatial/pom.xml.template
>> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
>> tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1197734&r1=1197
>> 733&r2=1197734&view=diff
>> ================================================================
>> ==============
>> --- lucene/dev/trunk/dev-
>> tools/maven/lucene/contrib/spatial/pom.xml.template (original)
>> +++ lucene/dev/trunk/dev-
>> tools/maven/lucene/contrib/spatial/pom.xml.template Fri Nov 4 20:06:03 2011
>> @@ -38,14 +38,14 @@
>> <dependencies>
>> <dependency>
>> <groupId>${project.groupId}</groupId>
>> - <artifactId>lucene-core</artifactId>
>> + <artifactId>lucene-test-framework</artifactId>
>> <version>${project.version}</version>
>> + <scope>test</scope>
>> </dependency>
>> <dependency>
>> <groupId>${project.groupId}</groupId>
>> - <artifactId>lucene-test-framework</artifactId>
>> + <artifactId>lucene-core</artifactId>
>> <version>${project.version}</version>
>> - <scope>test</scope>
>> </dependency>
>> <dependency>
>> <groupId>${project.groupId}</groupId>
>>
>> Modified: lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template
>> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
>> tools/maven/lucene/src/pom.xml.template?rev=1197734&r1=1197733&r2=119
>> 7734&view=diff
>> ================================================================
>> ==============
>> --- lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template (original)
>> +++ lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template Fri Nov
>> 4 20:06:03 2011
>> @@ -57,16 +57,24 @@
>> <outputDirectory>${build-directory}/classes/java</outputDirectory>
>> <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
>> <sourceDirectory>java</sourceDirectory>
>> + <resources>
>> + <resource>
>> + <directory>resources</directory>
>> + </resource>
>> + </resources>
>> <testSourceDirectory>test</testSourceDirectory>
>> <testResources>
>> <testResource>
>> - <directory>${project.build.testSourceDirectory}</directory>
>> + <directory>test-framework/resources</directory>
>> + </testResource>
>> + <testResource>
>> + <directory>test-framework/java</directory>
>> <excludes>
>> <exclude>**/*.java</exclude>
>> </excludes>
>> </testResource>
>> <testResource>
>> - <directory>test-framework</directory>
>> + <directory>${project.build.testSourceDirectory}</directory>
>> <excludes>
>> <exclude>**/*.java</exclude>
>> </excludes>
>>
>> Modified: lucene/dev/trunk/dev-tools/maven/lucene/src/test-
>> framework/pom.xml.template
>> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
>> tools/maven/lucene/src/test-
>> framework/pom.xml.template?rev=1197734&r1=1197733&r2=1197734&view=
>> diff
>> ================================================================
>> ==============
>> --- lucene/dev/trunk/dev-tools/maven/lucene/src/test-
>> framework/pom.xml.template (original)
>> +++ lucene/dev/trunk/dev-tools/maven/lucene/src/test-
>> framework/pom.xml.template Fri Nov 4 20:06:03 2011
>> @@ -53,9 +53,12 @@
>> <build>
>> <directory>${build-directory}</directory>
>> <outputDirectory>${build-directory}/classes/test-
>> framework</outputDirectory>
>> - <sourceDirectory>.</sourceDirectory>
>> + <sourceDirectory>java</sourceDirectory>
>> <resources>
>> <resource>
>> + <directory>resources</directory>
>> + </resource>
>> + <resource>
>> <directory>${project.build.sourceDirectory}</directory>
>> <excludes>
>> <exclude>**/*.java</exclude>
>>
>> Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
>> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
>> tools/maven/solr/core/pom.xml.template?rev=1197734&r1=1197733&r2=1197
>> 734&view=diff
>> ================================================================
>> ==============
>> --- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
>> +++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Fri Nov 4
>> 20:06:03 2011
>> @@ -37,6 +37,12 @@
>> </properties>
>> <dependencies>
>> <dependency>
>> + <groupId>org.apache.lucene</groupId>
>> + <artifactId>lucene-test-framework</artifactId>
>> + <version>${project.version}</version>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> <groupId>${project.groupId}</groupId>
>> <artifactId>solr-solrj</artifactId>
>> <version>${project.version}</version>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
>
--
lucidimagination.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
RE: svn commit: r1197734 - in /lucene/dev/trunk/dev-tools/maven: lucene/contrib/misc/pom.xml.template lucene/contrib/spatial/pom.xml.template lucene/src/pom.xml.template lucene/src/test-framework/pom.xml.template solr/core/pom.xml.template
Posted by Uwe Schindler <uw...@thetaphi.de>.
Hi Steven,
I just wanted a confirmation that the classpath for tests lists the test-framework *before* the lucene-core classpath. Otherwise the Preflex-RW codec does not take precedence (as SPI loads the first codec registered as "Lucene3x" on the classpath, but if lucene-core is before in classpath, this would load the read-only default core codec not the test-private RW mock).
>From the maven config I have no idea how it orders classpath, so I just wanted an explanation how this works there. Order of classpath is in most cases not important, but for this special case its important!
Uwe
-----
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: uwe@thetaphi.de
> -----Original Message-----
> From: sarowe@apache.org [mailto:sarowe@apache.org]
> Sent: Friday, November 04, 2011 9:06 PM
> To: commits@lucene.apache.org
> Subject: svn commit: r1197734 - in /lucene/dev/trunk/dev-tools/maven:
> lucene/contrib/misc/pom.xml.template
> lucene/contrib/spatial/pom.xml.template lucene/src/pom.xml.template
> lucene/src/test-framework/pom.xml.template solr/core/pom.xml.template
>
> Author: sarowe
> Date: Fri Nov 4 20:06:03 2011
> New Revision: 1197734
>
> URL: http://svn.apache.org/viewvc?rev=1197734&view=rev
> Log:
> LUCENE-3490: Maven configuration
>
> Modified:
> lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
> lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
> lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template
> lucene/dev/trunk/dev-tools/maven/lucene/src/test-
> framework/pom.xml.template
> lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
>
> Modified: lucene/dev/trunk/dev-
> tools/maven/lucene/contrib/misc/pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
> tools/maven/lucene/contrib/misc/pom.xml.template?rev=1197734&r1=119773
> 3&r2=1197734&view=diff
> ================================================================
> ==============
> --- lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
> (original)
> +++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
> Fri Nov 4 20:06:03 2011
> @@ -53,6 +53,11 @@
> <outputDirectory>${build-directory}/classes/java</outputDirectory>
> <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
> <sourceDirectory>src/java</sourceDirectory>
> + <resources>
> + <resource>
> + <directory>src/resources</directory>
> + </resource>
> + </resources>
> <testSourceDirectory>src/test</testSourceDirectory>
> <testResources>
> <testResource>
>
> Modified: lucene/dev/trunk/dev-
> tools/maven/lucene/contrib/spatial/pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
> tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1197734&r1=1197
> 733&r2=1197734&view=diff
> ================================================================
> ==============
> --- lucene/dev/trunk/dev-
> tools/maven/lucene/contrib/spatial/pom.xml.template (original)
> +++ lucene/dev/trunk/dev-
> tools/maven/lucene/contrib/spatial/pom.xml.template Fri Nov 4 20:06:03 2011
> @@ -38,14 +38,14 @@
> <dependencies>
> <dependency>
> <groupId>${project.groupId}</groupId>
> - <artifactId>lucene-core</artifactId>
> + <artifactId>lucene-test-framework</artifactId>
> <version>${project.version}</version>
> + <scope>test</scope>
> </dependency>
> <dependency>
> <groupId>${project.groupId}</groupId>
> - <artifactId>lucene-test-framework</artifactId>
> + <artifactId>lucene-core</artifactId>
> <version>${project.version}</version>
> - <scope>test</scope>
> </dependency>
> <dependency>
> <groupId>${project.groupId}</groupId>
>
> Modified: lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
> tools/maven/lucene/src/pom.xml.template?rev=1197734&r1=1197733&r2=119
> 7734&view=diff
> ================================================================
> ==============
> --- lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template (original)
> +++ lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template Fri Nov
> 4 20:06:03 2011
> @@ -57,16 +57,24 @@
> <outputDirectory>${build-directory}/classes/java</outputDirectory>
> <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
> <sourceDirectory>java</sourceDirectory>
> + <resources>
> + <resource>
> + <directory>resources</directory>
> + </resource>
> + </resources>
> <testSourceDirectory>test</testSourceDirectory>
> <testResources>
> <testResource>
> - <directory>${project.build.testSourceDirectory}</directory>
> + <directory>test-framework/resources</directory>
> + </testResource>
> + <testResource>
> + <directory>test-framework/java</directory>
> <excludes>
> <exclude>**/*.java</exclude>
> </excludes>
> </testResource>
> <testResource>
> - <directory>test-framework</directory>
> + <directory>${project.build.testSourceDirectory}</directory>
> <excludes>
> <exclude>**/*.java</exclude>
> </excludes>
>
> Modified: lucene/dev/trunk/dev-tools/maven/lucene/src/test-
> framework/pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
> tools/maven/lucene/src/test-
> framework/pom.xml.template?rev=1197734&r1=1197733&r2=1197734&view=
> diff
> ================================================================
> ==============
> --- lucene/dev/trunk/dev-tools/maven/lucene/src/test-
> framework/pom.xml.template (original)
> +++ lucene/dev/trunk/dev-tools/maven/lucene/src/test-
> framework/pom.xml.template Fri Nov 4 20:06:03 2011
> @@ -53,9 +53,12 @@
> <build>
> <directory>${build-directory}</directory>
> <outputDirectory>${build-directory}/classes/test-
> framework</outputDirectory>
> - <sourceDirectory>.</sourceDirectory>
> + <sourceDirectory>java</sourceDirectory>
> <resources>
> <resource>
> + <directory>resources</directory>
> + </resource>
> + <resource>
> <directory>${project.build.sourceDirectory}</directory>
> <excludes>
> <exclude>**/*.java</exclude>
>
> Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-
> tools/maven/solr/core/pom.xml.template?rev=1197734&r1=1197733&r2=1197
> 734&view=diff
> ================================================================
> ==============
> --- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
> +++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Fri Nov 4
> 20:06:03 2011
> @@ -37,6 +37,12 @@
> </properties>
> <dependencies>
> <dependency>
> + <groupId>org.apache.lucene</groupId>
> + <artifactId>lucene-test-framework</artifactId>
> + <version>${project.version}</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> <groupId>${project.groupId}</groupId>
> <artifactId>solr-solrj</artifactId>
> <version>${project.version}</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org