From aa170f1da54d3819a2c9656c0f953eadf2b10ba0 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com>
Date: Fri, 17 Jun 2022 15:11:56 +0200
Subject: [PATCH] Modularize the lang-expression component (#87790)

---
 modules/lang-expression/build.gradle              |  1 +
 .../licenses/lucene-codecs-9.2.0.jar.sha1         |  1 +
 .../src/main/java/module-info.java                | 15 +++++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1
 create mode 100644 modules/lang-expression/src/main/java/module-info.java

diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle
index 564f22698822..1581de127427 100644
--- a/modules/lang-expression/build.gradle
+++ b/modules/lang-expression/build.gradle
@@ -16,6 +16,7 @@ esplugin {
 
 dependencies {
   api "org.apache.lucene:lucene-expressions:${versions.lucene}"
+  runtimeOnly "org.apache.lucene:lucene-codecs:${versions.lucene}"
   runtimeOnly 'org.antlr:antlr4-runtime:4.5.1-1'
   runtimeOnly 'org.ow2.asm:asm:7.2'
   runtimeOnly 'org.ow2.asm:asm-commons:7.2'
diff --git a/modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1 b/modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1
new file mode 100644
index 000000000000..45068a260bb4
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1
@@ -0,0 +1 @@
+6a1b5573015bfbfd94d7324012a3177217af7705
\ No newline at end of file
diff --git a/modules/lang-expression/src/main/java/module-info.java b/modules/lang-expression/src/main/java/module-info.java
new file mode 100644
index 000000000000..b42f40d7d095
--- /dev/null
+++ b/modules/lang-expression/src/main/java/module-info.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module org.elasticsearch.script.expression {
+    requires org.elasticsearch.base;
+    requires org.elasticsearch.server;
+    requires org.apache.lucene.core;
+    requires org.apache.lucene.expressions;
+    requires org.apache.lucene.queries;
+}