import OpenXML4j codebase

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@738842 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 8 insertions, 85 deletions

diff --git a/maven/openxml4j.pom b/maven/openxml4j.pom
deleted file mode 100755
index 5379a73246..0000000000
--- a/maven/openxml4j.pom
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.openxml4j</groupId>
-  <artifactId>openxml4j</artifactId>
-  <version>@VERSION@</version>
-  <packaging>jar</packaging>
-  <name>OpenXML4J</name>
-  <url>http://openxml4j.org/</url>
-  <description>Office Open XML File Format library for Java</description>
-
-  <mailingLists>
-    <mailingList>
-      <name>OpenXML4J Users List</name>
-      <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=openxml4j-users</archive>
-    </mailingList>
-    <mailingList>
-      <name>OpenXML4J Developer List</name>
-      <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=openxml4j-devs</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>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>OpenXML4J</name>
-    <url>http://www.openxml4j.org/</url>
-  </organization>
-
-  <dependencies>
-    <dependency>
-        <groupId>dom4j</groupId>
-        <artifactId>dom4j</artifactId>
-        <version>1.6.1</version>
-    </dependency>
-    <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.8</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index b3e1c04120..52c1583df1 100755
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -60,26 +60,19 @@
 
   <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>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>openxml4j</artifactId>
-      <version>1.0-beta</version>
+       <groupId>org.apache.poi</groupId>
+       <artifactId>poi</artifactId>
+       <version>@VERSION@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>ooxml-schemas</artifactId>
       <version>1.0</version>
     </dependency>
+    <dependency>
+        <groupId>dom4j</groupId>
+        <artifactId>dom4j</artifactId>
+        <version>1.6.1</version>
+    </dependency>
   </dependencies>
 </project>