You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/04/11 15:51:52 UTC

svn commit: r1466890 - /jena/Experimental/jena-text/pom.xml

Author: andy
Date: Thu Apr 11 13:51:52 2013
New Revision: 1466890

URL: http://svn.apache.org/r1466890
Log:
Prepare for Jenkins build

Modified:
    jena/Experimental/jena-text/pom.xml

Modified: jena/Experimental/jena-text/pom.xml
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-text/pom.xml?rev=1466890&r1=1466889&r2=1466890&view=diff
==============================================================================
--- jena/Experimental/jena-text/pom.xml (original)
+++ jena/Experimental/jena-text/pom.xml Thu Apr 11 13:51:52 2013
@@ -3,51 +3,28 @@
 	 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">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.epimorphics.eldp</groupId>
   <artifactId>jena-text</artifactId>
   <packaging>jar</packaging>
   <name>Apache Jena - SPARQL, Lucene/Solr integration</name>
   <version>0.0.0-SNAPSHOT</version>
 
-  <!--
-    When integrated
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-parent</artifactId>
     <version>6-SNAPSHOT</version>
     <relativePath>../jena-parent</relativePath>
   </parent>
-  -->
-
-  <!--
-    Better to put this in your settings.xml
-  <repositories>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-      <releases>
-	<enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  -->
 
   <properties>
     <ver.jena>2.10.1-SNAPSHOT</ver.jena>
-    <ver.junit>[4.11,)</ver.junit>
-    <ver.slf4j>1.6.4</ver.slf4j>
-    <ver.log4j>1.2.16</ver.log4j>
+    <ver.lucene>4.2.1</ver.lucene>
+    <ver.solr>4.2.1</ver.solr>
+
     <jdk.version>1.6</jdk.version>
     <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
     <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
-    <ver.hamcrest>[1.3,)</ver.hamcrest>
-
-    <ver.lucene>4.2.1</ver.lucene>
-    <ver.solr>4.2.1</ver.solr>
-
   </properties>
 
 
@@ -66,20 +43,12 @@
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
       <version>${ver.jena}</version>
+      <type>jar</type>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
 
-
-    <!-- Needed for testing?
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-fuseki</artifactId>
-      <version>0.2.7-SNAPSHOT</version>
-    </dependency>
-    -->
-
-    <!-- Lucene dependencies - for when used directly -->
+    <!-- Lucene dependencies -->
     <dependency>
       <artifactId>lucene-core</artifactId>
       <groupId>org.apache.lucene</groupId>
@@ -101,16 +70,27 @@
       <type>jar</type>
     </dependency>
 
-    
     <!-- Solr client-->
+    <!-- Exclusion of slf4: 
+	 Necessary otherwise maven complians about a
+	 "Dependency convergence error"
+	 of slf4j-api 1.6.1 (from zookeeper) vs 1.6.4 (Jena)
+	 Possibily due to the use of scope-test
+    -->
+
     <dependency>
       <artifactId>solr-solrj</artifactId>
       <groupId>org.apache.solr</groupId>
       <version>${ver.solr}</version>
       <optional>true</optional>
+      <exclusions>
+	<exclusion>
+	  <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions> 
     </dependency>
-    
-    
+
     <!-- Embedded server / testing -->
     <dependency>
       <artifactId>solr-core</artifactId>
@@ -122,7 +102,7 @@
       <exclusions>
 	<exclusion>
 	  <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-jdk14</artifactId>
+          <artifactId>slf4j-api</artifactId>
         </exclusion>
       </exclusions> 
     </dependency>
@@ -135,26 +115,13 @@
       <scope>test</scope>
     </dependency>
 
-     <dependency>
-       <groupId>junit</groupId>
-       <artifactId>junit</artifactId>
-       <version>${ver.junit}</version>
-       <scope>test</scope>
-     </dependency>
-
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${ver.slf4j}</version>
-     </dependency>
-
-     <!-- ?? -->
-     <dependency>
-     	<groupId>org.hamcrest</groupId>
-     	<artifactId>hamcrest-all</artifactId>
-     	<version>${ver.hamcrest}</version>
-     	<scope>test</scope>
-     </dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${ver.junit}</version>
+       <scope>test</scope>
+    </dependency>
+    
   </dependencies>
 
   <build>
@@ -164,22 +131,11 @@
 	<plugin>
 	  <groupId>org.apache.maven.plugins</groupId>
 	  <artifactId>maven-compiler-plugin</artifactId>
-	  <version>2.5.1</version>
-	  <configuration>
-	    <encoding>UTF-8</encoding>
-	    <debug>true</debug>
-	    <debuglevel>source,lines,vars</debuglevel>
-	    <optimize>true</optimize>
-	    <source>${jdk.version}</source>
-	    <target>${jdk.version}</target>
-	    <fork>true</fork>
-	  </configuration>
 	</plugin>
 
 	<plugin>
 	  <groupId>org.apache.maven.plugins</groupId>
 	  <artifactId>maven-surefire-plugin</artifactId>
-	  <version>2.12.4</version>
 	  <configuration>
 	    <includes>
 	       <include>**/TS_*.java</include>
@@ -190,7 +146,6 @@
 	<plugin>
 	  <groupId>org.apache.maven.plugins</groupId>
 	  <artifactId>maven-jar-plugin</artifactId>
-	  <version>2.4</version>
 	</plugin>
 
 	<plugin>
@@ -218,7 +173,6 @@
 	<plugin>
 	  <groupId>org.apache.maven.plugins</groupId>
 	  <artifactId>maven-javadoc-plugin</artifactId>
-	  <version>2.9</version>
 	  <executions>
 	    <execution>
 	      <id>attach-javadocs</id>
@@ -241,7 +195,6 @@
 	<plugin>
 	  <groupId>org.apache.maven.plugins</groupId>
 	  <artifactId>maven-resources-plugin</artifactId>
-	  <version>2.6</version>
 	  <configuration>
 	    <encoding>UTF-8</encoding>
 	  </configuration>