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/01/21 04:42:53 UTC
svn commit: r1061612 [3/3] - in /lucene/dev/branches/branch_3x: ./
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/
dev-tools/maven/lucene/contrib/analyzers/
dev-tools/maven/lucene/contrib/analyzers/common/ dev-tools/maven/lucen...
Added: lucene/dev/branches/branch_3x/dev-tools/maven/solr/pom.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/pom.xml?rev=1061612&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/pom.xml (added)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/pom.xml Fri Jan 21 03:42:49 2011
@@ -0,0 +1,91 @@
+<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-solr-grandparent</artifactId>
+ <version>3.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Solr parent POM</name>
+ <description>Apache Solr parent POM</description>
+ <modules>
+ <module>src</module>
+ <module>src/solrj</module>
+ <module>src/webapp</module>
+ <module>contrib</module>
+ </modules>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/SOLR</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>
+ http://lucene.zones.apache.org:8080/hudson/job/Solr-Nightly/
+ </url>
+ </ciManagement>
+ <mailingLists>
+ <mailingList>
+ <name>Solr User List</name>
+ <subscribe>solr-user-subscribe@lucene.apache.org</subscribe>
+ <unsubscribe>solr-user-unsubscribe@lucene.apache.org</unsubscribe>
+ <archive>
+ http://mail-archives.apache.org/mod_mbox/solr-user/
+ </archive>
+ </mailingList>
+ <mailingList>
+ <name>Java Developer List</name>
+ <subscribe>dev-subscribe@lucene.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@lucene.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/lucene-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Java Commits List</name>
+ <subscribe>commits-subscribe@lucene.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@lucene.apache.org</unsubscribe>
+ <archive>
+ http://mail-archives.apache.org/mod_mbox/lucene-java-commits/
+ </archive>
+ </mailingList>
+ </mailingLists>
+ <inceptionYear>2006</inceptionYear>
+ <build>
+ <directory>build/solr-parent</directory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <overview/>
+ <windowtitle>${project.name} ${project.version} API (${now.version})</windowtitle>
+ <doctitle>${project.name} ${project.version} API (${now.version})</doctitle>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Added: lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml?rev=1061612&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml (added)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml Fri Jan 21 03:42:49 2011
@@ -0,0 +1,247 @@
+<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>3.1-SNAPSHOT</version>
+ <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</module-directory>
+ <build-directory>../build</build-directory>
+ <tests.luceneMatchVersion>3.1</tests.luceneMatchVersion>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-noggit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</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-queries</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spellchecker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-commons-csv</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-jetty</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/solr</outputDirectory>
+ <testOutputDirectory>${build-directory}/tests</testOutputDirectory>
+ <sourceDirectory>java</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>test-files</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>webapp/src</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <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>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>../../../testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <configuration>
+ <extraJvmArguments>-Xmx128M</extraJvmArguments>
+ <repositoryLayout>flat</repositoryLayout>
+ <platforms>
+ <platform>windows</platform>
+ <platform>unix</platform>
+ </platforms>
+ <programs>
+ <program>
+ <mainClass>org.apache.solr.client.solrj.embedded.JettySolrRunner</mainClass>
+ <name>JettySolrRunner</name>
+ </program>
+ <program>
+ <mainClass>org.apache.solr.util.BitSetPerf</mainClass>
+ <name>BitSetPerf</name>
+ <extraJvmArguments>-Xms128m -Xbatch</extraJvmArguments>
+ </program>
+ <program>
+ <mainClass>org.apache.solr.util.SimplePostTool</mainClass>
+ <name>SimplePostTool</name>
+ </program>
+ <program>
+ <mainClass>org.apache.solr.util.SuggestMissingFactories</mainClass>
+ <name>SuggestMissingFactories</name>
+ </program>
+ </programs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml?rev=1061612&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml (added)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml Fri Jan 21 03:42:49 2011
@@ -0,0 +1,139 @@
+<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>3.1-SNAPSHOT</version>
+ <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/src/solrj</module-directory>
+ <build-directory>../../build/solrj</build-directory>
+ <tests.luceneMatchVersion>3.1</tests.luceneMatchVersion>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </dependency>
+ <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>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}</outputDirectory>
+ <sourceDirectory>.</sourceDirectory>
+ <testResources/>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>../common</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- Solrj tests are run from the solr-core build; -->
+ <!-- otherwise there would be a cyclic dependency, -->
+ <!-- since Solrj's tests depend on solr-core, and -->
+ <!-- solr-core depends on Solrj. -->
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/webapp/pom.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/webapp/pom.xml?rev=1061612&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/webapp/pom.xml (added)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/webapp/pom.xml Fri Jan 21 03:42:49 2011
@@ -0,0 +1,187 @@
+<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>3.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr</artifactId>
+ <packaging>war</packaging>
+ <name>Apache Solr Search Server</name>
+ <description>Apache Solr Search Server</description>
+ <properties>
+ <module-directory>solr/src/webapp</module-directory>
+ <build-directory>../../build/web</build-directory>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-taglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-tiles</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sslext</groupId>
+ <artifactId>sslext</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-dataimporthandler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <skip>true</skip> <!-- There are no public or protected classes -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <!-- There are no sources for the Solr WAR, but -->
+ <!-- the maven-source-plugin has no "skip" option. -->
+ <!-- Setting attach=false prevents the built jar -->
+ <!-- from being installed or deployed. -->
+ <attach>false</attach>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>web</warSourceDirectory>
+ <webXml>web/WEB-INF/web.xml</webXml>
+ <webResources>
+ <resource>
+ <directory>../../contrib/dataimporthandler/src/main/webapp</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8080</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ <webAppConfig>
+ <contextPath>/</contextPath>
+ <baseResource implementation="org.mortbay.resource.ResourceCollection">
+ <resources>web,../../contrib/dataimporthandler/src/main/webapp</resources>
+ </baseResource>
+ </webAppConfig>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1061612&r1=1061611&r2=1061612&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Fri Jan 21 03:42:49 2011
@@ -584,6 +584,9 @@ Build
"ant idea". See http://wiki.apache.org/lucene-java/HowtoConfigureIntelliJ
(Steven Rowe)
+* LUCENE-2657: Switch from using Maven POM templates to full POMs when
+ generating Maven artifacts (Steven Rowe)
+
Test Cases
* LUCENE-2037 Allow Junit4 tests in our environment (Erick Erickson
Modified: lucene/dev/branches/branch_3x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1061612&r1=1061611&r2=1061612&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/build.xml Fri Jan 21 03:42:49 2011
@@ -404,8 +404,11 @@
<target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, javadocs">
<sequential>
- <m2-deploy pom.xml="lucene-parent-pom.xml.template"/>
- <m2-deploy pom.xml="lucene-core-pom.xml.template">
+ <ant target="get-maven-poms" inheritAll="false" dir=".."/>
+
+ <m2-deploy pom.xml="../pom.xml"/> <!-- Lucene/Solr grandparent POM -->
+ <m2-deploy pom.xml="pom.xml"/> <!-- Lucene parent POM -->
+ <m2-deploy pom.xml="src/pom.xml"> <!-- Lucene core POM -->
<artifact-attachments>
<attach file="${build.dir}/${final.name}-src.jar"
classifier="sources"/>
@@ -413,8 +416,6 @@
classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
-
- <m2-deploy pom.xml="lucene-contrib-pom.xml.template"/>
<contrib-crawl target="dist-maven"/>
</sequential>
</target>
Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1061612&r1=1061611&r2=1061612&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Fri Jan 21 03:42:49 2011
@@ -312,32 +312,22 @@
</fail>
</target>
- <property name="pom.xml" value="pom.xml.template"/>
-
<macrodef name="m2-deploy" description="Builds a Maven artifact">
<element name="artifact-attachments" optional="yes"/>
- <attribute name="pom.xml" default="${pom.xml}"/>
+ <attribute name="pom.xml" default="pom.xml"/>
<sequential>
- <copy file="@{pom.xml}" tofile="${build.dir}/@{pom.xml}">
- <filterset begintoken="@" endtoken="@">
- <filter token="version" value="${version}"/>
- </filterset>
- </copy>
- <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
-
- <artifact:pom id="maven.project" file="${build.dir}/@{pom.xml}" />
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+ <artifact:pom id="maven.project" file="@{pom.xml}"/>
<artifact:deploy file="${build.dir}/${maven.project.build.finalName}.jar">
<artifact-attachments/>
<remoteRepository url="${m2.repository.url}">
<authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
- </remoteRepository>
+ </remoteRepository>
<pom refid="maven.project"/>
</artifact:deploy>
</sequential>
</macrodef>
-
-
<macrodef name="build-manifest" description="Builds a manifest file">
<attribute name="title" default="Lucene Search Engine: ${ant.project.name}" />
<sequential>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml?rev=1061612&r1=1061611&r2=1061612&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml Fri Jan 21 03:42:49 2011
@@ -71,7 +71,7 @@
<available
type="file"
- file="${pom.xml}"
+ file="pom.xml"
property="pom.xml.present">
</available>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml?rev=1061612&r1=1061611&r2=1061612&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml Fri Jan 21 03:42:49 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<project name="demo" default="default">
+<project name="demo" default="default" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<description>
Lucene Demo
@@ -60,4 +60,23 @@
outputDir="src/java/org/apache/lucene/demo/html"
/>
</target>
+
+ <target name="dist-maven" if="pom.xml.present" depends="compile-core,jar-src">
+ <sequential>
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+ <artifact:pom id="maven.project" file="pom.xml"/>
+ <artifact:deploy file="${build.dir}/${demo.war.name}.war">
+ <attach file="${build.dir}/${maven.project.build.finalName}.jar"
+ classifier="classes"/>
+ <attach file="${build.dir}/${final.name}-src.jar"
+ classifier="sources"/>
+ <attach file="${build.dir}/${final.name}-javadoc.jar"
+ classifier="javadoc"/>
+ <remoteRepository url="${m2.repository.url}">
+ <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+ </remoteRepository>
+ <pom refid="maven.project"/>
+ </artifact:deploy>
+ </sequential>
+ </target>
</project>
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1061612&r1=1061611&r2=1061612&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Fri Jan 21 03:42:49 2011
@@ -580,6 +580,9 @@ Build
* SOLR-2042: Fixed some Maven deps (Drew Farris via gsingers)
+* LUCENE-2657: Switch from using Maven POM templates to full POMs when
+ generating Maven artifacts (Steven Rowe)
+
Documentation
----------------------
Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1061612&r1=1061611&r2=1061612&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Fri Jan 21 03:42:49 2011
@@ -810,29 +810,20 @@
<!-- Maven artifacts -->
<sign-maven-dependency-artifacts artifact.id="solr-commons-csv" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-dependency-artifacts artifact.id="solr-noggit" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-war-artifacts artifact.id="solr" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-artifacts artifact.id="solr-analysis-extras" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-artifacts artifact.id="solr-cell" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-artifacts artifact.id="solr-clustering" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-core" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-dataimporthandler" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-dataimporthandler-extras" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-artifacts artifact.id="solr-clustering" gpg.passphrase="${gpg.passphrase}"/>
-
- <sign-maven-artifacts artifact.id="solr-cell" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-analyzers" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-core" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-highlighter" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-queries" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-snowball" gpg.passphrase="${gpg.passphrase}"/>
- <sign-maven-dependency-artifacts artifact.id="solr-lucene-spellchecker" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-solrj" gpg.passphrase="${gpg.passphrase}"/>
- <!-- Thes are special since there are no jars, just poms -->
+ <!-- These are special since there are no jars, just poms -->
<sign-artifact input.file="${maven.dist.prefix}/solr-parent/${maven_version}/solr-parent-${maven_version}.pom" gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact input.file="${maven.dist.prefix}/solr-lucene-contrib/${maven_version}/solr-lucene-contrib-${maven_version}.pom" gpg.passphrase="${gpg.passphrase}"/>
-
</target>
-
-
-
<target name="prepare-release" depends="clean, svn-up, build-site, package, sign-artifacts" description="Prototype helper for Committers. Assumes gpg is in the path">
<tar destfile="${dist}/solr-maven.tar" longfile="gnu">
@@ -845,6 +836,7 @@
<target name="generate-maven-artifacts" depends="maven.ant.tasks-check, create-package">
<sequential>
+ <ant target="get-maven-poms" inheritAll="false" dir=".."/>
<!--
@@ -859,18 +851,18 @@
<!-- ========== SOLR PARENT POM ========== -->
- <m2-deploy pom.xml="src/maven/solr-parent-pom.xml.template"/>
+ <m2-deploy pom.xml="pom.xml"/>
<!-- ========== SOLR SPECIFIC COMMONS CSV ========== -->
- <m2-deploy pom.xml="lib/solr-commons-csv-pom.xml.template"
- jar.file="lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
+ <m2-deploy-with-pom-template pom.xml="lib/solr-commons-csv-pom.xml.template"
+ jar.file="lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
<!-- ========== SOLR ARTIFACTS ========== -->
- <m2-deploy pom.xml="lib/apache-solr-noggit-pom.xml.template"
- jar.file="lib/apache-solr-noggit-r944541.jar" />
+ <m2-deploy-with-pom-template pom.xml="lib/apache-solr-noggit-pom.xml.template"
+ jar.file="lib/apache-solr-noggit-r944541.jar" />
- <m2-deploy pom.xml="contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template"
+ <m2-deploy pom.xml="contrib/dataimporthandler/src/pom.xml"
jar.file="${dist}/apache-solr-dataimporthandler-${version}.jar">
<artifact-attachments>
<attach file="${dist}/apache-solr-dataimporthandler-src-${version}.jar" classifier="sources"/>
@@ -878,16 +870,15 @@
</artifact-attachments>
</m2-deploy>
- <m2-deploy pom.xml="contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template"
+ <m2-deploy pom.xml="contrib/dataimporthandler/src/extras/pom.xml"
jar.file="${dist}/apache-solr-dataimporthandler-extras-${version}.jar">
-
<artifact-attachments>
<attach file="${dist}/apache-solr-dataimporthandler-extras-src-${version}.jar" classifier="sources"/>
<attach file="${dist}/apache-solr-dataimporthandler-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
- <m2-deploy pom.xml="contrib/extraction/solr-cell-pom.xml.template"
+ <m2-deploy pom.xml="contrib/extraction/pom.xml"
jar.file="${dist}/apache-solr-cell-${version}.jar">
<artifact-attachments>
<attach file="${dist}/apache-solr-cell-src-${version}.jar" classifier="sources"/>
@@ -895,38 +886,40 @@
</artifact-attachments>
</m2-deploy>
- <m2-deploy pom.xml="contrib/clustering/solr-clustering-pom.xml.template"
- jar.file="${dist}/apache-solr-clustering-${version}.jar">
-
+ <m2-deploy pom.xml="contrib/clustering/pom.xml"
+ jar.file="${dist}/apache-solr-clustering-${version}.jar">
<artifact-attachments>
<attach file="${dist}/apache-solr-clustering-src-${version}.jar" classifier="sources"/>
<attach file="${dist}/apache-solr-clustering-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
- <!-- Clustring specific -->
- <!-- TODO: MORE NEEDED HERE ONCE WE FINALIZE THE LIBS FOR CARROT -->
- <!-- end clustering specific -->
+
+ <m2-deploy pom.xml="contrib/analysis-extras/pom.xml"
+ jar.file="${dist}/apache-solr-analysis-extras-${version}.jar">
+ <artifact-attachments>
+ <attach file="${dist}/apache-solr-analysis-extras-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist}/apache-solr-analysis-extras-docs-${version}.jar" classifier="javadoc"/>
+ </artifact-attachments>
+ </m2-deploy>
- <m2-deploy pom.xml="src/maven/solr-core-pom.xml.template"
+ <m2-deploy pom.xml="src/pom.xml"
jar.file="${dist}/apache-solr-core-${version}.jar">
-
<artifact-attachments>
<attach file="${dist}/apache-solr-core-src-${version}.jar" classifier="sources"/>
<attach file="${dist}/apache-solr-core-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
-
</m2-deploy>
- <m2-deploy pom.xml="src/maven/solr-solrj-pom.xml.template"
+ <m2-deploy pom.xml="src/solrj/pom.xml"
jar.file="${dist}/apache-solr-solrj-${version}.jar">
-
<artifact-attachments>
<attach file="${dist}/apache-solr-solrj-src-${version}.jar" classifier="sources"/>
<attach file="${dist}/apache-solr-solrj-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
-
</m2-deploy>
+ <m2-deploy pom.xml="src/webapp/pom.xml"
+ jar.file="${dist}/apache-solr-${version}.war"/>
</sequential>
</target>
Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1061612&r1=1061611&r2=1061612&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Fri Jan 21 03:42:49 2011
@@ -376,19 +376,34 @@
<!-- NOTE, the pom.xml MUST be a relative path. An absolute path may break the build on windows -->
<macrodef name="m2-deploy" description="Builds a Maven artifact">
- <element name="artifact-attachments" optional="yes"/>
- <attribute name="pom.xml" default="${pom.xml}"/>
+ <element name="artifact-attachments" optional="yes"/>
+ <attribute name="pom.xml" default="pom.xml"/>
<attribute name="jar.file" default="${jar.file}"/>
<sequential>
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+ <artifact:pom id="maven.project" file="@{pom.xml}"/>
+ <artifact:deploy file="@{jar.file}">
+ <artifact-attachments/>
+ <remoteRepository url="${m2.repository.url}">
+ <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+ </remoteRepository>
+ <pom refid="maven.project"/>
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="m2-deploy-with-pom-template" description="Builds a Maven artifact given a POM template">
+ <attribute name="pom.xml"/>
+ <attribute name="jar.file"/>
+ <sequential>
<copy file="@{pom.xml}" tofile="${maven.build.dir}/@{pom.xml}">
<filterset begintoken="@" endtoken="@">
<filter token="version" value="${version}"/>
</filterset>
</copy>
- <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
<artifact:pom id="maven.project" file="${maven.build.dir}/@{pom.xml}" />
- <artifact:deploy file="@{jar.file}" uniqueVersion="false">
- <artifact-attachments/>
+ <artifact:deploy file="@{jar.file}">
<remoteRepository url="${m2.repository.url}">
<authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
</remoteRepository>
@@ -436,6 +451,17 @@
</sequential>
</macrodef>
+ <macrodef name="sign-maven-war-artifacts" description="Signs the Solr .war artifact">
+ <attribute name="artifact.id"/>
+ <attribute name="prefix.dir" default="${maven.dist.prefix}"/>
+ <attribute name="maven.version" default="${version}"/>
+ <attribute name="gpg.passphrase"/>
+ <sequential>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.war" gpg.passphrase="@{gpg.passphrase}"/>
+ <sign-artifact input.file="@{prefix.dir}/@{artifact.id}/@{maven.version}/@{artifact.id}-@{maven.version}.pom" gpg.passphrase="@{gpg.passphrase}"/>
+ </sequential>
+ </macrodef>
+
<macrodef name="sign-maven-dependency-artifacts" description="Signs maven artifacts">
<attribute name="artifact.id"/>
<attribute name="prefix.dir" default="${maven.dist.prefix}"/>
Added: lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-3.4.2.pom
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-3.4.2.pom?rev=1061612&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-3.4.2.pom (added)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-3.4.2.pom Fri Jan 21 03:42:49 2011
@@ -0,0 +1,235 @@
+<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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.carrot2</groupId>
+ <artifactId>carrot2-core</artifactId>
+ <version>3.4.2</version>
+ <name>Carrot2</name>
+ <description>
+ Carrot2 search results clustering framework core, document
+ sources and clustering algorithms.
+ </description>
+ <packaging>jar</packaging>
+
+ <licenses>
+ <license>
+ <name>BSD license</name>
+ <url>http://www.carrot2.org/carrot2.LICENSE</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <organization>
+ <name>Carrot2.org</name>
+ <url>http://www.carrot2.org/</url>
+ </organization>
+
+ <mailingLists>
+ <mailingList>
+ <name>Developers List</name>
+ <subscribe>carrot2-developers-subscribe@lists.sourceforge.net</subscribe>
+ <unsubscribe>carrot2-developers-leave@lists.sourceforge.net</unsubscribe>
+ <post>carrot2-developers@lists.sourceforge.net</post>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=carrot2-developers</archive>
+ </mailingList>
+ </mailingLists>
+
+ <issueManagement>
+ <system>Jira</system>
+ <url>http://issues.carrot2.org/</url>
+ </issueManagement>
+
+ <repositories>
+ <repository>
+ <id>carrotsearch.labs.releases</id>
+ <name>Carrot Search Labs Releases Repository</name>
+ <url>http://repository.carrotsearch.com/labs/releases</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.carrot2</groupId>
+ <artifactId>rome</artifactId>
+ <version>1.0.RC1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.carrot2</groupId>
+ <artifactId>rome-fetcher</artifactId>
+ <version>0.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r05</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-smartcn</artifactId>
+ <version>3.0.1</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.simpleframework</groupId>
+ <artifactId>simple-xml</artifactId>
+ <version>2.3.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-math</artifactId>
+ <version>0.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-collections</artifactId>
+ <version>0.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.carrotsearch</groupId>
+ <artifactId>nni</artifactId>
+ <version>1.0.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>com.carrotsearch</groupId>
+ <artifactId>hppc</artifactId>
+ <version>0.3.1</version>
+ </dependency>
+ </dependencies>
+</project>
+
+
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/SolrTestCaseJ4.java?rev=1061612&r1=1061611&r2=1061612&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/SolrTestCaseJ4.java Fri Jan 21 03:42:49 2011
@@ -642,7 +642,7 @@ public abstract class SolrTestCaseJ4 ext
static String determineSourceHome() {
// ugly, ugly hack to determine the example home without depending on the CWD
// this is needed for example/multicore tests which reside outside the classpath
- File base = getFile("solr/conf/");
+ File base = getFile("solr/conf/").getAbsoluteFile();
while (!new File(base, "solr/CHANGES.txt").exists()) {
base = base.getParentFile();
}