lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1307374 - in /lucene/dev/branches/lucene3930: dev-tools/maven/pom.xml.template dev-tools/maven/solr/core/pom.xml.template modules/benchmark/build.xml solr/contrib/langid/build.xml solr/core/build.xml
Date Fri, 30 Mar 2012 11:47:25 GMT
Author: rmuir
Date: Fri Mar 30 11:47:24 2012
New Revision: 1307374

URL: http://svn.apache.org/viewvc?rev=1307374&view=rev
Log:
LUCENE-3930: fix generate-maven-artifacts tasks

Modified:
    lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template
    lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template
    lucene/dev/branches/lucene3930/modules/benchmark/build.xml
    lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml
    lucene/dev/branches/lucene3930/solr/core/build.xml

Modified: lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template?rev=1307374&r1=1307373&r2=1307374&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template Fri Mar 30 11:47:24 2012
@@ -206,11 +206,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.solr</groupId>
-        <artifactId>solr-commons-csv</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.solr</groupId>
         <artifactId>solr-jsonic</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -220,11 +215,6 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-noggit</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-core</artifactId>
         <version>${tika.version}</version>
@@ -626,48 +616,6 @@
             <artifactId>maven-install-plugin</artifactId>
             <executions>
               <execution>
-                <id>install-xercesImpl</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>lucene-xercesImpl</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>jar</packaging>
-                  <file>modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar</file>
-                </configuration>  
-              </execution>
-              <execution>
-                <id>install-solr-commons-csv</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>org.apache.solr</groupId>
-                  <artifactId>solr-commons-csv</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>jar</packaging>
-                  <file>solr/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar</file>
-                </configuration>  
-              </execution>
-              <execution>
-                <id>install-solr-noggit</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>org.apache.solr</groupId>
-                  <artifactId>solr-noggit</artifactId>
-                  <version>${project.version}</version>
-                  <packaging>jar</packaging>
-                  <file>solr/lib/apache-solr-noggit-r1211150.jar</file>
-                </configuration>  
-              </execution>
-              <execution>
                 <id>install-jsonic</id>
                 <phase>install</phase>
                 <goals>

Modified: lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template?rev=1307374&r1=1307373&r2=1307374&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template Fri Mar 30 11:47:24
2012
@@ -62,16 +62,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>solr-commons-csv</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>solr-noggit</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>

Modified: lucene/dev/branches/lucene3930/modules/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/benchmark/build.xml?rev=1307374&r1=1307373&r2=1307374&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/benchmark/build.xml (original)
+++ lucene/dev/branches/lucene3930/modules/benchmark/build.xml Fri Mar 30 11:47:24 2012
@@ -265,11 +265,6 @@
 		     />
     </target>
     
-    <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven">
-      <m2-deploy-with-pom-template pom.xml="lib/lucene-xercesImpl-pom.xml.template"
-                                   jar.file="lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"
/>
-    </target>
-
     <target name="compile-test" depends="contrib-build.compile-test">
        <!-- copy .alg files as resources for testing -->
        <copy todir="${build.dir}/classes/test/conf">

Modified: lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml?rev=1307374&r1=1307373&r2=1307374&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml Fri Mar 30 11:47:24 2012
@@ -37,7 +37,7 @@
                                  jar.file="${solr-langid.dir}/lib/jsonic-1.2.0.jar" />
 
     <m2-deploy-with-pom-template pom.xml="${solr-langid.dir}/lib/langdetect-pom.xml.template"
-                                 jar.file="${solr-langid.dir}/lib/langdetect-r111.jar" />
+                                 jar.file="${solr-langid.dir}/lib/langdetect-c51112119be53a81e59706ce57bacaa90c052284.jar"
/>
   </target>
 
     <!-- we don't actually need to compile this thing, we just want its libs -->

Modified: lucene/dev/branches/lucene3930/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/build.xml?rev=1307374&r1=1307373&r2=1307374&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/core/build.xml Fri Mar 30 11:47:24 2012
@@ -26,11 +26,4 @@
 
   <target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
 
-  <target name="dist-maven" depends="jar-core,javadocs,jar-src,common.dist-maven">
-    <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/apache-solr-commons-csv-pom.xml.template"
-                                 jar.file="${common-solr.dir}/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar"
/>
-
-    <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/apache-solr-noggit-pom.xml.template"
-                                 jar.file="${common-solr.dir}/lib/apache-solr-noggit-r1211150.jar"
/>
-  </target>
 </project>



Mime
View raw message