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 2012/09/07 00:17:04 UTC
svn commit: r1381779 - in /lucene/dev/trunk:
dev-tools/maven/lucene/analysis/ dev-tools/maven/lucene/codecs/
dev-tools/maven/lucene/codecs/src/ dev-tools/maven/lucene/codecs/src/java/
dev-tools/maven/lucene/codecs/src/test/ dev-tools/maven/lucene/core/...
Author: sarowe
Date: Thu Sep 6 22:17:03 2012
New Revision: 1381779
URL: http://svn.apache.org/viewvc?rev=1381779&view=rev
Log:
LUCENE-4365: split maven modules into main/test sub-modules for the four modules with cyclic dependencies on the Lucene or Solr test-framework modules: lucene-core, lucene-codecs, solr-core, and solr-solrj
Added:
lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/
lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/java/
lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/java/pom.xml.template
- copied, changed from r1381433, lucene/dev/trunk/dev-tools/maven/lucene/codecs/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/test/
lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/test/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/core/src/
lucene/dev/trunk/dev-tools/maven/lucene/core/src/java/
lucene/dev/trunk/dev-tools/maven/lucene/core/src/java/pom.xml.template
- copied, changed from r1381433, lucene/dev/trunk/dev-tools/maven/lucene/core/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/
lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/src/
lucene/dev/trunk/dev-tools/maven/solr/core/src/java/
lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template
- copied, changed from r1381433, lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/src/test/
lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/solrj/src/
lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/
lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template
- copied, changed from r1381433, lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/
lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template
Modified:
lucene/dev/trunk/dev-tools/maven/lucene/analysis/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/codecs/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/core/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/test-framework/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template
lucene/dev/trunk/lucene/codecs/build.xml
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/lucene/core/build.xml
lucene/dev/trunk/solr/common-build.xml
lucene/dev/trunk/solr/core/build.xml
lucene/dev/trunk/solr/solrj/build.xml
Modified: lucene/dev/trunk/dev-tools/maven/lucene/analysis/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/analysis/pom.xml.template?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/analysis/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/analysis/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -41,7 +41,6 @@
<module>uima</module>
</modules>
<build>
- <directory>build/lucene-analysis-modules-aggregator</directory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/codecs/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/codecs/pom.xml.template?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/codecs/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/codecs/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -9,9 +9,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,46 +27,22 @@
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-codecs</artifactId>
- <packaging>jar</packaging>
- <name>Lucene codecs</name>
- <description>
- Codecs and postings formats for Apache Lucene.
- </description>
- <properties>
- <module-directory>lucene/codecs</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
- </properties>
- <scm>
- <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
- <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
- <url>${vc-browse-base-url}/${module-directory}</url>
- </scm>
- <dependencies>
- <dependency>
- <!-- lucene-test-framework dependency must be declared before lucene-core -->
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <artifactId>lucene-codecs-aggregator</artifactId>
+ <packaging>pom</packaging>
+ <name>Lucene codecs aggregator POM</name>
+ <modules>
+ <module>src/java</module>
+ <module>src/test</module>
+ </modules>
<build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Copied: lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/java/pom.xml.template (from r1381433, lucene/dev/trunk/dev-tools/maven/lucene/codecs/pom.xml.template)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/java/pom.xml.template?p2=lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/java/pom.xml.template&p1=lucene/dev/trunk/dev-tools/maven/lucene/codecs/pom.xml.template&r1=1381433&r2=1381779&rev=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/codecs/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/java/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -24,7 +24,7 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-parent</artifactId>
<version>@version@</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-codecs</artifactId>
@@ -35,8 +35,8 @@
</description>
<properties>
<module-directory>lucene/codecs</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <top-level>../../../../..</top-level>
+ <module-path>${top-level}/${module-directory}/src/java</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -44,13 +44,6 @@
<url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
- <dependency>
- <!-- lucene-test-framework dependency must be declared before lucene-core -->
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>lucene-core</artifactId>
@@ -58,15 +51,28 @@
</dependency>
</dependencies>
<build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
+ <sourceDirectory>${module-path}</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${module-path}/../resources</directory>
+ </resource>
+ </resources>
+ <testSourceDirectory/>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip> <!-- Tests are run from lucene-codecs-tests module -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <skip>true</skip> <!-- This skips test compilation - tests are run from lucene-codecs-tests module -->
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Added: lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/test/pom.xml.template?rev=1381779&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/test/pom.xml.template (added)
+++ lucene/dev/trunk/dev-tools/maven/lucene/codecs/src/test/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -0,0 +1,74 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-codecs-tests</artifactId>
+ <name>Lucene codecs tests</name>
+ <packaging>jar</packaging>
+ <properties>
+ <module-directory>lucene/codecs</module-directory>
+ <top-level>../../../../..</top-level>
+ <module-path>${top-level}/${module-directory}/src/test</module-path>
+ </properties>
+ <dependencies>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-codecs</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory/>
+ <testSourceDirectory>${module-path}</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${project.build.testSourceDirectory}</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/core/pom.xml.template?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/core/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -27,90 +27,22 @@
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <packaging>jar</packaging>
- <name>Lucene Core</name>
- <description>Apache Lucene Java Core</description>
- <properties>
- <module-directory>lucene/core</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
- </properties>
- <scm>
- <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
- <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
- <url>${vc-browse-base-url}/${module-directory}</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch.randomizedtesting</groupId>
- <artifactId>randomizedtesting-runner</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <artifactId>lucene-core-aggregator</artifactId>
+ <packaging>pom</packaging>
+ <name>Lucene Core aggregator POM</name>
+ <modules>
+ <module>src/java</module>
+ <module>src/test</module>
+ </modules>
<build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <resources>
- <resource>
- <directory>${module-path}/src/resources</directory>
- </resource>
- </resources>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${top-level}/lucene/test-framework/src/resources</directory>
- </testResource>
- <testResource>
- <directory>${top-level}/lucene/test-framework/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-deploy-plugin</artifactId>
<configuration>
- <systemPropertyVariables>
- <lucene.version>${project.version}</lucene.version>
- </systemPropertyVariables>
+ <skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${top-level}/lucene/test-framework/src/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Copied: lucene/dev/trunk/dev-tools/maven/lucene/core/src/java/pom.xml.template (from r1381433, lucene/dev/trunk/dev-tools/maven/lucene/core/pom.xml.template)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/core/src/java/pom.xml.template?p2=lucene/dev/trunk/dev-tools/maven/lucene/core/src/java/pom.xml.template&p1=lucene/dev/trunk/dev-tools/maven/lucene/core/pom.xml.template&r1=1381433&r2=1381779&rev=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/core/src/java/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -33,83 +33,36 @@
<description>Apache Lucene Java Core</description>
<properties>
<module-directory>lucene/core</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <top-level>../../../../..</top-level>
+ <module-path>${top-level}/${module-directory}/src/java</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
<developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
<url>${vc-browse-base-url}/${module-directory}</url>
</scm>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch.randomizedtesting</groupId>
- <artifactId>randomizedtesting-runner</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
+ <sourceDirectory>${module-path}</sourceDirectory>
<resources>
<resource>
- <directory>${module-path}/src/resources</directory>
+ <directory>${module-path}/../resources</directory>
</resource>
</resources>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${top-level}/lucene/test-framework/src/resources</directory>
- </testResource>
- <testResource>
- <directory>${top-level}/lucene/test-framework/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
+ <testSourceDirectory/>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <systemPropertyVariables>
- <lucene.version>${project.version}</lucene.version>
- </systemPropertyVariables>
+ <skip>true</skip> <!-- Tests are run from lucene-codecs-tests module -->
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${top-level}/lucene/test-framework/src/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <skip>true</skip> <!-- This skips test compilation - tests are run from lucene-codecs-tests module -->
+ </configuration>
</plugin>
</plugins>
</build>
Added: lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template?rev=1381779&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template (added)
+++ lucene/dev/trunk/dev-tools/maven/lucene/core/src/test/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -0,0 +1,98 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core-tests</artifactId>
+ <name>Lucene Core tests</name>
+ <packaging>jar</packaging>
+ <properties>
+ <module-directory>lucene/core</module-directory>
+ <top-level>../../../../..</top-level>
+ <module-path>${top-level}/${module-directory}/src/test</module-path>
+ </properties>
+ <dependencies>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</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</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.carrotsearch.randomizedtesting</groupId>
+ <artifactId>randomizedtesting-runner</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory/>
+ <testSourceDirectory>${module-path}</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${project.build.testSourceDirectory}</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <lucene.version>${project.version}</lucene.version>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/test-framework/pom.xml.template?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/test-framework/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/test-framework/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -48,6 +48,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-codecs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
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=1381779&r1=1381778&r2=1381779&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 Thu Sep 6 22:17:03 2012
@@ -27,233 +27,21 @@
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr Core</name>
- <description>Apache Solr Core</description>
- <properties>
- <module-directory>solr/core</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
- </properties>
- <scm>
- <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
- <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
- <url>${vc-browse-base-url}/${module-directory}</url>
- </scm>
- <dependencies>
- <dependency>
- <!-- lucene-test-framework dependency must be declared before lucene-core -->
- <!-- This dependency cannot be put into solr-parent, because local -->
- <!-- dependencies are always ordered before inherited dependencies. -->
- <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>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-kuromoji</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-morfologik</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-phonetic</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-misc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-sandbox</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-suggest</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-grouping</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <!-- SOLR-3263: Provided scope is required to avoid jar signing conflicts -->
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- </dependency>
- </dependencies>
+ <artifactId>solr-core-aggregator</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Solr Core aggregator POM</name>
+ <modules>
+ <module>src/java</module>
+ <module>src/test</module>
+ </modules>
<build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${module-path}/src/test-files</directory>
- </testResource>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- <testResource>
- <directory>${top-level}/dev-tools/maven/solr</directory>
- <includes>
- <include>maven.testlogging.properties</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-framework</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${top-level}/solr/test-framework/src/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
</plugins>
</build>
Copied: lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template (from r1381433, 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/src/java/pom.xml.template?p2=lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template&p1=lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template&r1=1381433&r2=1381779&rev=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -24,7 +24,7 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
<version>@version@</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
@@ -33,8 +33,8 @@
<description>Apache Solr Core</description>
<properties>
<module-directory>solr/core</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <top-level>../../../../..</top-level>
+ <module-path>${top-level}/${module-directory}/src/java</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -43,15 +43,6 @@
</scm>
<dependencies>
<dependency>
- <!-- lucene-test-framework dependency must be declared before lucene-core -->
- <!-- This dependency cannot be put into solr-parent, because local -->
- <!-- dependencies are always ordered before inherited dependencies. -->
- <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>
@@ -192,16 +183,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<exclusions>
@@ -217,43 +198,23 @@
</dependency>
</dependencies>
<build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${module-path}/src/test-files</directory>
- </testResource>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- <testResource>
- <directory>${top-level}/dev-tools/maven/solr</directory>
- <includes>
- <include>maven.testlogging.properties</include>
- </includes>
- </testResource>
- </testResources>
+ <sourceDirectory>${module-path}</sourceDirectory>
+ <testSourceDirectory/>
+ <testResources/>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-framework</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${top-level}/solr/test-framework/src/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip> <!-- Tests are run from solr-core-tests module -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <skip>true</skip> <!-- This skips test compilation - tests are run from solr-core-tests module -->
+ </configuration>
</plugin>
</plugins>
</build>
Added: lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template?rev=1381779&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template (added)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/src/test/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -0,0 +1,131 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-core-tests</artifactId>
+ <name>Apache Solr Core tests</name>
+ <packaging>jar</packaging>
+ <properties>
+ <module-directory>solr/core</module-directory>
+ <top-level>../../../../..</top-level>
+ <module-path>${top-level}/${module-directory}/src/test</module-path>
+ </properties>
+ <dependencies>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
+ <!-- This dependency cannot be put into solr-parent, because local -->
+ <!-- dependencies are always ordered before inherited dependencies. -->
+ <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-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory/>
+ <!-- Instead of depending on solr-core module, use its output directory -->
+ <outputDirectory>../java/target/classes</outputDirectory>
+ <testSourceDirectory>${module-path}</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${module-path}/../test-files</directory>
+ </testResource>
+ <testResource>
+ <directory>${project.build.testSourceDirectory}</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <!-- Skipping by binding the default execution ID to a non-existent phase only works in Maven 3, not 2. -->
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-install</id>
+ <!-- Skipping by binding the default execution ID to a non-existent phase only works in Maven 3, not 2. -->
+ <phase>none</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- Skipping enabled in maven-install-plugin v2.4 -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -27,268 +27,21 @@
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr Solrj</name>
- <description>Apache Solr Solrj</description>
- <properties>
- <module-directory>solr/solrj</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
- </properties>
- <scm>
- <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
- <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
- <url>${vc-browse-base-url}/${module-directory}</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- Need log4j api so long as Zookeeper does; see https://issues.apache.org/jira/browse/ZOOKEEPER-850 -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <optional>true</optional> <!-- let the end user decide... they may be using log4j directly! -->
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <!-- HttpSolrServer requires this dependency. -->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <!-- HttpSolrServer requires this dependency. -->
- </dependency>
- <!-- Technically, this is optional in SolrJ; but it's fast. SOLR-2852 -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <!-- lucene-test-framework dependency must be declared before lucene-core -->
- <!-- This dependency cannot be put into solr-parent, because local -->
- <!-- dependencies are always ordered before inherited dependencies. -->
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-kuromoji</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-morfologik</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-phonetic</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-misc</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-sandbox</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-suggest</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-grouping</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <artifactId>solr-solrj-aggregator</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Solr Solrj aggregator POM</name>
+ <modules>
+ <module>src/java</module>
+ <module>src/test</module>
+ </modules>
<build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${module-path}/src/test-files</directory>
- </testResource>
- <testResource>
- <directory>${top-level}/dev-tools/maven/solr</directory>
- <includes>
- <include>maven.testlogging.properties</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-solr-core-and-test-framework</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${top-level}/solr/core/src/java</source>
- <source>${top-level}/solr/test-framework/src/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
</plugins>
</build>
Copied: lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template (from r1381433, lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template?p2=lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template&p1=lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template&r1=1381433&r2=1381779&rev=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -24,7 +24,7 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
<version>@version@</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
@@ -33,8 +33,8 @@
<description>Apache Solr Solrj</description>
<properties>
<module-directory>solr/solrj</module-directory>
- <top-level>../../..</top-level>
- <module-path>${top-level}/${module-directory}</module-path>
+ <top-level>../../../../..</top-level>
+ <module-path>${top-level}/${module-directory}/src/java</module-path>
</properties>
<scm>
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
@@ -111,184 +111,24 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <!-- lucene-test-framework dependency must be declared before lucene-core -->
- <!-- This dependency cannot be put into solr-parent, because local -->
- <!-- dependencies are always ordered before inherited dependencies. -->
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-kuromoji</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-morfologik</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-phonetic</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-misc</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-sandbox</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-suggest</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-grouping</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${module-path}/src/test-files</directory>
- </testResource>
- <testResource>
- <directory>${top-level}/dev-tools/maven/solr</directory>
- <includes>
- <include>maven.testlogging.properties</include>
- </includes>
- </testResource>
- </testResources>
+ <sourceDirectory>${module-path}</sourceDirectory>
+ <testSourceDirectory/>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-solr-core-and-test-framework</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${top-level}/solr/core/src/java</source>
- <source>${top-level}/solr/test-framework/src/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip> <!-- Tests are run from solr-solrj-tests module -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <skip>true</skip> <!-- This skips test compilation - tests are run from solr-solrj-tests module -->
+ </configuration>
</plugin>
</plugins>
</build>
Added: lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template?rev=1381779&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template (added)
+++ lucene/dev/trunk/dev-tools/maven/solr/solrj/src/test/pom.xml.template Thu Sep 6 22:17:03 2012
@@ -0,0 +1,121 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj-tests</artifactId>
+ <name>Apache Solr Solrj tests</name>
+ <packaging>jar</packaging>
+ <properties>
+ <module-directory>solr/solrj</module-directory>
+ <top-level>../../../../..</top-level>
+ <module-path>${top-level}/${module-directory}/src/test</module-path>
+ <maven.install.skip>true</maven.install.skip>
+ </properties>
+ <dependencies>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
+ <!-- This dependency cannot be put into solr-parent, because local -->
+ <!-- dependencies are always ordered before inherited dependencies. -->
+ <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-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory/>
+ <!-- Instead of depending on solr-solrj module, use its output directory -->
+ <outputDirectory>../java/target/classes</outputDirectory>
+ <testSourceDirectory>${module-path}</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${module-path}/../test-files</directory>
+ </testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <!-- Skipping by binding the default execution ID to a non-existent phase only works in Maven 3, not 2. -->
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-install</id>
+ <!-- Skipping by binding the default execution ID to a non-existent phase only works in Maven 3, not 2. -->
+ <phase>none</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- Skipping enabled in maven-install-plugin v2.4 -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/trunk/lucene/codecs/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/build.xml?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/build.xml (original)
+++ lucene/dev/trunk/lucene/codecs/build.xml Thu Sep 6 22:17:03 2012
@@ -21,4 +21,6 @@
</description>
<import file="../module-build.xml"/>
+
+ <target name="dist-maven" depends="dist-maven-src-java"/>
</project>
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Thu Sep 6 22:17:03 2012
@@ -1269,6 +1269,32 @@ ${tests-output}/junit4-*.suites - pe
</sequential>
</target>
+ <target name="dist-maven-src-java"
+ depends="filter-pom-templates, install-maven-tasks, m2-deploy-lucene-parent-pom, dist-maven-common-src-java"/>
+ <target name="dist-maven-common-src-java"
+ depends="jar-core, jar-src, javadocs, install-maven-tasks, filter-pom-templates">
+ <sequential>
+ <property name="top.level.dir" location="${common.dir}/.."/>
+ <pathconvert property="pom.xml">
+ <mapper>
+ <chainedmapper>
+ <globmapper from="${top.level.dir}*" to="${filtered.pom.templates.dir}*"/>
+ <globmapper from="*build.xml" to="*/src/java/pom.xml"/>
+ </chainedmapper>
+ </mapper>
+ <path location="${ant.file}"/>
+ </pathconvert>
+ <m2-deploy pom.xml="${pom.xml}">
+ <artifact-attachments>
+ <attach file="${build.dir}/${final.name}-src.jar"
+ classifier="sources"/>
+ <attach file="${build.dir}/${final.name}-javadoc.jar"
+ classifier="javadoc"/>
+ </artifact-attachments>
+ </m2-deploy>
+ </sequential>
+ </target>
+
<target name="-validate-maven-dependencies">
<property name="top.level.dir" location="${common.dir}/.."/>
<pathconvert property="pom.xml">
Modified: lucene/dev/trunk/lucene/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/build.xml?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/build.xml (original)
+++ lucene/dev/trunk/lucene/core/build.xml Thu Sep 6 22:17:03 2012
@@ -56,6 +56,8 @@
</sequential>
</target>
+ <target name="dist-maven" depends="dist-maven-src-java"/>
+
<macrodef name="createLevAutomaton">
<attribute name="n"/>
<sequential>
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Thu Sep 6 22:17:03 2012
@@ -277,6 +277,9 @@
<target name="dist-maven"
depends="filter-pom-templates, install-maven-tasks, m2-deploy-solr-parent-pom, dist-maven-common"/>
+ <target name="dist-maven-src-java"
+ depends="filter-pom-templates, install-maven-tasks, m2-deploy-solr-parent-pom, dist-maven-common-src-java"/>
+
<target name="-validate-maven-dependencies">
<property name="top.level.dir" location="${common.dir}/.."/>
<pathconvert property="pom.xml">
Modified: lucene/dev/trunk/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/build.xml?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/build.xml (original)
+++ lucene/dev/trunk/solr/core/build.xml Thu Sep 6 22:17:03 2012
@@ -31,4 +31,5 @@
<target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
+ <target name="dist-maven" depends="dist-maven-src-java"/>
</project>
Modified: lucene/dev/trunk/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/build.xml?rev=1381779&r1=1381778&r2=1381779&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/build.xml (original)
+++ lucene/dev/trunk/solr/solrj/build.xml Thu Sep 6 22:17:03 2012
@@ -55,4 +55,6 @@
<fileset dir="${javadoc.dir}"/>
</copy>
</target>
+
+ <target name="dist-maven" depends="dist-maven-src-java"/>
</project>