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/10/26 22:26:50 UTC
svn commit: r1189428 - in /lucene/dev/trunk:
dev-tools/maven/solr/contrib/pom.xml.template
dev-tools/maven/solr/contrib/velocity/
dev-tools/maven/solr/contrib/velocity/pom.xml.template
dev-tools/maven/solr/core/pom.xml.template solr/contrib/velocity/
Author: sarowe
Date: Wed Oct 26 20:26:49 2011
New Revision: 1189428
URL: http://svn.apache.org/viewvc?rev=1189428&view=rev
Log:
SOLR-2588: added Maven configuration for the new Velocity contrib
Added:
lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/
lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template (with props)
Modified:
lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/trunk/solr/contrib/velocity/ (props changed)
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template?rev=1189428&r1=1189427&r2=1189428&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template Wed Oct 26 20:26:49 2011
@@ -38,6 +38,7 @@
<module>extraction</module>
<module>langid</module>
<module>uima</module>
+ <module>velocity</module>
</modules>
<build>
<directory>../build/solr-contrib-aggregator</directory>
Added: lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template?rev=1189428&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template (added)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template Wed Oct 26 20:26:49 2011
@@ -0,0 +1,101 @@
+<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-velocity</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Solr Velocity</name>
+ <description>Apache Solr Velocity</description>
+ <properties>
+ <module-directory>solr/contrib/velocity</module-directory>
+ <build-directory>../../build/contrib/solr-velocity</build-directory>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/classes/java</outputDirectory>
+ <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>src/test-files</directory>
+ </testResource>
+ <testResource>
+ <directory>../../core/src/test-files</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <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>
+ </plugins>
+ </build>
+</project>
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=1189428&r1=1189427&r2=1189428&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 Wed Oct 26 20:26:49 2011
@@ -126,14 +126,6 @@
<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>
<optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->