Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support elasticsearch 7.10.2 & add built plugin #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
87 changes: 87 additions & 0 deletions seunjeon-patch-7-10-2.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
diff --git a/build.sbt b/build.sbt
index d3f2d32..3ab7b61 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,7 +6,6 @@ lazy val commonSettings = Seq(
scalaVersion := "2.12.0", // default
publishMavenStyle := true,
publishArtifact in Test := false,
- useGpg := true,
publishTo := {
val nexus = "https://oss.sonatype.org/"
if (version.value.trim.endsWith("SNAPSHOT"))
@@ -66,7 +65,7 @@ lazy val seunjeon = (project in file(".")).
)

val elasticsearchPluginName = "elasticsearch-analysis-seunjeon"
-val esVersion = "6.1.1"
+val esVersion = "7.10.2"
val esJavaVersion = "1.8"

lazy val elasticsearch = (project in file("elasticsearch")).dependsOn(seunjeon).
@@ -112,8 +111,8 @@ lazy val elasticsearch = (project in file("elasticsearch")).dependsOn(seunjeon).
val zipFile = file(jarFile.getPath.substring(0, jarFile.getPath.length - jarFile.ext.length - 1) + ".zip")
IO.zip(
List(
- (propertiesFile, s"elasticsearch/${propertiesFile.getName}"),
- (jarFile, s"elasticsearch/${jarFile.getName}")),
+ (propertiesFile, s"${propertiesFile.getName}"),
+ (jarFile, s"${jarFile.getName}")),
zipFile)
zipFile
},
diff --git a/elasticsearch/src/main/java/org/bitbucket/eunjeon/seunjeon/elasticsearch/SeunjeonTokenizer.java b/elasticsearch/src/main/java/org/bitbucket/eunjeon/seunjeon/elasticsearch/SeunjeonTokenizer.java
index ac9a3d7..aa670fb 100644
--- a/elasticsearch/src/main/java/org/bitbucket/eunjeon/seunjeon/elasticsearch/SeunjeonTokenizer.java
+++ b/elasticsearch/src/main/java/org/bitbucket/eunjeon/seunjeon/elasticsearch/SeunjeonTokenizer.java
@@ -5,7 +5,7 @@ import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.*;
import org.apache.lucene.analysis.util.RollingCharBuffer;
import org.apache.lucene.util.AttributeFactory;
-import org.elasticsearch.common.logging.ESLoggerFactory;
+import org.apache.logging.log4j.LogManager;

import java.io.IOException;
import java.io.StringWriter;
@@ -29,7 +29,7 @@ public class SeunjeonTokenizer extends Tokenizer {

public SeunjeonTokenizer(TokenizerOptions options) {
super(AttributeFactory.DEFAULT_ATTRIBUTE_FACTORY);
- logger = ESLoggerFactory.getLogger(options.getName());
+ logger = LogManager.getLogger(options.getName());

initAttribute();
tokenizerHelper = new TokenizerHelper(
diff --git a/elasticsearch/src/main/java/org/bitbucket/eunjeon/seunjeon/elasticsearch/index/analysis/SeunjeonTokenizerFactory.java b/elasticsearch/src/main/java/org/bitbucket/eunjeon/seunjeon/elasticsearch/index/analysis/SeunjeonTokenizerFactory.java
index 8709c91..3e33aef 100644
--- a/elasticsearch/src/main/java/org/bitbucket/eunjeon/seunjeon/elasticsearch/index/analysis/SeunjeonTokenizerFactory.java
+++ b/elasticsearch/src/main/java/org/bitbucket/eunjeon/seunjeon/elasticsearch/index/analysis/SeunjeonTokenizerFactory.java
@@ -20,7 +20,7 @@ public class SeunjeonTokenizerFactory extends AbstractTokenizerFactory {
Environment env,
String name,
Settings settings) {
- super(indexSettings, name, settings);
+ super(indexSettings, settings, name);

this.options = TokenizerOptions.create(name).
setUserDictPath(getFullPath(env, settings.get("user_dict_path", null))).
diff --git a/elasticsearch/src/main/scala/org/bitbucket/eunjeon/seunjeon/elasticsearch/TokenizerHelper.scala b/elasticsearch/src/main/scala/org/bitbucket/eunjeon/seunjeon/elasticsearch/TokenizerHelper.scala
index 7e60075..4feb2d7 100644
--- a/elasticsearch/src/main/scala/org/bitbucket/eunjeon/seunjeon/elasticsearch/TokenizerHelper.scala
+++ b/elasticsearch/src/main/scala/org/bitbucket/eunjeon/seunjeon/elasticsearch/TokenizerHelper.scala
@@ -6,13 +6,13 @@ import java.util.InvalidPropertiesFormatException
import org.apache.logging.log4j.Logger
import org.bitbucket.eunjeon.seunjeon._
import org.bitbucket.eunjeon.seunjeon.Pos.Pos
-import org.elasticsearch.common.logging.ESLoggerFactory
+import org.apache.logging.log4j.LogManager

import scala.collection.JavaConverters._


object TokenizerHelper {
- val logger: Logger = ESLoggerFactory.getLogger(TokenizerHelper.getClass.getName)
+ val logger: Logger = LogManager.getLogger(TokenizerHelper.getClass.getName)

val compress: Boolean = System.getProperty("seunjeon.compress") match {
case "true" => true