Merge branch 'release/2.4.0'

chenlb · Jan 1, 2017 · 8f281b1 · 8f281b1
2 parents fc7d2d9 + 127e627
commit 8f281b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -27,18 +27,19 @@ tokenizer 的参数：
 
 版本
 
-* mmseg4j-solr-2.0.0.jar 要求 lucene/solr >= 4.3.0。在 lucene/solr [4.3.0, 4.7.1] 测试过兼容可用。
-* mmseg4j-solr-2.1.0.jar 要求 lucene/solr 4.8.x
-* mmseg4j-solr-2.2.0.jar 要求 lucene/solr [4.9, 4.10.x]
-* mmseg4j-solr-2.3.0.jar 要求 lucene/solr [5.0, ]
+* 2.0.0 - 要求 lucene/solr >= 4.3.0。在 lucene/solr [4.3.0, 4.7.1] 测试过兼容可用。
+* 2.1.0 - 要求 lucene/solr 4.8.x
+* 2.2.0 - 要求 lucene/solr [4.9, 4.10.x]
+* 2.3.0 - 要求 lucene/solr [5.0, ]
+* 2.4.0 - 要求 lucene/solr [6.0.0, ], 测试到 6.3.0 通过。
 
 ## maven
 
 ```xml
 <dependency>
     <groupId>com.chenlb.mmseg4j</groupId>
     <artifactId>mmseg4j-solr</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>com.chenlb.mmseg4j</groupId>
 	<artifactId>mmseg4j-solr</artifactId>
-	<version>2.3.1</version>
+	<version>2.4.0</version>
 
 	<name>mmseg4j-solr</name>
 	<url>https://github.com/chenlb/mmseg4j-solr</url>
@@ -59,7 +59,7 @@
 		<mmseg4j.version>1.10.0</mmseg4j.version>
 		<slf4j.version>1.7.7</slf4j.version>
 		<logback.version>1.1.3</logback.version>
-		<solr.version>5.5.3</solr.version>
+		<solr.version>6.0.0</solr.version>
 	</properties>
 
 	<dependencies>

diff --git a/src/main/java/com/chenlb/mmseg4j/solr/Utils.java b/src/main/java/com/chenlb/mmseg4j/solr/Utils.java
@@ -15,7 +15,7 @@ public static Dictionary getDict(String dicPath, ResourceLoader loader) {
 			File f = new File(dicPath);
 			if(!f.isAbsolute() && loader instanceof SolrResourceLoader) {	//相对目录
 				SolrResourceLoader srl = (SolrResourceLoader) loader;
-				dicPath = srl.getInstanceDir()+dicPath;
+				dicPath = srl.getInstancePath().resolve(dicPath).toString();
 				f = new File(dicPath);
 			}
 

diff --git a/src/test/resources/solr/mmseg4j_core/conf/solrconfig.xml b/src/test/resources/solr/mmseg4j_core/conf/solrconfig.xml
@@ -60,7 +60,6 @@
     <maxBufferedDocs>10</maxBufferedDocs>
     <mergePolicy class="org.apache.lucene.index.LogDocMergePolicy"/>
     <lockType>native</lockType>
-    <unlockOnStartup>true</unlockOnStartup>
   </indexConfig>
 
   <updateHandler class="solr.DirectUpdateHandler2">
@@ -237,7 +236,6 @@
     </lst>
   </requestHandler>
 
-  <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
 
   <!-- test query parameter defaults -->
   <requestHandler name="defaults" class="solr.StandardRequestHandler">