You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/04/03 04:59:43 UTC
svn commit: r1308658 - in /lucene/dev/trunk: dev-tools/eclipse/
dev-tools/maven/ dev-tools/maven/solr/contrib/langid/ solr/contrib/langid/
solr/contrib/langid/lib/
Author: rmuir
Date: Tue Apr 3 02:59:42 2012
New Revision: 1308658
URL: http://svn.apache.org/viewvc?rev=1308658&view=rev
Log:
SOLR-3308: nuke the solr-jsonic maven packaging
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template
lucene/dev/trunk/solr/contrib/langid/build.xml
lucene/dev/trunk/solr/contrib/langid/ivy.xml
lucene/dev/trunk/solr/contrib/langid/lib/jsonic-pom.xml.template
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1308658&r1=1308657&r2=1308658&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Tue Apr 3 02:59:42 2012
@@ -157,7 +157,7 @@
<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-c51112119be53a81e59706ce57bacaa90c052284.jar"/>
- <classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.7.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar"/>
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1308658&r1=1308657&r2=1308658&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Tue Apr 3 02:59:42 2012
@@ -211,9 +211,9 @@
<version>1.2</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-jsonic</artifactId>
- <version>${project.version}</version>
+ <groupId>net.arnx</groupId>
+ <artifactId>jsonic</artifactId>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
@@ -626,21 +626,6 @@
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
- <id>install-jsonic</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <!-- jsonic v1.2.7 is in the central maven repo - remove this once upgraded. -->
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-jsonic</artifactId>
- <version>${project.version}</version>
- <packaging>jar</packaging>
- <file>solr/contrib/langid/lib/jsonic-1.2.0.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-langdetect</id>
<phase>install</phase>
<goals>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1308658&r1=1308657&r2=1308658&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/langid/pom.xml.template Tue Apr 3 02:59:42 2012
@@ -72,8 +72,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-jsonic</artifactId>
+ <groupId>net.arnx</groupId>
+ <artifactId>jsonic</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/trunk/solr/contrib/langid/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/langid/build.xml?rev=1308658&r1=1308657&r2=1308658&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/langid/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/langid/build.xml Tue Apr 3 02:59:42 2012
@@ -33,9 +33,6 @@
<dirname file="${ant.file.solr-langid}" property="solr-langid.dir"/>
<target name="dist-maven" depends="jar-core,javadocs,jar-src,common.dist-maven">
- <m2-deploy-with-pom-template pom.xml="${solr-langid.dir}/lib/jsonic-pom.xml.template"
- 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-c51112119be53a81e59706ce57bacaa90c052284.jar" />
</target>
Modified: lucene/dev/trunk/solr/contrib/langid/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/langid/ivy.xml?rev=1308658&r1=1308657&r2=1308658&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/langid/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/langid/ivy.xml Tue Apr 3 02:59:42 2012
@@ -22,8 +22,7 @@
<dependency org="langdetect" name="langdetect" rev="c51112119be53a81e59706ce57bacaa90c052284">
<artifact name="langdetect" type="jar" url="http://language-detection.googlecode.com/git-history/c51112119be53a81e59706ce57bacaa90c052284/lib/langdetect.jar"/>
</dependency>
- <dependency org="jsonic" name="jsonic" rev="1.2.0">
- <artifact name="jsonic" type="jar" url="http://language-detection.googlecode.com/git-history/c51112119be53a81e59706ce57bacaa90c052284/lib/jsonic-1.2.0.jar"/>
- </dependency>
+ <dependency org="net.arnx" name="jsonic" rev="1.2.7" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/trunk/solr/contrib/langid/lib/jsonic-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/langid/lib/jsonic-pom.xml.template?rev=1308658&r1=1308657&r2=1308658&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/langid/lib/jsonic-pom.xml.template (original)
+++ lucene/dev/trunk/solr/contrib/langid/lib/jsonic-pom.xml.template Tue Apr 3 02:59:42 2012
@@ -1,36 +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.
- -->
-
- <parent>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-parent</artifactId>
- <version>@version@</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-jsonic</artifactId>
- <name>Solr Specific JSONIC</name>
- <version>@version@</version>
- <description>Solr Specific JSONIC v1.2.0</description>
- <packaging>jar</packaging>
-</project>