diff --git a/buildSrc/src/main/groovy/com/worksap/nlp/tools/engines.groovy b/buildSrc/src/main/groovy/com/worksap/nlp/tools/engines.groovy index cce96482..4bdfb308 100644 --- a/buildSrc/src/main/groovy/com/worksap/nlp/tools/engines.groovy +++ b/buildSrc/src/main/groovy/com/worksap/nlp/tools/engines.groovy @@ -49,7 +49,8 @@ enum EsSupport implements EngineSupport { enum OsSupport implements EngineSupport { Os20("os-2.00"), - Os210("os-2.10") + Os27("os-2.07"), + Os210("os-2.10"), String tag @@ -59,8 +60,10 @@ enum OsSupport implements EngineSupport { static OsSupport supportVersion(Version version) { - if (version.ge(2, 0) && version.lt(2, 10)) { + if (version.ge(2, 0) && version.lt(2, 7)) { return Os20 + } else if (version.ge(2, 7) && version.lt(2, 10)) { + return Os27 } else if (version.ge(2, 10)) { return Os210 } diff --git a/src/main/ext/es-7.15-ge/xcontent-aliases.kt b/src/main/ext/es-7.15-ge/xcontent-aliases.kt new file mode 100644 index 00000000..036a5cb4 --- /dev/null +++ b/src/main/ext/es-7.15-ge/xcontent-aliases.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2024 Works Applications Co., Ltd. + * + * Licensed 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. + */ + +@file:Suppress("PackageDirectoryMismatch") + +package com.worksap.nlp.lucene.aliases + +typealias ToXContent = org.elasticsearch.xcontent.ToXContent + +typealias ToXContentParams = org.elasticsearch.xcontent.ToXContent.Params + +typealias XContentBuilder = org.elasticsearch.xcontent.XContentBuilder diff --git a/src/main/ext/es-7.15-lt/xcontent-aliases.kt b/src/main/ext/es-7.15-lt/xcontent-aliases.kt new file mode 100644 index 00000000..5fdcb844 --- /dev/null +++ b/src/main/ext/es-7.15-lt/xcontent-aliases.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2024 Works Applications Co., Ltd. + * + * Licensed 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. + */ + +@file:Suppress("PackageDirectoryMismatch") + +package com.worksap.nlp.lucene.aliases + +typealias ToXContent = org.elasticsearch.common.xcontent.ToXContent + +typealias ToXContentParams = org.elasticsearch.common.xcontent.ToXContent.Params + +typealias XContentBuilder = org.elasticsearch.common.xcontent.XContentBuilder diff --git a/src/main/ext/es-8.00-ge/lucene-aliases.kt b/src/main/ext/es-8.00-ge/lucene-aliases.kt index 233d95b3..76def36e 100644 --- a/src/main/ext/es-8.00-ge/lucene-aliases.kt +++ b/src/main/ext/es-8.00-ge/lucene-aliases.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Works Applications Co., Ltd. + * Copyright (c) 2023 Works Applications Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,3 @@ typealias TokenFilterFactory = org.apache.lucene.analysis.TokenFilterFactory typealias ResourceLoaderArgument = org.apache.lucene.util.ResourceLoader typealias ResourceLoaderAware = org.apache.lucene.util.ResourceLoaderAware - -typealias ToXContent = org.elasticsearch.xcontent.ToXContent - -typealias ToXContentParams = org.elasticsearch.xcontent.ToXContent.Params - -typealias XContentBuilder = org.elasticsearch.xcontent.XContentBuilder diff --git a/src/main/ext/es-8.00-lt/lucene-aliases.kt b/src/main/ext/es-8.00-lt/lucene-aliases.kt index 76f2fc1a..143e404c 100644 --- a/src/main/ext/es-8.00-lt/lucene-aliases.kt +++ b/src/main/ext/es-8.00-lt/lucene-aliases.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Works Applications Co., Ltd. + * Copyright (c) 2023 Works Applications Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,3 @@ typealias TokenFilterFactory = org.apache.lucene.analysis.util.TokenFilterFactor typealias ResourceLoaderArgument = org.apache.lucene.analysis.util.ResourceLoader typealias ResourceLoaderAware = org.apache.lucene.analysis.util.ResourceLoaderAware - -typealias ToXContent = org.elasticsearch.xcontent.ToXContent - -typealias ToXContentParams = org.elasticsearch.xcontent.ToXContent.Params - -typealias XContentBuilder = org.elasticsearch.xcontent.XContentBuilder diff --git a/src/main/ext/os-2.00-ge/lucene-aliases.kt b/src/main/ext/os-2.00-ge/lucene-aliases.kt index 9b41efb4..76def36e 100644 --- a/src/main/ext/os-2.00-ge/lucene-aliases.kt +++ b/src/main/ext/os-2.00-ge/lucene-aliases.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Works Applications Co., Ltd. + * Copyright (c) 2023 Works Applications Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,3 @@ typealias TokenFilterFactory = org.apache.lucene.analysis.TokenFilterFactory typealias ResourceLoaderArgument = org.apache.lucene.util.ResourceLoader typealias ResourceLoaderAware = org.apache.lucene.util.ResourceLoaderAware - -typealias ToXContent = org.opensearch.core.xcontent.ToXContent - -typealias ToXContentParams = org.opensearch.core.xcontent.ToXContent.Params - -typealias XContentBuilder = org.opensearch.core.xcontent.XContentBuilder diff --git a/src/main/ext/os-2.07-ge/xcontent-aliases.kt b/src/main/ext/os-2.07-ge/xcontent-aliases.kt new file mode 100644 index 00000000..ff7b7bac --- /dev/null +++ b/src/main/ext/os-2.07-ge/xcontent-aliases.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2024 Works Applications Co., Ltd. + * + * Licensed 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. + */ + +@file:Suppress("PackageDirectoryMismatch") + +package com.worksap.nlp.lucene.aliases + +typealias ToXContent = org.opensearch.core.xcontent.ToXContent + +typealias ToXContentParams = org.opensearch.core.xcontent.ToXContent.Params + +typealias XContentBuilder = org.opensearch.core.xcontent.XContentBuilder diff --git a/src/main/ext/os-2.07-lt/xcontent-aliases.kt b/src/main/ext/os-2.07-lt/xcontent-aliases.kt new file mode 100644 index 00000000..dddb4bda --- /dev/null +++ b/src/main/ext/os-2.07-lt/xcontent-aliases.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2024 Works Applications Co., Ltd. + * + * Licensed 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. + */ + +@file:Suppress("PackageDirectoryMismatch") + +package com.worksap.nlp.lucene.aliases + +typealias ToXContent = org.opensearch.common.xcontent.ToXContent + +typealias ToXContentParams = org.opensearch.common.xcontent.ToXContent.Params + +typealias XContentBuilder = org.opensearch.common.xcontent.XContentBuilder