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/25 23:11:28 UTC
svn commit: r1085581 - in /lucene/dev/trunk: ./
dev-tools/maven/lucene/contrib/ant/ dev-tools/maven/lucene/contrib/db/bdb-je/
dev-tools/maven/lucene/contrib/db/bdb/ dev-tools/maven/lucene/contrib/demo/
dev-tools/maven/lucene/contrib/highlighter/ dev-to...
Author: sarowe
Date: Fri Mar 25 22:11:27 2011
New Revision: 1085581
URL: http://svn.apache.org/viewvc?rev=1085581&view=rev
Log:
LUCENE-2609: Renamed the Lucene test-framework jar to 'lucene-test-framework-version.jar'; now including the test-framework javadoc jar in the binary packages; modified the Maven POMs to designate the test-framework artifacts as 'jar' packaging rather than 'test-jar' packaging - this changes the artifact classifiers to be the same as those of any other non-test module.
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/dev-tools/maven/lucene/contrib/ant/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/queries/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/swing/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/src/test-framework/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/src/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/src/solrj/pom.xml.template
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/solr/ (props changed)
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/ant/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/ant/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/ant/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/ant/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -47,7 +47,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/lucli/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/lucli/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/lucli/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -47,7 +47,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
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=1085581&r1=1085580&r2=1085581&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 Mar 25 22:11:27 2011
@@ -52,7 +52,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/queries/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/queries/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/queries/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -54,7 +54,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -54,7 +54,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
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=1085581&r1=1085580&r2=1085581&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 Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/swing/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/swing/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/swing/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/swing/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
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=1085581&r1=1085580&r2=1085581&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 Mar 25 22:11:27 2011
@@ -40,45 +40,31 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
- <directory>${build-directory}/classes/test-framework</directory>
- <testOutputDirectory>${build-directory}/classes/test-framework</testOutputDirectory>
- <testSourceDirectory>.</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
+ <sourceDirectory>.</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.sourceDirectory}</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
- </testResource>
- </testResources>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -52,7 +52,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -55,7 +55,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -47,7 +47,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -78,7 +78,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -63,7 +63,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -70,7 +70,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -63,7 +63,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -66,7 +66,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -58,7 +58,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/src/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/src/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -50,7 +50,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/src/solrj/pom.xml.template Fri Mar 25 22:11:27 2011
@@ -46,7 +46,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1085581&r1=1085580&r2=1085581&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Fri Mar 25 22:11:27 2011
@@ -46,7 +46,8 @@
</path>
<patternset id="binary.build.dist.patterns"
- includes="${final.name}*.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+ includes="${final.name}*.jar,lucene-test-framework*.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+ excludes="*-src.jar"
/>
<patternset id="binary.root.dist.patterns"
includes="docs/,*.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd"
@@ -441,36 +442,14 @@
classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
-
- <!--
- For the purposes of the generated artifacts, change the <packaging>
- in the test-framework POM from "jar" to "test-jar" - this allows
- artifact:deploy to properly name the artifact. The Maven build doesn't
- have a lifecycle mapping for the "test-jar" packaging, though, so the
- POM in src/test-framework/ is left with the "jar" packaging.
- -->
- <property name="test-jar-packaging-test-framework-pom"
- location="${build.dir}/test-jar-packaging-test-framework,pom"/>
- <copy file="src/test-framework/pom.xml"
- tofile="${test-jar-packaging-test-framework-pom}">
- <filterset begintoken="<packaging>" endtoken="</packaging>">
- <filter token="jar"
- value="<packaging>test-jar</packaging>"/>
- </filterset>
- </copy>
- <artifact:pom id="test-framework-pom"
- file="${test-jar-packaging-test-framework-pom}"/>
- <artifact:deploy file="${build.dir}/${final.name}-tests.jar">
- <attach file="${build.dir}/${final.name}-tests-src.jar"
- classifier="test-sources"/>
- <attach file="${build.dir}/${final.name}-tests-javadoc.jar"
- classifier="test-javadoc"/>
- <remoteRepository url="${m2.repository.url}">
- <authentication username="${m2.repository.username}"
- privateKey="${m2.repository.private.key}"/>
- </remoteRepository>
- <pom refid="test-framework-pom"/>
- </artifact:deploy>
+ <m2-deploy pom.xml="src/test-framework/pom.xml">
+ <artifact-attachments>
+ <attach file="${build.dir}/lucene-test-framework-${version}-src.jar"
+ classifier="sources"/>
+ <attach file="${build.dir}/lucene-test-framework-${version}-javadoc.jar"
+ classifier="javadoc"/>
+ </artifact-attachments>
+ </m2-deploy>
<contrib-crawl target="dist-maven"/>
</sequential>
@@ -675,7 +654,7 @@
</target>
<target name="jar-test-framework" depends="compile-test-framework">
- <jarify basedir="${build.dir}/classes/test-framework" destfile="${build.dir}/${final.name}-tests.jar"
+ <jarify basedir="${build.dir}/classes/test-framework" destfile="${build.dir}/lucene-test-framework-${version}.jar"
title="Lucene Search Engine: Test Framework" />
</target>
@@ -690,13 +669,13 @@
<link href=""/>
</sources>
</invoke-javadoc>
- <jarify basedir="${javadoc.dir}/test-framework" destfile="${build.dir}/${final.name}-tests-javadoc.jar"
+ <jarify basedir="${javadoc.dir}/test-framework" destfile="${build.dir}/lucene-test-framework-${version}-javadoc.jar"
title="Lucene Search Engine: Test Framework" />
</sequential>
</target>
<target name="jar-test-framework-src" depends="init">
- <jarify basedir="${tests-framework.src.dir}" destfile="${build.dir}/${final.name}-tests-src.jar"
+ <jarify basedir="${tests-framework.src.dir}" destfile="${build.dir}/lucene-test-framework-${version}-src.jar"
title="Lucene Search Engine: Test Framework" />
</target>