Index: modules/queries/src/test/org/apache/lucene/queries/regex/TestRegexQuery.java
===================================================================
--- modules/queries/src/test/org/apache/lucene/queries/regex/TestRegexQuery.java	(revision 0)
+++ modules/queries/src/test/org/apache/lucene/queries/regex/TestRegexQuery.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.queries.regex;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: modules/queries/src/test/org/apache/lucene/queries/regex/TestJakartaRegexpCapabilities.java
===================================================================
--- modules/queries/src/test/org/apache/lucene/queries/regex/TestJakartaRegexpCapabilities.java	(revision 0)
+++ modules/queries/src/test/org/apache/lucene/queries/regex/TestJakartaRegexpCapabilities.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.queries.regex;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: modules/queries/src/test/org/apache/lucene/queries/regex/TestSpanRegexQuery.java
===================================================================
--- modules/queries/src/test/org/apache/lucene/queries/regex/TestSpanRegexQuery.java	(revision 0)
+++ modules/queries/src/test/org/apache/lucene/queries/regex/TestSpanRegexQuery.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.queries.regex;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: modules/queries/src/java/org/apache/lucene/queries/regex/RegexQuery.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/regex/RegexQuery.java	(revision 0)
+++ modules/queries/src/java/org/apache/lucene/queries/regex/RegexQuery.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.queries.regex;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: modules/queries/src/java/org/apache/lucene/queries/regex/JakartaRegexpCapabilities.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/regex/JakartaRegexpCapabilities.java	(revision 0)
+++ modules/queries/src/java/org/apache/lucene/queries/regex/JakartaRegexpCapabilities.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.queries.regex;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: modules/queries/src/java/org/apache/lucene/queries/regex/JavaUtilRegexCapabilities.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/regex/JavaUtilRegexCapabilities.java	(revision 0)
+++ modules/queries/src/java/org/apache/lucene/queries/regex/JavaUtilRegexCapabilities.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.queries.regex;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: modules/queries/src/java/org/apache/lucene/queries/regex/RegexCapabilities.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/regex/RegexCapabilities.java	(revision 0)
+++ modules/queries/src/java/org/apache/lucene/queries/regex/RegexCapabilities.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.queries.regex;
 
 import org.apache.lucene.util.BytesRef;
 
Index: modules/queries/src/java/org/apache/lucene/queries/regex/RegexQueryCapable.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/regex/RegexQueryCapable.java	(revision 0)
+++ modules/queries/src/java/org/apache/lucene/queries/regex/RegexQueryCapable.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.queries.regex;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: modules/queries/src/java/org/apache/lucene/queries/regex/RegexTermsEnum.java
===================================================================
--- modules/queries/src/java/org/apache/lucene/queries/regex/RegexTermsEnum.java	(revision 0)
+++ modules/queries/src/java/org/apache/lucene/queries/regex/RegexTermsEnum.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.regex;
+package org.apache.lucene.queries.regex;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: modules/queries/build.xml
===================================================================
--- modules/queries/build.xml	(revision 1157315)
+++ modules/queries/build.xml	(working copy)
@@ -24,6 +24,15 @@
   <property name="dist.dir" location="dist/"/>
   <property name="maven.dist.dir" location="../dist/maven"/>
 
+  <path id="additional.dependencies">
+    <fileset dir="lib" includes="*-oro-*.jar,*-regexp-*.jar"/>
+  </path>
+
+  <pathconvert property="project.classpath"
+               targetos="unix"
+               refid="additional.dependencies"
+  />
+
   <import file="../../lucene/contrib/contrib-build.xml"/>
 
   <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven"/>
Index: lucene/contrib/queries/lib/jakarta-regexp-1.4.jar (deleted)
===================================================================
Index: lucene/contrib/queries/lib/jakarta-regexp-LICENSE-ASL.txt (deleted)
===================================================================
Index: lucene/contrib/queries/lib/jakarta-regexp-NOTICE.txt (deleted)
===================================================================
Index: lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java (deleted)
===================================================================
Index: lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestJakartaRegexpCapabilities.java (deleted)
===================================================================
Index: lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (deleted)
===================================================================
Index: lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java (deleted)
===================================================================
Index: lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java (deleted)
===================================================================
Index: lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java (deleted)
===================================================================
Index: lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexCapabilities.java (deleted)
===================================================================
Index: lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java (deleted)
===================================================================
Index: lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexTermsEnum.java (deleted)
===================================================================
Index: lucene/contrib/queries/src/java/org/apache/lucene/search/regex/package.html (deleted)
===================================================================
Index: lucene/contrib/queries/build.xml
===================================================================
--- lucene/contrib/queries/build.xml	(revision 1157315)
+++ lucene/contrib/queries/build.xml	(working copy)
@@ -23,14 +23,5 @@
     Queries - various query object exotica not in core
   </description>
 
-  <path id="additional.dependencies">
-    <fileset dir="lib" includes="*-oro-*.jar,*-regexp-*.jar"/>
-  </path>
-
-  <pathconvert property="project.classpath"
-               targetos="unix"
-               refid="additional.dependencies"
-  />
-
   <import file="../contrib-build.xml"/>
 </project>
Index: dev-tools/idea/modules/queries/queries.iml
===================================================================
--- dev-tools/idea/modules/queries/queries.iml	(revision 1157315)
+++ dev-tools/idea/modules/queries/queries.iml	(working copy)
@@ -11,6 +11,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/jakarta-regexp-1.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
     <orderEntry type="module" module-name="lucene" />
   </component>
Index: dev-tools/idea/lucene/contrib/queries/queries-contrib.iml
===================================================================
--- dev-tools/idea/lucene/contrib/queries/queries-contrib.iml	(revision 1157315)
+++ dev-tools/idea/lucene/contrib/queries/queries-contrib.iml	(working copy)
@@ -10,15 +10,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jakarta-regexp-1.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
     <orderEntry type="module" module-name="misc" />
     <orderEntry type="module" module-name="lucene" />
Index: dev-tools/maven/modules/queries/pom.xml.template
===================================================================
--- dev-tools/maven/modules/queries/pom.xml.template	(revision 1157315)
+++ dev-tools/maven/modules/queries/pom.xml.template	(working copy)
@@ -48,6 +48,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
Index: dev-tools/maven/lucene/contrib/queries/pom.xml.template
===================================================================
--- dev-tools/maven/lucene/contrib/queries/pom.xml.template	(revision 1157315)
+++ dev-tools/maven/lucene/contrib/queries/pom.xml.template	(working copy)
@@ -57,10 +57,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>