From 059dffda6f941e2390e7aa3bf23121d4038c305b Mon Sep 17 00:00:00 2001
From: magese <magese@live.cn>
Date: Fri, 11 May 2018 13:54:01 +0800
Subject: [PATCH] Deploy release artifacts into the staging repository

---
 pom.xml                                       | 195 +++++++++++++-----
 .../org/wltea/analyzer/cfg/Configuration.java |   4 +-
 .../org/wltea/analyzer/cfg/DefaultConfig.java |   4 +-
 .../org/wltea/analyzer/dic/Dictionary.java    |   2 +-
 .../query/IKQueryExpressionParser.java        |   3 -
 5 files changed, 148 insertions(+), 60 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca15eea..6569340 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,64 +1,155 @@
 <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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.wltea.ik-analyzer</groupId>
-  <artifactId>ik-analyzer-solr</artifactId>
-  <version>7.x</version>
-  <packaging>jar</packaging>
+    <groupId>com.github.magese</groupId>
+    <artifactId>ik-analyzer-solr7</artifactId>
+    <version>7.x</version>
+    <packaging>jar</packaging>
 
-  <name>ik-analyzer-solr</name>
-  <url>http://code.google.com/p/ik-analyzer/</url>
+    <name>ik-analyzer-solr7</name>
+    <url>http://code.google.com/p/ik-analyzer/</url>
+    <description>IK-Analyzer for solr7.x</description>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <lucene.version>7.3.0</lucene.version>
+        <javac.src.version>1.8</javac.src.version>
+        <javac.target.version>1.8</javac.target.version>
+        <maven.compiler.plugin.version>3.3</maven.compiler.plugin.version>
+    </properties>
 
-    <lucene.version>7.3.0</lucene.version>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
 
-    <javac.src.version>1.8</javac.src.version>
-    <javac.target.version>1.8</javac.target.version>
-    <maven.compiler.plugin.version>3.3</maven.compiler.plugin.version>
-  </properties>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
 
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-queryparser</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
 
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-      <version>${lucene.version}</version>
-    </dependency>
- 
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queryparser</artifactId>
-      <version>${lucene.version}</version>
-    </dependency>
- 
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-      <version>${lucene.version}</version>
-    </dependency>                     
-  </dependencies>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-analyzers-common</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-	<configuration>
-	  <target>${javac.src.version}</target>
-	  <source>${javac.target.version}</source>
-        </configuration>
-        <version>${maven.compiler.plugin.version}</version>
-      </plugin>
-    </plugins>
-  </build>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <tag>master</tag>
+        <url>https://github.com/magese/ik-analyzer-solr7</url>
+        <connection>scm:git:git@github.com:magese/ik-analyzer-solr7.git</connection>
+        <developerConnection>scm:git:git@github.com:magese/ik-analyzer-solr7.git</developerConnection>
+    </scm>
+    <developers>
+        <developer>
+            <name>magese</name>
+            <email>magese@live.cn</email>
+        </developer>
+    </developers>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>${javac.src.version}</source>
+                    <target>${javac.src.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+        </plugins>
+        <defaultGoal>compile</defaultGoal>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>oss</id>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+                </snapshotRepository>
+                <repository>
+                    <id>oss</id>
+                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+            <build>
+                <plugins>
+                    <!-- Source -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Javadoc -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.10.4</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Gpg Signature -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
   
diff --git a/src/main/java/org/wltea/analyzer/cfg/Configuration.java b/src/main/java/org/wltea/analyzer/cfg/Configuration.java
index 221be17..ae11c61 100644
--- a/src/main/java/org/wltea/analyzer/cfg/Configuration.java
+++ b/src/main/java/org/wltea/analyzer/cfg/Configuration.java
@@ -46,7 +46,7 @@ public interface Configuration {
     /**
      * 获取扩展字典配置路径
      *
-     * @return List<String> 相对类加载器的路径
+     * @return 相对类加载器的路径
      */
     List<String> getExtDictionarys();
 
@@ -54,7 +54,7 @@ public interface Configuration {
     /**
      * 获取扩展停止词典配置路径
      *
-     * @return List<String> 相对类加载器的路径
+     * @return 相对类加载器的路径
      */
     List<String> getExtStopWordDictionarys();
 
diff --git a/src/main/java/org/wltea/analyzer/cfg/DefaultConfig.java b/src/main/java/org/wltea/analyzer/cfg/DefaultConfig.java
index 325b827..572040c 100644
--- a/src/main/java/org/wltea/analyzer/cfg/DefaultConfig.java
+++ b/src/main/java/org/wltea/analyzer/cfg/DefaultConfig.java
@@ -103,7 +103,7 @@ public class DefaultConfig implements Configuration {
     /**
      * 获取扩展字典配置路径
      *
-     * @return List<String> 相对类加载器的路径
+     * @return 相对类加载器的路径
      */
     public List<String> getExtDictionarys() {
         List<String> extDictFiles = new ArrayList<>(2);
@@ -124,7 +124,7 @@ public class DefaultConfig implements Configuration {
     /**
      * 获取扩展停止词典配置路径
      *
-     * @return List<String> 相对类加载器的路径
+     * @return 相对类加载器的路径
      */
     public List<String> getExtStopWordDictionarys() {
         List<String> extStopWordDictFiles = new ArrayList<>(2);
diff --git a/src/main/java/org/wltea/analyzer/dic/Dictionary.java b/src/main/java/org/wltea/analyzer/dic/Dictionary.java
index 5fa8e92..3cea494 100644
--- a/src/main/java/org/wltea/analyzer/dic/Dictionary.java
+++ b/src/main/java/org/wltea/analyzer/dic/Dictionary.java
@@ -118,7 +118,7 @@ public class Dictionary {
     /**
      * 批量加载新词条
      *
-     * @param words Collection<String>词条列表
+     * @param words 词条列表
      */
     public void addWords(Collection<String> words) {
         if (words != null) {
diff --git a/src/main/java/org/wltea/analyzer/query/IKQueryExpressionParser.java b/src/main/java/org/wltea/analyzer/query/IKQueryExpressionParser.java
index f6da5b7..8e497b9 100644
--- a/src/main/java/org/wltea/analyzer/query/IKQueryExpressionParser.java
+++ b/src/main/java/org/wltea/analyzer/query/IKQueryExpressionParser.java
@@ -18,9 +18,6 @@ import java.util.Stack;
 /**
  * IK简易查询表达式解析
  * 结合SWMCQuery算法
- * <p>
- * 表达式例子 ：
- * (id='1231231' && title:'monkey') || (content:'你好吗'  || ulr='www.ik.com') - name:'helloword'
  *
  * @author linliangyi
  */