Author: cedricwalter
Date: Tue Apr 8 21:27:10 2014
New Revision: 1585837
URL: http://svn.apache.org/r1585837
Log:
cleaned up module name, use classifier (tests) for exporting test classes and
resources to any module, remove empty directories
Added:
poi/branches/maven/poi-scratchpad/models/
- copied from r1584910, poi/branches/maven/src/scratchpad/models/
poi/branches/maven/poi-scratchpad/src/test/resources/
Removed:
poi/branches/maven/src/scratchpad/
poi/branches/maven/test-data/
Modified:
poi/branches/maven/etc/assembly/bundle.xml
poi/branches/maven/ooxml-schemas/pom.xml
poi/branches/maven/poi-examples/pom.xml
poi/branches/maven/poi-ooxml-schemas/pom.xml
poi/branches/maven/poi-ooxml/pom.xml
poi/branches/maven/poi-scratchpad/pom.xml
poi/branches/maven/pom.xml
Modified: poi/branches/maven/etc/assembly/bundle.xml
URL:
http://svn.apache.org/viewvc/poi/branches/maven/etc/assembly/bundle.xml?rev=1585837&r1=1585836&r2=1585837&view=diff
==============================================================================
--- poi/branches/maven/etc/assembly/bundle.xml (original)
+++ poi/branches/maven/etc/assembly/bundle.xml Tue Apr 8 21:27:10 2014
@@ -2,25 +2,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
- <id>dist</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <!--<id>dist</id>-->
+ <!--<formats>-->
+ <!--<format>zip</format>-->
+ <!--</formats>-->
+ <!--<includeBaseDirectory>false</includeBaseDirectory>-->
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.apache.poi:poi-examples:jar</include>
- <include>org.apache.poi:poi-excelant:jar</include>
- <include>org.apache.poi:poi-main:jar</include>
- <include>org.apache.poi:poi-ooxml:jar</include>
- <include>org.apache.poi:poi-ooxml-schemas:jar</include>
- <include>org.apache.poi:poi-scratchpad:jar</include>
- </includes>
- <unpack>false</unpack>
- <outputDirectory>dist</outputDirectory>
- </dependencySet>
- </dependencySets>
+ <!--<dependencySets>-->
+ <!--<dependencySet>-->
+ <!--<includes>-->
+ <!--<include>org.apache.poi:poi-examples:jar</include>-->
+ <!--<include>org.apache.poi:poi-excelant:jar</include>-->
+ <!--<include>org.apache.poi:poi-main:jar</include>-->
+ <!--<include>org.apache.poi:poi-ooxml:jar</include>-->
+ <!--<include>org.apache.poi:poi-ooxml-schemas:jar</include>-->
+ <!--<include>org.apache.poi:poi-scratchpad:jar</include>-->
+ <!--</includes>-->
+ <!--<unpack>false</unpack>-->
+ <!--<outputDirectory>dist</outputDirectory>-->
+ <!--</dependencySet>-->
+ <!--</dependencySets>-->
</assembly>
\ No newline at end of file
Modified: poi/branches/maven/ooxml-schemas/pom.xml
URL:
http://svn.apache.org/viewvc/poi/branches/maven/ooxml-schemas/pom.xml?rev=1585837&r1=1585836&r2=1585837&view=diff
==============================================================================
--- poi/branches/maven/ooxml-schemas/pom.xml (original)
+++ poi/branches/maven/ooxml-schemas/pom.xml Tue Apr 8 21:27:10 2014
@@ -30,7 +30,7 @@
<artifactId>ooxml-schemas</artifactId>
<packaging>jar</packaging>
- <name>Apache POI - Openxmlformats Schema package</name>
+ <name>Apache POI - ooxml schema package</name>
<description>XmlBeans generated from the Ecma supplied xsds:
http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%20Part%204%20(DOCX).zip</description>
<url>http://poi.apache.org/</url>
@@ -99,13 +99,15 @@
<configuration>
<schemaDirectory>target/schemas</schemaDirectory>
<javaSource>1.5</javaSource>
- <optimize>yes</optimize>
+ <!--<optimize>yes</optimize>-->
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
+
+ <!-- TODO to check not required to build
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-main</artifactId>
@@ -115,7 +117,7 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.xmlbeans</groupId>
Modified: poi/branches/maven/poi-examples/pom.xml
URL:
http://svn.apache.org/viewvc/poi/branches/maven/poi-examples/pom.xml?rev=1585837&r1=1585836&r2=1585837&view=diff
==============================================================================
--- poi/branches/maven/poi-examples/pom.xml (original)
+++ poi/branches/maven/poi-examples/pom.xml Tue Apr 8 21:27:10 2014
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>poi-examples</artifactId>
- <name>Apache POI Examples package</name>
+ <name>Apache POI - examples package</name>
<url>http://poi.apache.org/</url>
<description>Apache POI Examples</description>
Modified: poi/branches/maven/poi-ooxml-schemas/pom.xml
URL:
http://svn.apache.org/viewvc/poi/branches/maven/poi-ooxml-schemas/pom.xml?rev=1585837&r1=1585836&r2=1585837&view=diff
==============================================================================
--- poi/branches/maven/poi-ooxml-schemas/pom.xml (original)
+++ poi/branches/maven/poi-ooxml-schemas/pom.xml Tue Apr 8 21:27:10 2014
@@ -30,7 +30,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<artifactId>poi-ooxml-schemas</artifactId>
- <name>Apache POI</name>
+ <name>Apache POI - ooxml schemas</name>
<url>http://poi.apache.org/</url>
<description>Apache POI - Java API To Access Microsoft Format
Files</description>
<packaging>jar</packaging>
Modified: poi/branches/maven/poi-ooxml/pom.xml
URL:
http://svn.apache.org/viewvc/poi/branches/maven/poi-ooxml/pom.xml?rev=1585837&r1=1585836&r2=1585837&view=diff
==============================================================================
--- poi/branches/maven/poi-ooxml/pom.xml (original)
+++ poi/branches/maven/poi-ooxml/pom.xml Tue Apr 8 21:27:10 2014
@@ -28,8 +28,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>poi-ooxml</artifactId>
- <name>Apache POI OOXML package</name>
- <description>Apache POI - Java API To Access Microsoft Format
Files</description>
+ <name>Apache POI - ooxml package</name>
+ <description>Apache POI - java api to access microsoft format
files</description>
<url>http://poi.apache.org/</url>
<dependencies>
@@ -52,7 +52,7 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-main</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
Modified: poi/branches/maven/poi-scratchpad/pom.xml
URL:
http://svn.apache.org/viewvc/poi/branches/maven/poi-scratchpad/pom.xml?rev=1585837&r1=1585836&r2=1585837&view=diff
==============================================================================
--- poi/branches/maven/poi-scratchpad/pom.xml (original)
+++ poi/branches/maven/poi-scratchpad/pom.xml Tue Apr 8 21:27:10 2014
@@ -29,20 +29,20 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<artifactId>poi-scratchpad</artifactId>
- <name>Apache POI Scratchpad package</name>
+ <name>Apache POI - scratchpad package</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.poi</groupId>
<artifactId>poi-main</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.poi</groupId>
<artifactId>poi-main</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
Modified: poi/branches/maven/pom.xml
URL:
http://svn.apache.org/viewvc/poi/branches/maven/pom.xml?rev=1585837&r1=1585836&r2=1585837&view=diff
==============================================================================
--- poi/branches/maven/pom.xml (original)
+++ poi/branches/maven/pom.xml Tue Apr 8 21:27:10 2014
@@ -27,9 +27,9 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <name>Apache POI - the Java API for Microsoft Documents</name>
+ <name>Apache POI</name>
- <description>Maven build of Apache POI for Sonar checks</description>
+ <description>Apache POI - the java api for microsoft
documents</description>
<url>http://poi.apache.org/</url>
<properties>
@@ -215,6 +215,20 @@
<threadCount>10</threadCount-->
</configuration>
</plugin>
+
+ <!-- provide the test-jar for other modules -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
