From ab160b0ca4cdfa7d0da05ff793dcee300ffb3ce0 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Thu, 31 May 2007 18:09:57 +0000
Subject: [PATCH] Update the main .pom file based on advice from the repos
 team. Include the redirect pom, which needs to be placed under /poi/, to tell
 maven to switch to /org.apache.poi/, and detail this new pom in the release
 guide

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@543203 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                               | 10 +++-
 poi-redirect.pom                        | 36 ++++++++++++++
 poi.pom                                 | 62 ++++++++++++++++++++++---
 src/documentation/Release-Checklist.txt |  4 ++
 4 files changed, 105 insertions(+), 7 deletions(-)
 create mode 100644 poi-redirect.pom

diff --git a/build.xml b/build.xml
index 6a879f614..097ea0756 100644
--- a/build.xml
+++ b/build.xml
@@ -846,7 +846,7 @@ FORREST_HOME environment variable!</echo>
 			<fileset dir="legal/" />
         </jar>
 
-		<!-- Build the pom -->
+		<!-- Build the main pom -->
 		<!-- Copy from the base file, and substitute in the version -->
 		<filter token="VERSION" value="${version.id}" />
 		<copy 
@@ -854,6 +854,14 @@ FORREST_HOME environment variable!</echo>
 			file="poi.pom" 
 			tofile="${mavendist.dir}/${jar.name}-${version.id}.pom" 
 		/>
+		<!-- Build the poi => org.apache.poi redirect pom -->
+		<!-- Copy from the base file, and substitute in the version -->
+		<filter token="VERSION" value="${version.id}" />
+		<copy 
+			filtering="true" 
+			file="poi-redirect.pom" 
+			tofile="${mavendist.dir}/${jar.name}-${version.id}-redirect.pom" 
+		/>
 	</target>
 
     <target name="jar" depends="compile" description="Creates jar files for distribution">
diff --git a/poi-redirect.pom b/poi-redirect.pom
new file mode 100644
index 000000000..eb2e71a08
--- /dev/null
+++ b/poi-redirect.pom
@@ -0,0 +1,36 @@
+<?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>poi</artifactId>
+	<version>@VERSION@</version>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>org.apache.poi</groupId>
+        </relocation>
+    </distributionManagement>
+</project>
diff --git a/poi.pom b/poi.pom
index 0b741df97..6dc77b273 100644
--- a/poi.pom
+++ b/poi.pom
@@ -1,14 +1,65 @@
-<project> 
+<?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>poi</artifactId>
 	<version>@VERSION@</version>
 	<packaging>jar</packaging>
-	<name>Jakarta POI</name>
-	<url>http://jakarta.apache.org/poi/</url>
-	<description>Jakarta POI - Java API To Access Microsoft Format Files</description>
+	<name>Apache POI</name>
+	<url>http://poi.apache.org/</url>
+	<description>Apache POI - Java API To Access Microsoft Format Files</description>
 
-	<dependencies></dependencies>
+    <dependencies>
+        <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>
@@ -28,6 +79,5 @@
 	<organization>
 		<name>Apache Software Foundation</name>
 		<url>http://www.apache.org/</url>
-		<logo>http://jakarta.apache.org/images/original-jakarta-logo.gif</logo>
 	</organization>
 </project>
diff --git a/src/documentation/Release-Checklist.txt b/src/documentation/Release-Checklist.txt
index d3348aae5..6109fb800 100644
--- a/src/documentation/Release-Checklist.txt
+++ b/src/documentation/Release-Checklist.txt
@@ -6,6 +6,8 @@ Release Checklist
 - build distributions as if it was the final release
 - update any filename dates from today's date, to the date that the
    vote will end (typically 7 days time)
+- copy the -redirect pom to a subdirectory of redirect/, and remove
+   -redirect from its name
 - sign and checksum distributions as per
     http://www.apache.org/dev/mirror-step-by-step.html
 - upload to your area of people.apache.org under /<version>-RC-<x>/
@@ -21,6 +23,8 @@ Release Checklist
 - move distributions from your area of people.apache.org to the 
    distribution directories on www.apache.org/dist/poi/ and
    people.apache.org/repo/m1-ibiblio-rsync-repository/org.apache.poi/
+- move the redirection pom from your area of people.apache.org to
+   people.apache.org/repo/m1-ibiblio-rsync-repository/poi/poms/
 - copy the new distributions to archive.apache.org
 - remove the old distributions from www.apache.org/dist/
 - wait for the distributions to appear on your favourite mirror