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/09/06 22:20:57 UTC

svn commit: r1520685 - in /jena/trunk: jena-arq/ReleaseNotes.txt jena-core/ReleaseNotes.txt jena-fuseki/pom.xml jena-tdb/ReleaseNotes.txt jena-text/pom.xml jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexSolrAssembler.java

Author: andy
Date: Fri Sep  6 20:20:57 2013
New Revision: 1520685

URL: http://svn.apache.org/r1520685
Log:
Tidying up : release 2.11.0 preparation 

Modified:
    jena/trunk/jena-arq/ReleaseNotes.txt
    jena/trunk/jena-core/ReleaseNotes.txt
    jena/trunk/jena-fuseki/pom.xml
    jena/trunk/jena-tdb/ReleaseNotes.txt
    jena/trunk/jena-text/pom.xml
    jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexSolrAssembler.java

Modified: jena/trunk/jena-arq/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/ReleaseNotes.txt?rev=1520685&r1=1520684&r2=1520685&view=diff
==============================================================================
--- jena/trunk/jena-arq/ReleaseNotes.txt (original)
+++ jena/trunk/jena-arq/ReleaseNotes.txt Fri Sep  6 20:20:57 2013
@@ -2,7 +2,7 @@ ChangeLog for ARQ
 =================
 (the list covers new features and refinements.  See ASF JIRA for details of bugs fixed) 
 
-==== Jena 2.10.2
+==== Jena 2.11.0
 
 + JENA-500 : Substitution for an initial binding is now done 
              on the algrebra before optimzation is attempted.

Modified: jena/trunk/jena-core/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/ReleaseNotes.txt?rev=1520685&r1=1520684&r2=1520685&view=diff
==============================================================================
--- jena/trunk/jena-core/ReleaseNotes.txt (original)
+++ jena/trunk/jena-core/ReleaseNotes.txt Fri Sep  6 20:20:57 2013
@@ -1,7 +1,7 @@
 Release Notes 
 =============
 
-==== Jena 2.10.2
+==== Jena 2.11.0
 
 ==== Jena 2.10.1
 

Modified: jena/trunk/jena-fuseki/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/pom.xml?rev=1520685&r1=1520684&r2=1520685&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/pom.xml (original)
+++ jena/trunk/jena-fuseki/pom.xml Fri Sep  6 20:20:57 2013
@@ -124,6 +124,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-spatial</artifactId>
+      <version>1.0.1-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: jena/trunk/jena-tdb/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/ReleaseNotes.txt?rev=1520685&r1=1520684&r2=1520685&view=diff
==============================================================================
--- jena/trunk/jena-tdb/ReleaseNotes.txt (original)
+++ jena/trunk/jena-tdb/ReleaseNotes.txt Fri Sep  6 20:20:57 2013
@@ -1,7 +1,7 @@
 ChangeLog for TDB
 =================
 
-==== TDB 0.10.2
+==== TDB 1.0.0
 
 ==== TDB 0.10.1
 

Modified: jena/trunk/jena-text/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/pom.xml?rev=1520685&r1=1520684&r2=1520685&view=diff
==============================================================================
--- jena/trunk/jena-text/pom.xml (original)
+++ jena/trunk/jena-text/pom.xml Fri Sep  6 20:20:57 2013
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!--
+   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.
+-->
 
 <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">
@@ -16,7 +22,7 @@
   <groupId>org.apache.jena</groupId>
   <artifactId>jena-text</artifactId>
   <packaging>jar</packaging>
-  <name>Apache Jena - SPARQL and Lucene/Solr</name>
+  <name>Apache Jena - SPARQL Text Search</name>
   <version>1.0.0-SNAPSHOT</version>
 
   <parent>

Modified: jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexSolrAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexSolrAssembler.java?rev=1520685&r1=1520684&r2=1520685&view=diff
==============================================================================
--- jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexSolrAssembler.java (original)
+++ jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexSolrAssembler.java Fri Sep  6 20:20:57 2013
@@ -57,9 +57,7 @@ public class TextIndexSolrAssembler exte
 //            server = new EmbeddedSolrServer(coreContainer, coreName);
         } 
         else if ( uri.startsWith("http://") )
-        {
             server = new HttpSolrServer( uri );
-        }
         else
             throw new TextIndexException("URI for the server must begin 'http://'") ;