You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2011/03/25 06:20:31 UTC
svn commit: r1085256 [2/2] - in /incubator/stanbol/trunk: enhancer/
enhancer/SemiAutomaticContentEnhancer/ enhancer/autotagging/
enhancer/clerezza/clerezza-sparql/
enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/
enhancer/engines/autotagging/ en...
Added: incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbPediaSite.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbPediaSite.config?rev=1085256&view=auto
==============================================================================
--- incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbPediaSite.config (added)
+++ incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbPediaSite.config Fri Mar 25 05:20:29 2011
@@ -0,0 +1,15 @@
+service.pid="org.apache.stanbol.entityhub.site.referencedSite.dbPediaSite"
+org.apache.stanbol.entityhub.site.entityPrefix=["http://dbpedia.org/resource/","http://dbpedia.org/ontology/"]
+org.apache.stanbol.entityhub.site.defaultMappedEntityState="proposed"
+org.apache.stanbol.entityhub.site.accessUri="http://dbpedia.org/sparql/"
+org.apache.stanbol.entityhub.site.id="dbPedia"
+org.apache.stanbol.entityhub.site.fieldMappings=["dbp-ont:*","dbp-ont:thumbnail\ |\ d\=xsd:anyURI\ >\ foaf:depiction","dbp-prop:latitude\ |\ d\=xsd:decimal\ >\ geo:lat","dbp-prop:longitude\ |\ d\=xsd:decimal\ >\ geo:long","dbp-prop:population\ |\ d\=xsd:integer","dbp-prop:website\ |\ d\=xsd:anyURI\ >\ foaf:homepage"]
+org.apache.stanbol.entityhub.site.dereferencerType="org.apache.stanbol.entityhub.dereferencer.SparqlDereferencer"
+org.apache.stanbol.entityhub.site.cacheStrategy="used"
+org.apache.stanbol.entityhub.site.cacheId="dbPediaCache"
+org.apache.stanbol.entityhub.site.name="DB\ Pedia"
+org.apache.stanbol.entityhub.site.description="The\ OLD\ Endpoint\ for\ Wikipedia"
+org.apache.stanbol.entityhub.site.queryUri="http://dbpedia.org/sparql"
+org.apache.stanbol.entityhub.site.defaultSymbolState="proposed"
+org.apache.stanbol.entityhub.site.defaultExpireDuration="0"
+org.apache.stanbol.entityhub.site.searcherType="org.apache.stanbol.entityhub.searcher.VirtuosoSearcher"
Added: incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg?rev=1085256&view=auto
==============================================================================
--- incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg (added)
+++ incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.DefaultSolrDirectoryManager.cfg Fri Mar 25 05:20:29 2011
@@ -0,0 +1 @@
+org.apache.stanbol.entityhub.yard.solr.managedSolrDir=${user.dir}/sling/entityhub/solrYard/indexes
Added: incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbPediaLocalCacheYard.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbPediaLocalCacheYard.config?rev=1085256&view=auto
==============================================================================
--- incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbPediaLocalCacheYard.config (added)
+++ incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbPediaLocalCacheYard.config Fri Mar 25 05:20:29 2011
@@ -0,0 +1,9 @@
+service.pid="org.apache.stanbol.entityhub.yard.solr.impl.SolrYard.dbPediaLocalCacheYard"
+org.apache.stanbol.entityhub.yard.maxQueryResultNumber=I"-1"
+org.apache.stanbol.entityhub.yard.solr.maxBooleanClauses=I"1024"
+org.apache.stanbol.entityhub.yard.description="The\ Cache\ used\ to\ store\ downloaded\ dbPedia\ entities"
+org.apache.stanbol.entityhub.yard.solr.solrUri="cache"
+org.apache.stanbol.entityhub.yard.defaultQueryResultNumber=I"-1"
+org.apache.stanbol.entityhub.yard.name="dbPedia\ Cache"
+org.apache.stanbol.entityhub.yard.id="dbPediaCache"
+org.apache.stanbol.entityhub.yard.solr.multiYardIndexLayout="true"
Added: incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhubYard.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhubYard.config?rev=1085256&view=auto
==============================================================================
--- incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhubYard.config (added)
+++ incubator/stanbol/trunk/entityhub/launchers/sling/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhubYard.config Fri Mar 25 05:20:29 2011
@@ -0,0 +1,9 @@
+service.pid="org.apache.stanbol.entityhub.yard.solr.impl.SolrYard.entityhubYard"
+org.apache.stanbol.entityhub.yard.maxQueryResultNumber=I"-1"
+org.apache.stanbol.entityhub.yard.solr.maxBooleanClauses=I"1024"
+org.apache.stanbol.entityhub.yard.description="The\ Yard\ used\ by\ the\ Entityhub\ to\ store\ the\ data"
+org.apache.stanbol.entityhub.yard.solr.solrUri="entityhub"
+org.apache.stanbol.entityhub.yard.defaultQueryResultNumber=I"-1"
+org.apache.stanbol.entityhub.yard.name="Entityhub\ Yard"
+org.apache.stanbol.entityhub.yard.id="entityhubYard"
+org.apache.stanbol.entityhub.yard.solr.multiYardIndexLayout="false"
Modified: incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
<packaging>bundle</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub Model implementation based on RDF (using Clerezza) </name>
<description>This bundle provides implementation of the Entityhub Representation interface
@@ -69,7 +69,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.4</version>
</plugin>
</plugins>
</build>
@@ -78,73 +77,35 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
</dependency>
<dependency> <!-- contains the GraphNode -->
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.utils</artifactId>
- <version>0.13-incubating-SNAPSHOT</version>
</dependency>
- <!-- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.4.0</version>
- </dependency> -->
<!-- for tests -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.test</artifactId>
- <version>0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/stanbol/trunk/entityhub/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/parent/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/parent/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/parent/pom.xml Fri Mar 25 05:20:29 2011
@@ -19,11 +19,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>${stanbol-version}</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
<packaging>pom</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub parent POM</name>
<description>
@@ -46,291 +52,21 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <build>
- <plugins>
-
- <!--
- requires Java 6 because Clerezza artefacts are compiled using Java 6
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <!--
- Constraint disabled since even fixing the version for the maven
- eclipse plugin does not seem to make this rule pass
- <requirePluginVersions/>
- -->
- <requireJavaVersion>
- <message>
- Java 6 or higher is required to compile this module
- </message>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Attach sources for all builds -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <pluginManagement>
- <plugins>
- <!-- Compile for >= Java 5-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.20</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
- <inherited>true</inherited>
- <configuration>
- <instructions>
- <Bundle-Category>Apache Stanbol (incubating) Entityhub</Bundle-Category>
- <Bundle-DocURL>
- http://incubator.apache.org/stanbol
- </Bundle-DocURL>
- <Bundle-Vendor>Apache Stanbol (incubating)</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;${@}}</_versionpolicy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <version>1.4.2</version>
- <!--
- slf4j impl is needed when QDox inspects/loads classes that use a
- static field for the logger, so that those classes can be loaded.
- -->
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>Apache Stanbol (incubating)</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <version>2.0.4-incubator</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <developers>
- <!-- TBD -->
- </developers>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <profiles>
- <profile>
- <id>installBundle</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <executions>
- <execution>
- <id>install-bundle</id>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <!-- needed because of Clerezza dependency -->
- <repositories>
- <repository>
- <id>apache.snapshot</id>
- <name>apache snapshots repository</name>
- <snapshots>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- <url>http://repository.apache.org/content/groups/snapshots-group</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>apache</id>
- <name>apache repository</name>
- <url>https://repository.apache.org/content/groups/public</url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2</url>
- </repository>
- <!--
- currently not needed (rw) <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle
- Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
- -->
- </repositories>
-
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <instructions>
+ <Bundle-Category>Stanbol Entityhub</Bundle-Category>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>
Modified: incubator/stanbol/trunk/entityhub/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>./parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.reactor</artifactId>
<packaging>pom</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub reactor</name>
<description>
Modified: incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
<packaging>bundle</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub Query implementation hased on SPARQL </name>
<description>This bundle provides implementation of the Entityhub Query interface(s)
@@ -68,7 +68,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.4</version>
</plugin>
</plugins>
@@ -78,41 +77,34 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.utils</artifactId>
- <version>0.13-incubating-SNAPSHOT</version>
</dependency>
<!-- for tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/stanbol/trunk/entityhub/site/linkedData/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/site/linkedData/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/site/linkedData/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/site/linkedData/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.site.linkedData</artifactId>
<packaging>bundle</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub Linked Data Protocol Implementation</name>
<description>This includes EntityDereferencer and EntitySearcher implementations
@@ -69,7 +69,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.4</version>
</plugin>
</plugins>
@@ -79,31 +78,26 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
- <version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
- <version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -114,7 +108,6 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
- <version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -125,20 +118,17 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
<scope>provided</scope>
</dependency>
<!-- for tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.yard.clerezza</artifactId>
<packaging>bundle</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub Yard implementation hased on Clerezza </name>
<description>This bundle provides implementation of the Entityhub Yard interface(s)
@@ -69,7 +69,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.4</version>
</plugin>
</plugins>
@@ -79,45 +78,37 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.utils</artifactId>
- <version>0.13-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.3.0</version>
</dependency>
<!-- for tests -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.test</artifactId>
- <version>0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- A TC Provider is needed to run the Unit Tests of the Yard Interface.
@@ -128,19 +119,16 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.simple.storage</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/stanbol/trunk/entityhub/yard/solr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/pom.xml Fri Mar 25 05:20:29 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
<packaging>bundle</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub Yard implementation hased on Solr </name>
<description>This bundle provides implementation of the Entityhub Yard interface(s)
@@ -50,17 +50,6 @@
<build>
<plugins>
- <!-- TODO: use this to deactivate unit tests that do require external resources
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/TestForARemoteService.java</exclude>
- <exclude>**/TestForAnotherRemoteService.java</exclude>
- </excludes>
- </configuration>
- </plugin> -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -72,7 +61,6 @@
org.apache.stanbol.entityhub.yard.solr.defaults;version=${pom.version},
org.apache.stanbol.entityhub.yard.solr.model;version=${pom.version},
org.apache.stanbol.entityhub.yard.solr.query;version=${pom.version},
- org.apache.stanbol.entityhub.yard.solr.provider;version=${pom.version},
org.apache.stanbol.entityhub.yard.solr.utils;version=${pom.version}
</Export-Package>
<!-- NOTE: The exclusion of javax.xml.stream assumes that only serialised
@@ -85,12 +73,10 @@
!org.mortbay.log,
!com.sun.msv.*,
!org.relaxng.datatype,
- !javax.xml.stream,
*
</Import-Package>
<Private-Package>
org.apache.stanbol.entityhub.yard.solr.impl;version=${pom.version},
- org.apache.stanbol.entityhub.yard.solr.embedded;version=${pom.version},
org.apache.stanbol.entityhub.yard.solr.impl.queryencoders;version=${pom.version}
</Private-Package>
<Embed-Dependency>
@@ -106,7 +92,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.4</version>
</plugin>
</plugins>
</build>
@@ -116,159 +101,118 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
<!-- SolrJ dependencies (needed for using remote Solr servers) -->
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>1.4.1</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
</dependency>
<!-- Solr/Lucene dependencies (needed for using embedded Solr servers) -->
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>2.9.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.1</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers</artifactId>
- <version>2.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
- <version>2.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-memory</artifactId>
- <version>2.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-misc</artifactId>
- <version>2.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queries</artifactId>
- <version>2.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-snowball</artifactId>
- <version>2.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-memory</artifactId>
- <version>2.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-spellchecker</artifactId>
- <version>2.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-commons-csv</artifactId>
- <version>1.4.1</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.7</version>
- <scope>runtime</scope>
- </dependency>
+ </dependency>
+ <!-- The Solr-Core depends on the Servlet API and in case of running an
+ EmbeddedSolrServer the servlet-api is not available -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>1.6.2</version>
</dependency>
-<!-- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <scope>runtime</scope>
- </dependency> -->
+
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.3.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>1.0.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
- </dependency> -->
+ </dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.4.0</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -278,13 +222,11 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.test</artifactId>
- <version>0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/stanbol/trunk/frameworkfragment/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/frameworkfragment/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/frameworkfragment/pom.xml (original)
+++ incubator/stanbol/trunk/frameworkfragment/pom.xml Fri Mar 25 05:20:29 2011
@@ -6,13 +6,13 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
<relativePath>../parent</relativePath>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
</parent>
-
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.frameworkfragment</artifactId>
<packaging>jar</packaging>
<name>Apache Stanbol Default Framework Fragment Bundle</name>
- <version>0.9.0-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<description>
Fragment bundle that causes additional packages from the JVM
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1085256&r1=1085255&r2=1085256&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Fri Mar 25 05:20:29 2011
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Apache Stanbol software is licensed under the Apache License, Version 2.0,
see http://www.apache.org/licenses/LICENSE-2.0 Unless required by
@@ -16,7 +15,7 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
<packaging>pom</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol : Parent POM</name>
<description>Parent POM for the Apache Stanbol project</description>
@@ -129,7 +128,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.2</version>
+ <version>1.4.4</version>
<!-- slf4j impl is needed when QDox inspects/loads classes that use a
static field for the logger, so that those classes can be loaded. -->
<dependencies>
@@ -156,7 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.0</version>
</plugin>
<plugin>
<groupId>org.apache.sling</groupId>
@@ -181,7 +180,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -196,7 +195,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7.1</version>
<configuration>
<argLine>-Xmx1G</argLine>
</configuration>
@@ -219,7 +218,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.0.6</version>
+ <version>2.0.10</version>
</plugin>
</plugins>
</pluginManagement>
@@ -234,25 +233,31 @@
<!-- Stanbol Deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.defaultdata</artifactId>
- <version>0.0.1</version>
+ <artifactId>org.apache.stanbol.jsonld</artifactId>
+ <version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
+ <version>${stanbol-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>${stanbol-version}</version>
+ <artifactId>org.apache.stanbol.defaultdata</artifactId>
+ <version>0.0.1</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.standalone</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.jsonld</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.standalone</artifactId>
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
@@ -289,6 +294,39 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.test</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.core</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+
<!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
@@ -313,12 +351,16 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.2.0</version>
+ <version>1.4.0</version>
<scope>provided</scope>
</dependency>
<!-- Apache Lucene -->
- <dependency>
+ <!-- This version is used by the autotagger but not compatible to
+ Solr 1.4.1 used by the Entityhub. Therefore (until the new version
+ of Solr is released) move this directly to the autotagger
+ (Rupert Westenthaler, 2011-02-23)-->
+ <!-- <dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>3.0.1</version>
@@ -335,7 +377,7 @@
<artifactId>lucene-analyzers</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<!-- Apache Clerezza -->
<dependency>
@@ -411,6 +453,11 @@
<version>1.4</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -435,6 +482,34 @@
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ <!-- <version>1.3</version> -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+ <!-- Joda Time -->
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.6.2</version>
+ <scope>provided</scope>
+ </dependency>
<!-- SLF4J -->
<dependency>
@@ -503,7 +578,7 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
- <version>1.0</version>
+ <version>1.1.1</version>
<scope>provided</scope>
</dependency>
@@ -529,7 +604,7 @@
<scope>provided</scope>
</dependency>
- <!-- Jettison - indirect dependency for freemarker -->
+ <!-- Jettison -->
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
@@ -596,6 +671,93 @@
<scope>provided</scope>
</dependency>
+ <!-- Solr and Lucene -->
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>1.4.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>1.4.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-commons-csv</artifactId>
+ <version>1.4.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>2.9.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ <version>2.9.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ <version>2.9.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ <version>2.9.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-misc</artifactId>
+ <version>2.9.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queries</artifactId>
+ <version>2.9.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ <version>2.9.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ <version>2.9.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spellchecker</artifactId>
+ <version>2.9.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Woodstox StAX Parser (used by Solr/Lucene) -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.7</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- JDom -->
<dependency>
<groupId>org.jdom</groupId>
@@ -822,13 +984,6 @@
</repository>
<repository>
- <!-- used for the jdom bundle com.springsource.org.jdom (rw) -->
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
-
- <repository>
<id>repository-codehaus</id>
<name>Codehaus Repository</name>
<url>http://repository.codehaus.org</url>