Index: solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template
===================================================================
--- solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template	(revision 0)
+++ solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template	(revision 0)
@@ -0,0 +1,36 @@
+<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/maven-v4_0_0.xsd">
+
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+  -->
+
+  <parent>
+    <groupId>org.apache.solr</groupId>
+    <artifactId>solr-parent</artifactId>
+    <version>@version@</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.solr</groupId>
+  <artifactId>solr-uima-an-wst</artifactId>
+  <name>Solr Specific UIMA Whitespace Tokenizer</name>
+  <version>@version@</version>
+  <description>Solr Specific UIMA Whitespace Tokenizer v2.3.1-SNAPSHOT</description>
+  <packaging>jar</packaging>
+</project>
Index: solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template
===================================================================
--- solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template	(revision 0)
+++ solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template	(revision 0)
@@ -0,0 +1,36 @@
+<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/maven-v4_0_0.xsd">
+
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+  -->
+
+  <parent>
+    <groupId>org.apache.solr</groupId>
+    <artifactId>solr-parent</artifactId>
+    <version>@version@</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.solr</groupId>
+  <artifactId>solr-uima-an-alchemy</artifactId>
+  <name>Solr Specific UIMA Alchemy Annotator</name>
+  <version>@version@</version>
+  <description>Solr Specific UIMA Alchemy Annotator v2.3.1-SNAPSHOT</description>
+  <packaging>jar</packaging>
+</project>
Index: solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template
===================================================================
--- solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template	(revision 0)
+++ solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template	(revision 0)
@@ -0,0 +1,36 @@
+<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/maven-v4_0_0.xsd">
+
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+  -->
+
+  <parent>
+    <groupId>org.apache.solr</groupId>
+    <artifactId>solr-parent</artifactId>
+    <version>@version@</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.solr</groupId>
+  <artifactId>solr-uima-an-calais</artifactId>
+  <name>Solr Specific UIMA Open Calais Annotator</name>
+  <version>@version@</version>
+  <description>Solr Specific UIMA Open Calais Annotator v2.3.1-SNAPSHOT</description>
+  <packaging>jar</packaging>
+</project>
Index: solr/contrib/uima/lib/solr-uima-core-pom.xml.template
===================================================================
--- solr/contrib/uima/lib/solr-uima-core-pom.xml.template	(revision 0)
+++ solr/contrib/uima/lib/solr-uima-core-pom.xml.template	(revision 0)
@@ -0,0 +1,36 @@
+<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/maven-v4_0_0.xsd">
+
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+  -->
+
+  <parent>
+    <groupId>org.apache.solr</groupId>
+    <artifactId>solr-parent</artifactId>
+    <version>@version@</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.solr</groupId>
+  <artifactId>solr-uima-core</artifactId>
+  <name>Solr Specific UIMA Core</name>
+  <version>@version@</version>
+  <description>Solr Specific UIMA Core v2.3.1-SNAPSHOT</description>
+  <packaging>jar</packaging>
+</project>
Index: solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template
===================================================================
--- solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template	(revision 0)
+++ solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template	(revision 0)
@@ -0,0 +1,36 @@
+<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/maven-v4_0_0.xsd">
+
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+  -->
+
+  <parent>
+    <groupId>org.apache.solr</groupId>
+    <artifactId>solr-parent</artifactId>
+    <version>@version@</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.solr</groupId>
+  <artifactId>solr-uima-an-tagger</artifactId>
+  <name>Solr Specific UIMA HMM Tagger</name>
+  <version>@version@</version>
+  <description>Solr Specific UIMA HMM Tagger v2.3.1-SNAPSHOT</description>
+  <packaging>jar</packaging>
+</project>
Index: solr/lib/apache-solr-noggit-pom.xml.template
===================================================================
--- solr/lib/apache-solr-noggit-pom.xml.template	(revision 1080323)
+++ solr/lib/apache-solr-noggit-pom.xml.template	(working copy)
@@ -31,6 +31,6 @@
   <artifactId>solr-noggit</artifactId>
   <name>Solr Specific Noggit</name>
   <version>@version@</version>
-  <description>Solr Specific Noggit</description>
+  <description>Solr Specific Noggit r944541</description>
   <packaging>jar</packaging>
 </project>
Index: solr/lib/solr-commons-csv-pom.xml.template
===================================================================
--- solr/lib/solr-commons-csv-pom.xml.template	(revision 1080323)
+++ solr/lib/solr-commons-csv-pom.xml.template	(working copy)
@@ -31,6 +31,6 @@
   <artifactId>solr-commons-csv</artifactId>
   <name>Solr Specific Commons CSV</name>
   <version>@version@</version>
-  <description>Solr Specific Commons CSV</description>
+  <description>Solr Specific Commons CSV v1.0-SNAPSHOT-r966014</description>
   <packaging>jar</packaging>
 </project>
Index: solr/build.xml
===================================================================
--- solr/build.xml	(revision 1080323)
+++ solr/build.xml	(working copy)
@@ -952,6 +952,11 @@
     <!-- Maven artifacts -->
     <sign-maven-dependency-artifacts artifact.id="solr-commons-csv" gpg.passphrase="${gpg.passphrase}"/>
     <sign-maven-dependency-artifacts artifact.id="solr-noggit" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-maven-dependency-artifacts artifact.id="solr-uima-an-alchemy" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-maven-dependency-artifacts artifact.id="solr-uima-an-calais" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-maven-dependency-artifacts artifact.id="solr-uima-an-tagger" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-maven-dependency-artifacts artifact.id="solr-uima-an-wst" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-maven-dependency-artifacts artifact.id="solr-uima-core" gpg.passphrase="${gpg.passphrase}"/>
     <sign-maven-war-artifacts artifact.id="solr" gpg.passphrase="${gpg.passphrase}"/>
     <sign-maven-artifacts artifact.id="solr-analysis-extras" gpg.passphrase="${gpg.passphrase}"/>
     <sign-maven-artifacts artifact.id="solr-cell" gpg.passphrase="${gpg.passphrase}"/>
@@ -987,15 +992,30 @@
 
       <m2-deploy pom.xml="pom.xml"/>
 
-      <!-- ========== SOLR SPECIFIC COMMONS CSV ========== -->
+      <!-- ========== SOLR SPECIFIC NON-MAVENIZED DEPENDENCIES ========== -->
       <m2-deploy-with-pom-template pom.xml="lib/solr-commons-csv-pom.xml.template"
                                    jar.file="lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
 
-      <!-- ========== SOLR ARTIFACTS ========== -->
-
       <m2-deploy-with-pom-template pom.xml="lib/apache-solr-noggit-pom.xml.template"
                                    jar.file="lib/apache-solr-noggit-r944541.jar" />
+      
+      <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template"
+                                   jar.file="contrib/uima/lib/uima-an-alchemy.jar" />
 
+      <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-calais-pom.xml.template"
+                                   jar.file="contrib/uima/lib/uima-an-calais.jar" />
+
+      <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-tagger-pom.xml.template"
+                                   jar.file="contrib/uima/lib/uima-an-tagger.jar" />
+
+      <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-wst-pom.xml.template"
+                                   jar.file="contrib/uima/lib/uima-an-wst.jar" />
+
+      <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-core-pom.xml.template"
+                                   jar.file="contrib/uima/lib/uima-core.jar" />
+      
+      <!-- ========== SOLR ARTIFACTS ========== -->
+
       <m2-deploy pom.xml="contrib/dataimporthandler/src/pom.xml"
                  jar.file="${dist}/apache-solr-dataimporthandler-${version}.jar">
         <artifact-attachments>
Index: modules/analysis/icu/lib/lucene-icu4j-pom.xml.template
===================================================================
--- modules/analysis/icu/lib/lucene-icu4j-pom.xml.template	(revision 0)
+++ modules/analysis/icu/lib/lucene-icu4j-pom.xml.template	(revision 0)
@@ -0,0 +1,36 @@
+<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/maven-v4_0_0.xsd">
+
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+  -->
+
+  <parent>
+    <groupId>org.apache.lucene</groupId>
+    <artifactId>lucene-parent</artifactId>
+    <version>@version@</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.lucene</groupId>
+  <artifactId>lucene-icu4j</artifactId>
+  <name>Lucene Specific ICU4J</name>
+  <version>@version@</version>
+  <description>Lucene Specific ICU4J v4.6</description>
+  <packaging>jar</packaging>
+</project>
Index: modules/analysis/icu/build.xml
===================================================================
--- modules/analysis/icu/build.xml	(revision 1080323)
+++ modules/analysis/icu/build.xml	(working copy)
@@ -132,4 +132,9 @@
       <classpath refid="classpath"/>
     </compile>
   </target>
+  
+  <target name="dist-maven" depends="contrib-build.dist-maven">
+    <m2-deploy-with-pom-template pom.xml="lib/lucene-icu4j-pom.xml.template"
+                                 jar.file="lib/icu4j-4_6.jar" />
+  </target>
 </project>
Index: modules/benchmark/lib/lucene-xercesImpl-pom.xml.template
===================================================================
--- modules/benchmark/lib/lucene-xercesImpl-pom.xml.template	(revision 0)
+++ modules/benchmark/lib/lucene-xercesImpl-pom.xml.template	(revision 0)
@@ -0,0 +1,36 @@
+<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/maven-v4_0_0.xsd">
+
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+  -->
+
+  <parent>
+    <groupId>org.apache.lucene</groupId>
+    <artifactId>lucene-parent</artifactId>
+    <version>@version@</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.lucene</groupId>
+  <artifactId>lucene-xercesImpl</artifactId>
+  <name>Lucene Specific xercesImpl</name>
+  <version>@version@</version>
+  <description>Lucene Specific xercesImpl v2.9.1 patched with XERCESJ-1257</description>
+  <packaging>jar</packaging>
+</project>
Index: modules/benchmark/build.xml
===================================================================
--- modules/benchmark/build.xml	(revision 1080323)
+++ modules/benchmark/build.xml	(working copy)
@@ -265,5 +265,8 @@
 		     />
     </target>
     
-    <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven"/>
+    <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven">
+      <m2-deploy-with-pom-template pom.xml="lib/lucene-xercesImpl-pom.xml.template"
+                                   jar.file="lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar" />
+    </target>
 </project>
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1080323)
+++ lucene/common-build.xml	(working copy)
@@ -27,6 +27,7 @@
 
   <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
   <property name="prettify.dir" value="${dev-tools.dir}/prettify"/>
+  <property name="maven.build.dir" value="${common.dir}/build/maven"/>
 
   <!-- Give user a chance to override without editing this file
       (and without typing -D each time it compiles it -->
@@ -336,7 +337,27 @@
         <pom refid="maven.project"/>
       </artifact:deploy>
     </sequential>
-  </macrodef>  	
+  </macrodef>
+  
+  <macrodef name="m2-deploy-with-pom-template" description="Builds a Maven artifact given a POM template">
+    <attribute name="pom.xml"/>
+    <attribute name="jar.file"/>
+    <sequential>
+      <copy file="@{pom.xml}" tofile="${maven.build.dir}/@{pom.xml}">
+        <filterset begintoken="@" endtoken="@">
+          <filter token="version" value="${version}"/>
+        </filterset>
+      </copy>
+      <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+      <artifact:pom id="maven.project" file="${maven.build.dir}/@{pom.xml}" />
+      <artifact:deploy file="@{jar.file}">
+        <remoteRepository url="${m2.repository.url}">
+          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+        </remoteRepository>
+        <pom refid="maven.project"/>
+      </artifact:deploy>
+    </sequential>
+  </macrodef>
 	
   <macrodef name="build-manifest" description="Builds a manifest file">
   	<attribute name="title" default="Lucene Search Engine: ${ant.project.name}" />
Index: dev-tools/maven/solr/contrib/extraction/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/extraction/pom.xml.template	(revision 1080323)
+++ dev-tools/maven/solr/contrib/extraction/pom.xml.template	(working copy)
@@ -70,8 +70,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.ibm.icu</groupId>
-      <artifactId>icu4j</artifactId>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-icu4j</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -83,8 +83,8 @@
       <artifactId>tika-parsers</artifactId>
     </dependency>
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-xercesImpl</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
Index: dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template	(revision 1080323)
+++ dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template	(working copy)
@@ -94,8 +94,8 @@
       <artifactId>slf4j-api</artifactId>
     </dependency> 
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-xercesImpl</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
Index: dev-tools/maven/solr/contrib/uima/pom.xml.template
===================================================================
--- dev-tools/maven/solr/contrib/uima/pom.xml.template	(revision 1080323)
+++ dev-tools/maven/solr/contrib/uima/pom.xml.template	(working copy)
@@ -76,23 +76,23 @@
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
-      <artifactId>uima-alchemy-annotator</artifactId>
+      <artifactId>solr-uima-alchemy-annotator</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
-      <artifactId>uima-OpenCalaisAnnotator</artifactId>
+      <artifactId>solr-uima-OpenCalaisAnnotator</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
-      <artifactId>uima-Tagger</artifactId>
+      <artifactId>solr-uima-Tagger</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
-      <artifactId>uima-WhitespaceTokenizer</artifactId>
+      <artifactId>solr-uima-WhitespaceTokenizer</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
-      <artifactId>uima-uimaj-core</artifactId>
+      <artifactId>solr-uima-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
Index: dev-tools/maven/solr/src/pom.xml.template
===================================================================
--- dev-tools/maven/solr/src/pom.xml.template	(revision 1080323)
+++ dev-tools/maven/solr/src/pom.xml.template	(working copy)
@@ -132,10 +132,12 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
+      <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-util</artifactId>
+      <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
Index: dev-tools/maven/solr/src/webapp/pom.xml.template
===================================================================
--- dev-tools/maven/solr/src/webapp/pom.xml.template	(revision 1080323)
+++ dev-tools/maven/solr/src/webapp/pom.xml.template	(working copy)
@@ -94,14 +94,6 @@
           <artifactId>struts-tiles</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty-util</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>oro</groupId>
           <artifactId>oro</artifactId>
         </exclusion>
Index: dev-tools/maven/pom.xml.template
===================================================================
--- dev-tools/maven/pom.xml.template	(revision 1080323)
+++ dev-tools/maven/pom.xml.template	(working copy)
@@ -45,7 +45,6 @@
     <patched.jetty.version>6.1.26-patched-JETTY-1340</patched.jetty.version>
     <slf4j.version>1.6.1</slf4j.version>
     <tika.version>0.8</tika.version>
-    <uima.version>${project.version}</uima.version>
   </properties>
   <issueManagement>
     <system>JIRA</system>
@@ -129,9 +128,9 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.ibm.icu</groupId>
-        <artifactId>icu4j</artifactId>
-        <version>4.6</version>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-icu4j</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.sleepycat</groupId>
@@ -260,28 +259,28 @@
       </dependency>
       <dependency>
         <groupId>org.apache.solr</groupId>
-        <artifactId>uima-alchemy-annotator</artifactId>
-        <version>${uima.version}</version>
+        <artifactId>solr-uima-alchemy-annotator</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.solr</groupId>
-        <artifactId>uima-OpenCalaisAnnotator</artifactId>
-        <version>${uima.version}</version>
+        <artifactId>solr-uima-OpenCalaisAnnotator</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.solr</groupId>
-        <artifactId>uima-Tagger</artifactId>
-        <version>${uima.version}</version>
+        <artifactId>solr-uima-Tagger</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.solr</groupId>
-        <artifactId>uima-WhitespaceTokenizer</artifactId>
-        <version>${uima.version}</version>
+        <artifactId>solr-uima-WhitespaceTokenizer</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.solr</groupId>
-        <artifactId>uima-uimaj-core</artifactId>
-        <version>${uima.version}</version>
+        <artifactId>solr-uima-core</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.velocity</groupId>
@@ -364,9 +363,9 @@
         <version>${slf4j.version}</version>
       </dependency>
       <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>2.9.1-patched-XERCESJ-1257</version>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-xercesImpl</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
@@ -621,9 +620,9 @@
                   <goal>install-file</goal>
                 </goals>
                 <configuration>
-                  <groupId>com.ibm.icu</groupId>
-                  <artifactId>icu4j</artifactId>
-                  <version>4.6</version>
+                  <groupId>org.apache.lucene</groupId>
+                  <artifactId>lucene-icu4j</artifactId>
+                  <version>${project.version}</version>
                   <packaging>jar</packaging>
                   <file>modules/analysis/icu/lib/icu4j-4_6.jar</file>
                 </configuration>
@@ -635,9 +634,9 @@
                   <goal>install-file</goal>
                 </goals>
                 <configuration>
-                  <groupId>xerces</groupId>
-                  <artifactId>xercesImpl</artifactId>
-                  <version>2.9.1-patched-XERCESJ-1257</version>
+                  <groupId>org.apache.lucene</groupId>
+                  <artifactId>lucene-xercesImpl</artifactId>
+                  <version>${project.version}</version>
                   <packaging>jar</packaging>
                   <file>modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar</file>
                 </configuration>  
@@ -706,8 +705,8 @@
                 </goals>
                 <configuration>
                   <groupId>org.apache.solr</groupId>
-                  <artifactId>uima-alchemy-annotator</artifactId>
-                  <version>${uima.version}</version>
+                  <artifactId>solr-uima-alchemy-annotator</artifactId>
+                  <version>${project.version}</version>
                   <packaging>jar</packaging>
                   <file>solr/contrib/uima/lib/uima-an-alchemy.jar</file>
                 </configuration>  
@@ -720,8 +719,8 @@
                 </goals>
                 <configuration>
                   <groupId>org.apache.solr</groupId>
-                  <artifactId>uima-OpenCalaisAnnotator</artifactId>
-                  <version>${uima.version}</version>
+                  <artifactId>solr-uima-OpenCalaisAnnotator</artifactId>
+                  <version>${project.version}</version>
                   <packaging>jar</packaging>
                   <file>solr/contrib/uima/lib/uima-an-calais.jar</file>
                 </configuration>  
@@ -734,8 +733,8 @@
                 </goals>
                 <configuration>
                   <groupId>org.apache.solr</groupId>
-                  <artifactId>uima-Tagger</artifactId>
-                  <version>${uima.version}</version>
+                  <artifactId>solr-uima-Tagger</artifactId>
+                  <version>${project.version}</version>
                   <packaging>jar</packaging>
                   <file>solr/contrib/uima/lib/uima-an-tagger.jar</file>
                 </configuration>  
@@ -748,22 +747,22 @@
                 </goals>
                 <configuration>
                   <groupId>org.apache.solr</groupId>
-                  <artifactId>uima-WhitespaceTokenizer</artifactId>
-                  <version>${uima.version}</version>
+                  <artifactId>solr-uima-WhitespaceTokenizer</artifactId>
+                  <version>${project.version}</version>
                   <packaging>jar</packaging>
                   <file>solr/contrib/uima/lib/uima-an-wst.jar</file>
                 </configuration>  
               </execution>
               <execution>
-                <id>install-solr-uima-uimaj-core</id>
+                <id>install-solr-uima-core</id>
                 <phase>install</phase>
                 <goals>
                   <goal>install-file</goal>
                 </goals>
                 <configuration>
                   <groupId>org.apache.solr</groupId>
-                  <artifactId>uima-uimaj-core</artifactId>
-                  <version>${uima.version}</version>
+                  <artifactId>solr-uima-core</artifactId>
+                  <version>${project.version}</version>
                   <packaging>jar</packaging>
                   <file>solr/contrib/uima/lib/uima-core.jar</file>
                 </configuration>  
Index: dev-tools/maven/modules/analysis/icu/pom.xml.template
===================================================================
--- dev-tools/maven/modules/analysis/icu/pom.xml.template	(revision 1080323)
+++ dev-tools/maven/modules/analysis/icu/pom.xml.template	(working copy)
@@ -71,8 +71,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.ibm.icu</groupId>
-      <artifactId>icu4j</artifactId>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-icu4j</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
Index: dev-tools/maven/modules/benchmark/pom.xml.template
===================================================================
--- dev-tools/maven/modules/benchmark/pom.xml.template	(revision 1080323)
+++ dev-tools/maven/modules/benchmark/pom.xml.template	(working copy)
@@ -84,8 +84,8 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-xercesImpl</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>