From e9fba3a9f6a4c3b55a36d390de537742e25aa4e2 Mon Sep 17 00:00:00 2001
From: Yegor Kozlov <yegor@apache.org>
Date: Thu, 20 Nov 2008 15:08:42 +0000
Subject: [PATCH] improved tasks for making Maven artifacts1. maven-dist is now
 obsolete, maven artifacts are taken from dist2. release manager should use
 'mvn deploy:deploy-file' to deploy POI artifacts, dist/mvn-deploy.sh is
 automatically generated by the maven-poms task3. each poi module now has its
 own pom template in the ./maven directory

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@719249 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                | 179 +++++++++++----------------------------
 maven/mvn-deploy.sh      |  46 ++++++++++
 maven/poi-contrib.pom    |  81 ++++++++++++++++++
 maven/poi-ooxml.pom      |  19 +++--
 maven/poi-scratchpad.pom |  80 +++++++++++++++++
 maven/poi.pom            |  76 +++++++++++++++++
 poi-redirect.pom         |  36 --------
 poi.pom                  |  91 --------------------
 8 files changed, 341 insertions(+), 267 deletions(-)
 create mode 100755 maven/mvn-deploy.sh
 create mode 100755 maven/poi-contrib.pom
 create mode 100755 maven/poi-scratchpad.pom
 create mode 100755 maven/poi.pom
 delete mode 100644 poi-redirect.pom
 delete mode 100644 poi.pom

diff --git a/build.xml b/build.xml
index 255c86132d..bb3ccbc874 100644
--- a/build.xml
+++ b/build.xml
@@ -45,8 +45,7 @@ under the License.
     To build the documentation you will need to install forrest and set
     the FORREST_HOME environment variable.  Forrest 0.5.1 required.
 
-    You will need JDK 1.5 or newer to build much of POI. If all you want
-    is the core OLE2 support, then you only need JDK 1.4
+    Since POI 3.5 you will need JDK 1.5 or newer to build POI. 
 
     Some people may find the tests hang when run through Ant. If this
     happens to you, try giving Ant some more memory when you run it, eg:
@@ -125,7 +124,7 @@ under the License.
 
   <!-- The following jars are downloaded by the fetch-ooxml-jars task --> 
   <property name="ooxml.openxml4j.jar" location="${ooxml.lib}/openxml4j-1.0-beta.jar"/>
-  <property name="ooxml.openxml4j.url" value="http://people.apache.org/~nick/openxml4j-bin-beta-080728.jar"/>
+  <property name="ooxml.openxml4j.url" value="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/poi/openxml4j/1.0-beta/openxml4j-1.0-beta.jar"/>
   <property name="ooxml.dom4j.jar" location="${ooxml.lib}/dom4j-1.6.1.jar"/>
   <property name="ooxml.dom4j.url" value="${repository}/dom4j/jars/dom4j-1.6.1.jar"/>
   <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
@@ -155,10 +154,9 @@ under the License.
   <property name="apidocs.report.dir" location="${build.site}/apidocs"/>
   <property name="changelog.file" location="${build.site}/changelog.html"/>
   <property name="dist.dir" location="build/dist"/>
-  <property name="mavendist.dir" location="build/maven-dist"/>
-  <property name="mavendist.poi.dir" location="build/maven-dist/poi"/>
-  <property name="mavendist.oap.dir" location="build/maven-dist/org.apache.poi"/>
   <property name="mavendist.ooxml.dir" location="build/maven-ooxml-dependencies"/>
+  <property name="apache.repository" value="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"/>
+  <property name="snapshots.repository" value="scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository/"/>
   <property name="jar.name" value="poi"/>
   <property name="version.id" value="3.5-beta4"/>
   <property name="halt.on.test.failure" value="true"/>
@@ -299,13 +297,6 @@ under the License.
         <mkdir dir="${dist.dir}"/>
         <mkdir dir="${build.site.src}/${main.documentation}"/>
 
-        <mkdir dir="${mavendist.dir}"/>
-        <mkdir dir="${mavendist.poi.dir}"/>
-        <mkdir dir="${mavendist.poi.dir}/poms"/>
-        <mkdir dir="${mavendist.oap.dir}"/>
-        <mkdir dir="${mavendist.oap.dir}/jars"/>
-        <mkdir dir="${mavendist.oap.dir}/poms"/>
-
         <copy todir="${build.site.src}/${main.documentation}">
             <fileset dir="${main.documentation}"/>
         </copy>
@@ -1091,124 +1082,47 @@ FORREST_HOME environment variable!</echo>
       description="Generates POI's website's contents"/>
 
 
-    <target name="maven-dist" depends="jar" description="Builds the POM files for a maven distribution, and copies these and the jars to the appropriate locations">
-		<!-- Copy the jar files into the maven jar directory -->
-		<!-- Same jars as for the main release, only lacking the datestamp -->
-		<copy
-			file="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"
-			tofile="${mavendist.oap.dir}/jars/${jar.name}-${version.id}.jar" />
-		<copy
-			file="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar"
-			tofile="${mavendist.oap.dir}/jars/${jar.name}-contrib-${version.id}.jar" />
-		<copy
-			file="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"
-			tofile="${mavendist.oap.dir}/jars/${jar.name}-scratchpad-${version.id}.jar" />
-		<copy
-			file="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.jar"
-			tofile="${mavendist.oap.dir}/jars/${jar.name}-ooxml-${version.id}.jar" />
-
-		<!-- TODO: Decide about source jars, and copy them if we have some -->
-
-		<!-- Build the org.apache.poi poms -->
-		<!-- Copy from the base file, substituting in the version and -->
-		<!--  artificat, plus doing the core poi dependency as needed -->
-
-		<!-- Build the main pom -->
-		<copy 
-			file="poi.pom" 
-			tofile="${mavendist.oap.dir}/poms/${jar.name}-${version.id}.pom" 
-		>
-			<filterchain>
-				<replacetokens>
-					<token key="VERSION" value="${version.id}" />
-					<token key="ARTIFICAT" value="poi" />
-				</replacetokens>
-				<tokenfilter>
-					<filetokenizer/>
-					<replaceregex pattern="START_NON_MAIN.*END_NON_MAIN_DEPENDENCY" replace="No POI dependency on the main jar" flags="s" />
-				</tokenfilter>
-			</filterchain>
-		</copy>
-		<!-- And the contrib pom -->
-		<copy 
-			file="poi.pom" 
-			tofile="${mavendist.oap.dir}/poms/${jar.name}-contrib-${version.id}.pom" 
-		>
-			<filterchain>
-				<replacetokens>
-					<token key="VERSION" value="${version.id}" />
-					<token key="ARTIFICAT" value="poi-contrib" />
-				</replacetokens>
-				<tokenfilter>
-					<replaceregex pattern="..-- START_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
-					<replaceregex pattern="..-- END_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
-				</tokenfilter>
-			</filterchain>
-		</copy>
-		<!-- And the scratchpad pom -->
-		<copy 
-			file="poi.pom" 
-			tofile="${mavendist.oap.dir}/poms/${jar.name}-scratchpad-${version.id}.pom" 
-		>
-			<filterchain>
-				<replacetokens>
-					<token key="VERSION" value="${version.id}" />
-					<token key="ARTIFICAT" value="poi-scratchpad" />
-				</replacetokens>
-				<tokenfilter>
-					<replaceregex pattern="..-- START_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
-					<replaceregex pattern="..-- END_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
-				</tokenfilter>
-			</filterchain>
-		</copy>
-		<!-- And the ooxml pom -->
-		<copy 
-      file="maven/poi-ooxml.pom" 
-			tofile="${mavendist.oap.dir}/poms/${jar.name}-ooxml-${version.id}.pom" 
-		>
-			<filterchain>
-				<replacetokens>
-					<token key="VERSION" value="${version.id}" />
-					<token key="ARTIFICAT" value="poi-ooxml" />
-				</replacetokens>
-				<tokenfilter>
-					<replaceregex pattern="..-- START_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
-					<replaceregex pattern="..-- END_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
-				</tokenfilter>
-			</filterchain>
-		</copy>
-
-		<!-- Build the poi => org.apache.poi redirect poms -->
-		<!-- Copy from the base file, substituting in the version+artifact -->
-		<copy 
-			file="poi-redirect.pom" 
-			tofile="${mavendist.poi.dir}/poms/${jar.name}-${version.id}.pom" 
-		>
-			<filterchain><replacetokens>
-				<token key="VERSION" value="${version.id}" />
-				<token key="ARTIFICAT" value="poi" />
-			</replacetokens></filterchain>
-		</copy>
-		<copy 
-			file="poi-redirect.pom" 
-			tofile="${mavendist.poi.dir}/poms/${jar.name}-contrib-${version.id}.pom" 
-		>
-			<filterchain><replacetokens>
-				<token key="VERSION" value="${version.id}" />
-				<token key="ARTIFICAT" value="poi-contrib" />
-			</replacetokens></filterchain>
-		</copy>
-		<copy 
-			file="poi-redirect.pom" 
-			tofile="${mavendist.poi.dir}/poms/${jar.name}-scratchpad-${version.id}.pom" 
-		>
-			<filterchain><replacetokens>
-				<token key="VERSION" value="${version.id}" />
-				<token key="ARTIFICAT" value="poi-scratchpad" />
-			</replacetokens></filterchain>
-		</copy>
-
-		<!-- And that's it for maven -->
+    <target name="maven-poms" depends="jar" description="Builds the POM files for a maven distribution, and copies these and the jars to the appropriate locations">
+      <!-- TODO: Decide about source jars, and copy them if we have some -->
+
+      <!-- Build the org.apache.poi poms -->
+      <copy file="maven/poi.pom" tofile="${dist.dir}/poi-${version.id}.pom">
+        <filterchain>
+          <replacetokens>
+            <token key="VERSION" value="${version.id}" />
+          </replacetokens>
+        </filterchain>
+      </copy>
+      <copy file="maven/poi-contrib.pom" tofile="${dist.dir}/poi-contrib-${version.id}.pom">
+        <filterchain>
+          <replacetokens>
+            <token key="VERSION" value="${version.id}" />
+          </replacetokens>
+        </filterchain>
+      </copy>
+      <copy file="maven/poi-scratchpad.pom" tofile="${dist.dir}/poi-scratchpad-${version.id}.pom">
+        <filterchain>
+          <replacetokens>
+            <token key="VERSION" value="${version.id}" />
+          </replacetokens>
+        </filterchain>
+      </copy>
+      <copy file="maven/poi-ooxml.pom" tofile="${dist.dir}/poi-ooxml-${version.id}.pom">
+        <filterchain>
+          <replacetokens>
+            <token key="VERSION" value="${version.id}" />
+          </replacetokens>
+        </filterchain>
+      </copy>
+      <copy file="maven/mvn-deploy.sh" todir="${dist.dir}">
+        <filterchain>
+          <replacetokens>
+            <token key="REPOSITORY" value="${apache.repository}" />
+            <token key="VERSION" value="${version.id}" />
+            <token key="DSTAMP" value="${DSTAMP}" />
+          </replacetokens>
+        </filterchain>
+      </copy>
 	</target>
 
   <target name="maven-ooxml-dependencies" description="Builds the POM files for OpenXml4J and compiled XmlBeans generated from the Ecma supplied xsds">
@@ -1353,6 +1267,9 @@ FORREST_HOME environment variable!</echo>
       </tarfileset>
     </tar>
 
+    <echo>Creating Maven POMs</echo>
+    <antcall target="maven-poms"/>
+
     <echo>Distribution located in build/dist</echo>
   </target>
 
diff --git a/maven/mvn-deploy.sh b/maven/mvn-deploy.sh
new file mode 100755
index 0000000000..5879db9512
--- /dev/null
+++ b/maven/mvn-deploy.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+#
+#   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.
+#
+# Shell script to deploy POI artifacts in a maven repository.
+#
+#  Note, You should configure your settings.xml and add a server with id=apache-releases:
+#
+#    <server>
+#      <id>apache-releases</id>
+#      <username>apacheId</username>
+#      <privateKey>/path/to/private/key</privateKey>
+#    </server>
+#
+#  Usage:
+#   1. ant dist
+#   2. cd dist
+#   3. ./mvn-deploy.sh 
+# @author Yegor Kozlov
+
+mvn deploy:deploy-file -DrepositoryId=apache-releases \
+  -Durl=@REPOSITORY@ \
+  -Dfile=poi-@VERSION@-@DSTAMP@.jar -DpomFile=poi-@VERSION@.pom
+mvn deploy:deploy-file -DrepositoryId=apache-releases \
+  -Durl=@REPOSITORY@ \
+  -Dfile=poi-scratchpad-@VERSION@-@DSTAMP@.jar -DpomFile=poi-scratchpad-@VERSION@.pom
+mvn deploy:deploy-file -DrepositoryId=apache-releases \
+  -Durl=@REPOSITORY@ \
+  -Dfile=poi-contrib-@VERSION@-@DSTAMP@.jar -DpomFile=poi-contrib-@VERSION@.pom
+mvn deploy:deploy-file -DrepositoryId=apache-releases \
+  -Durl=@REPOSITORY@ \
+  -Dfile=poi-ooxml-@VERSION@-@DSTAMP@.jar -DpomFile=poi-ooxml-@VERSION@.pom
+
diff --git a/maven/poi-contrib.pom b/maven/poi-contrib.pom
new file mode 100755
index 0000000000..43984a24b6
--- /dev/null
+++ b/maven/poi-contrib.pom
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+
+   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.
+
+-->
+
+<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">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.poi</groupId>
+	<artifactId>poi-contrib</artifactId>
+	<version>@VERSION@</version>
+	<packaging>jar</packaging>
+	<name>Apache POI</name>
+	<url>http://poi.apache.org/</url>
+	<description>Apache POI - Java API To Access Microsoft Format Files</description>
+
+  <mailingLists>
+    <mailingList>
+      <name>POI Users List</name>
+      <subscribe>user-subscribe@poi.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
+    </mailingList>
+    <mailingList>
+      <name>POI Developer List</name>
+      <subscribe>dev-subscribe@poi.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+
+  <dependencies>
+    <dependency>
+       <groupId>org.apache.poi</groupId>
+       <artifactId>poi</artifactId>
+       <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.13</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index 8c78e2e443..b3e1c04120 100755
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -1,4 +1,4 @@
-:tab<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
 
    Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,7 +24,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.poi</groupId>
-	<artifactId>@ARTIFICAT@</artifactId>
+	<artifactId>poi-ooxml</artifactId>
 	<version>@VERSION@</version>
 	<packaging>jar</packaging>
 	<name>Apache POI</name>
@@ -50,7 +50,6 @@
     <license>
       <name>The Apache Software License, Version 2.0</name>
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
     </license>
   </licenses>
 
@@ -61,14 +60,16 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.xmlbeans</groupId>
-      <artifactId>xmlbeans</artifactId>
-      <version>2.3.0</version>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi</artifactId>
-      <version>@VERSION@</version>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.13</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
diff --git a/maven/poi-scratchpad.pom b/maven/poi-scratchpad.pom
new file mode 100755
index 0000000000..b2639d1f25
--- /dev/null
+++ b/maven/poi-scratchpad.pom
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+
+   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.
+
+-->
+
+<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">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.poi</groupId>
+	<artifactId>poi-scratchpad</artifactId>
+	<version>@VERSION@</version>
+	<packaging>jar</packaging>
+	<name>Apache POI</name>
+	<url>http://poi.apache.org/</url>
+	<description>Apache POI - Java API To Access Microsoft Format Files</description>
+
+  <mailingLists>
+    <mailingList>
+      <name>POI Users List</name>
+      <subscribe>user-subscribe@poi.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
+    </mailingList>
+    <mailingList>
+      <name>POI Developer List</name>
+      <subscribe>dev-subscribe@poi.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+
+  <dependencies>
+    <dependency>
+       <groupId>org.apache.poi</groupId>
+       <artifactId>poi</artifactId>
+       <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.13</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/maven/poi.pom b/maven/poi.pom
new file mode 100755
index 0000000000..6db0aa4ea3
--- /dev/null
+++ b/maven/poi.pom
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+
+   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.
+
+-->
+
+<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">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.poi</groupId>
+	<artifactId>poi</artifactId>
+	<version>@VERSION@</version>
+	<packaging>jar</packaging>
+	<name>Apache POI</name>
+	<url>http://poi.apache.org/</url>
+	<description>Apache POI - Java API To Access Microsoft Format Files</description>
+
+  <mailingLists>
+    <mailingList>
+      <name>POI Users List</name>
+      <subscribe>user-subscribe@poi.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
+    </mailingList>
+    <mailingList>
+      <name>POI Developer List</name>
+      <subscribe>dev-subscribe@poi.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.13</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/poi-redirect.pom b/poi-redirect.pom
deleted file mode 100644
index fa4a63e012..0000000000
--- a/poi-redirect.pom
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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.
--->
-
-<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">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>poi</groupId>
-	<artifactId>@ARTIFICAT@</artifactId>
-	<version>@VERSION@</version>
-
-    <distributionManagement>
-        <relocation>
-            <groupId>org.apache.poi</groupId>
-        </relocation>
-    </distributionManagement>
-</project>
diff --git a/poi.pom b/poi.pom
deleted file mode 100644
index ed6923b628..0000000000
--- a/poi.pom
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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.
--->
-
-<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">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.poi</groupId>
-	<artifactId>@ARTIFICAT@</artifactId>
-	<version>@VERSION@</version>
-	<packaging>jar</packaging>
-	<name>Apache POI</name>
-	<url>http://poi.apache.org/</url>
-	<description>Apache POI - Java API To Access Microsoft Format Files</description>
-
-    <dependencies>
-        <!-- START_NON_MAIN_DEPENDENCY -->
-        <dependency>
-           <groupId>org.apache.poi</groupId>
-           <artifactId>poi</artifactId>
-           <version>@VERSION@</version>
-        </dependency>
-        <!-- END_NON_MAIN_DEPENDENCY -->
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-            <!-- need exclusion until commons-logging pom is fixed after 1.1 -->
-            <exclusions>
-                <exclusion>
-                    <groupId>logkit</groupId>
-                    <artifactId>logkit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.13</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<url>http://svn.apache.org/viewvc/poi/trunk</url>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/poi/trunk</connection>
-	</scm>
-	<issueManagement>
-		<system>bugzilla</system>
-		<url>http://issues.apache.org/bugzilla/buglist.cgi?product=POI</url>
-	</issueManagement>
-	<organization>
-		<name>Apache Software Foundation</name>
-		<url>http://www.apache.org/</url>
-	</organization>
-</project>
-- 
2.39.5