mirror of https://github.com/apache/lucene.git
SOLR-1643 -- Moved dataimporthandler extras into dataimporthandler core
git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@889519 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar
parent
e6f4e7dc64
commit
c8ad3e84b3
12
build.xml
12
build.xml
|
|
@ -529,8 +529,6 @@
|
|||
|
||||
<solr-jar destfile="${dist}/apache-solr-dataimporthandler-src-${version}.jar"
|
||||
basedir="contrib/dataimporthandler/src/main/java" />
|
||||
<solr-jar destfile="${dist}/apache-solr-dataimporthandler-extras-src-${version}.jar"
|
||||
basedir="contrib/dataimporthandler/src/extras/main/java" />
|
||||
|
||||
<solr-jar destfile="${dist}/apache-solr-cell-src-${version}.jar"
|
||||
basedir="contrib/extraction/src" />
|
||||
|
|
@ -733,7 +731,6 @@
|
|||
<sign-maven-dependency-artifacts artifact.id="solr-commons-csv" 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}"/>
|
||||
|
|
@ -797,15 +794,6 @@
|
|||
</artifact-attachments>
|
||||
</m2-deploy>
|
||||
|
||||
<m2-deploy pom.xml="contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template"
|
||||
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"
|
||||
jar.file="${dist}/apache-solr-cell-${version}.jar">
|
||||
<artifact-attachments>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ Other Changes
|
|||
|
||||
Build
|
||||
----------------------
|
||||
|
||||
* SOLR-1643: Moved dataimporthandler extras into dataimporthandler core (shalin)
|
||||
|
||||
Documentation
|
||||
----------------------
|
||||
|
|
|
|||
|
|
@ -37,17 +37,10 @@
|
|||
<pathelement location="${solr-path}/build/solr" />
|
||||
<pathelement location="${solr-path}/build/solrj" />
|
||||
<fileset dir="${solr-path}/lib" includes="*.jar"/>
|
||||
</path>
|
||||
|
||||
<path id="extras.classpath">
|
||||
<pathelement location="${solr-path}/build/solr" />
|
||||
<pathelement location="${solr-path}/build/solrj" />
|
||||
<pathelement location="target/classes" />
|
||||
<fileset dir="${solr-path}/lib" includes="*.jar"/>
|
||||
<fileset dir="lib/" includes="*.jar"/>
|
||||
<fileset dir="lib/" includes="*.jar"/>
|
||||
<fileset dir="${tikalibs-path}" includes="*.jar"/>
|
||||
</path>
|
||||
|
||||
|
||||
<path id="test.classpath">
|
||||
<path refid="common.classpath" />
|
||||
<path refid="classpath.jetty" />
|
||||
|
|
@ -56,16 +49,6 @@
|
|||
<pathelement path="${java.class.path}"/>
|
||||
</path>
|
||||
|
||||
<path id="test.extras.classpath">
|
||||
<path refid="extras.classpath" />
|
||||
<path refid="classpath.jetty" />
|
||||
<pathelement path="target/classes" />
|
||||
<pathelement path="target/extras/classes" />
|
||||
<pathelement path="target/test-classes" />
|
||||
<pathelement path="target/extras/test-classes" />
|
||||
<pathelement path="${java.class.path}"/>
|
||||
</path>
|
||||
|
||||
<target name="clean">
|
||||
<delete failonerror="false" dir="target"/>
|
||||
<delete failonerror="false">
|
||||
|
|
@ -94,18 +77,9 @@
|
|||
</solr-javac>
|
||||
</target>
|
||||
|
||||
<target name="compileExtras" depends="compile">
|
||||
<solr-javac destdir="target/extras/classes"
|
||||
classpathref="extras.classpath">
|
||||
<src path="src/extras/main/java" />
|
||||
</solr-javac>
|
||||
</target>
|
||||
|
||||
<target name="build" depends="compile,compileExtras">
|
||||
<target name="build" depends="compile">
|
||||
<solr-jar destfile="target/${fullnamever}.jar" basedir="target/classes"
|
||||
manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF" />
|
||||
<solr-jar destfile="target/apache-${ant.project.name}-extras-${version}.jar" basedir="target/extras/classes"
|
||||
manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF" />
|
||||
</target>
|
||||
|
||||
<target name="compileTests" depends="compile">
|
||||
|
|
@ -115,16 +89,7 @@
|
|||
</solr-javac>
|
||||
</target>
|
||||
|
||||
<target name="compileExtrasTests" depends="compileExtras">
|
||||
<solr-javac destdir="target/extras/test-classes"
|
||||
classpathref="test.classpath">
|
||||
<src path="src/extras/test/java" />
|
||||
</solr-javac>
|
||||
</target>
|
||||
|
||||
<target name="test" depends="testCore,testExtras"/>
|
||||
|
||||
<target name="testCore" depends="compileTests">
|
||||
<target name="test" depends="compileTests">
|
||||
<mkdir dir="${junit.output.dir}"/>
|
||||
|
||||
<junit printsummary="on"
|
||||
|
|
@ -147,29 +112,6 @@
|
|||
<fail if="tests.failed">Tests failed!</fail>
|
||||
</target>
|
||||
|
||||
<target name="testExtras" depends="compileExtrasTests">
|
||||
<mkdir dir="${junit.output.dir}"/>
|
||||
|
||||
<junit printsummary="on"
|
||||
haltonfailure="no"
|
||||
errorProperty="tests.failed"
|
||||
failureProperty="tests.failed"
|
||||
dir="src/extras/test/resources/"
|
||||
>
|
||||
<formatter type="brief" usefile="false" if="junit.details"/>
|
||||
<classpath refid="test.extras.classpath"/>
|
||||
<formatter type="xml"/>
|
||||
<batchtest fork="yes" todir="${junit.output.dir}" unless="testcase">
|
||||
<fileset dir="src/extras/test/java" includes="${junit.includes}"/>
|
||||
</batchtest>
|
||||
<batchtest fork="yes" todir="${junit.output.dir}" if="testcase">
|
||||
<fileset dir="src/extras/test/java" includes="**/${testcase}.java"/>
|
||||
</batchtest>
|
||||
</junit>
|
||||
|
||||
<fail if="tests.failed">Tests failed!</fail>
|
||||
</target>
|
||||
|
||||
<target name="dist" depends="build">
|
||||
<copy todir="../../build/web">
|
||||
<fileset dir="src/main/webapp" includes="**" />
|
||||
|
|
@ -177,7 +119,6 @@
|
|||
<mkdir dir="../../build/web/WEB-INF/lib"/>
|
||||
<copy file="target/${fullnamever}.jar" todir="${solr-path}/build/web/WEB-INF/lib"></copy>
|
||||
<copy file="target/${fullnamever}.jar" todir="${solr-path}/dist"></copy>
|
||||
<copy file="target/apache-${ant.project.name}-extras-${version}.jar" todir="${solr-path}/dist"></copy>
|
||||
</target>
|
||||
|
||||
<target name="javadoc">
|
||||
|
|
@ -186,7 +127,6 @@
|
|||
|
||||
<path id="javadoc.classpath">
|
||||
<path refid="common.classpath"/>
|
||||
<path refid="extras.classpath"/>
|
||||
</path>
|
||||
|
||||
<invoke-javadoc
|
||||
|
|
@ -194,7 +134,6 @@
|
|||
title="${Name} ${version} contrib-${fullnamever} API">
|
||||
<sources>
|
||||
<packageset dir="src/main/java"/>
|
||||
<packageset dir="src/extras/main/java"/>
|
||||
</sources>
|
||||
</invoke-javadoc>
|
||||
</sequential>
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
<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>@maven_version@</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.apache.solr</groupId>
|
||||
<artifactId>solr-dataimporthandler-extras</artifactId>
|
||||
<name>Apache Solr DataImportHandler Extras</name>
|
||||
<version>@maven_version@</version>
|
||||
<description>Apache Solr DataImportHandler Extras</description>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>javax.activation</groupId>
|
||||
<artifactId>activation</artifactId>
|
||||
<version>1.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.mail</groupId>
|
||||
<artifactId>mail</artifactId>
|
||||
<version>1.4.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
Loading…
Reference in New Issue