Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust for the new source-directories in some more places 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1888536 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2021-04-08 20:10:53 +00:00
parent 329ae952d2
commit 30d8d17735
10 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.rst
View File

@ -70,17 +70,17 @@ Contributing
* Write a unit test: * Write a unit test:
* Binary formats and Common APIs: src/testcases/org/apache/poi/ * Binary formats and Common APIs: poi/src/test/java/org/apache/poi/
* OOXML APIs only: src/ooxml/testcases/org/apache/poi/ * OOXML APIs only: poi-ooxml/src/test/java/org/apache/poi/
* Scratchpad (Binary formats): src/scratchpad/testcases/org/apache/poi/ * Scratchpad (Binary formats): poi-scratchpad/src/test/java/org/apache/poi/
* Test files: test-data/ * Test files: test-data/
* Navigate the source, make changes, and run unit tests to verify * Navigate the source, make changes, and run unit tests to verify
* Binary formats and Common APIs: src/java/org/apache/poi/ * Binary formats and Common APIs: poi/src/main/java/org/apache/poi/
* OOXML APIs only: src/ooxml/java/org/apache/poi/ * OOXML APIs only: poi-ooxml/src/main/java/org/apache/poi/
* Scratchpad (Binary formats): src/scratchpad/src/org/apache/poi/ * Scratchpad (Binary formats): poi-scratchpad/src/main/java/org/apache/poi/
* Examples: src/examples/src/org/apache/poi/ * Examples: poi-examples/src/main/java/org/apache/poi/
* More info: `How To Build page`_ at apache.org * More info: `How To Build page`_ at apache.org

27
build.gradle
View File

@ -331,33 +331,36 @@ rat {
inputDir.set(file(".")) inputDir.set(file("."))
// include all directories which contain files that are included in releases // include all directories which contain files that are included in releases
includes.add("examples/**") includes.add("poi-examples/**")
includes.add("excelant/**") includes.add("poi-excelant/**")
includes.add("poi-integration/**") includes.add("poi-integration/**")
includes.add("legal/**") includes.add("legal/**")
includes.add("main/**") includes.add("poi/**")
includes.add("maven/**") includes.add("maven/**")
includes.add("ooxml/**") includes.add("poi-ooxml/**")
includes.add("ooxml-schema/**") includes.add("poi-ooxml-full/**")
includes.add("poi-ooxml-lite/**")
includes.add("poi-ooxml-lite-agent/**")
//includes.add("osgi/**") //includes.add("osgi/**")
includes.add("scratchpad/**") includes.add("poi-scratchpad/**")
includes.add("src/**") includes.add("src/**")
//includes.add("sonar/**") //includes.add("sonar/**")
includes.add("build.*") includes.add("build.*")
// List of Gradle exclude directives, defaults to ['**/.gradle/**'] // List of Gradle exclude directives, defaults to ['**/.gradle/**']
//excludes.add("main/java/org/apache/poi/**/*-chart-data.txt") //excludes.add("main/java/org/apache/poi/**/*-chart-data.txt")
includes.add("build.javacheck.xml")
excludes.add("**/build/**") excludes.add("**/build/**")
excludes.add("**/out/**") excludes.add("**/out/**")
excludes.add("**/*.iml") excludes.add("**/*.iml")
excludes.add("**/*.log") excludes.add("**/*.log")
excludes.add("**/main/java/org/apache/poi/**/*-chart-data.txt") excludes.add("**/main/java/org/apache/poi/**/*-chart-data.txt")
excludes.add("main/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml") excludes.add("poi/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml")
excludes.add("ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml") excludes.add("poi-ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml")
excludes.add("ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml") excludes.add("poi-ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml")
excludes.add("ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdES*.xsd") excludes.add("poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/XAdES*.xsd")
excludes.add("ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd") excludes.add("poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd")
excludes.add("ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd") excludes.add("poi-ooxml-full/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd")
/* /*
<exclude name="documentation/*.txt" /> <exclude name="documentation/*.txt" />
<exclude name="documentation/content/xdocs/dtd/" /> <exclude name="documentation/content/xdocs/dtd/" />

8
jenkins/create_jobs.groovy
View File

@ -156,10 +156,10 @@ def apicheckDesc = '''
<p> <p>
<b><a href="https://sonarcloud.io/dashboard?id=poi-parent" target="_blank">Sonar reports</a></b> - <b><a href="https://sonarcloud.io/dashboard?id=poi-parent" target="_blank">Sonar reports</a></b> -
<p> <p>
<b><a href="lastSuccessfulBuild/artifact/build/main/build/reports/japi.html">API Check POI</a></b> <b><a href="lastSuccessfulBuild/artifact/build/poi/build/reports/japi.html">API Check POI</a></b>
<b><a href="lastSuccessfulBuild/artifact/build/ooxml/build/reports/japi.html">API Check POI-OOXML</a></b> <b><a href="lastSuccessfulBuild/artifact/build/poi-ooxml/build/reports/japi.html">API Check POI-OOXML</a></b>
<b><a href="lastSuccessfulBuild/artifact/build/excelant/build/reports/japi.html">API Check POI-Excelant</a></b> <b><a href="lastSuccessfulBuild/artifact/build/poi-excelant/build/reports/japi.html">API Check POI-Excelant</a></b>
<b><a href="lastSuccessfulBuild/artifact/build/scratchpad/build/reports/japi.html">API Check POI-Scratchpad</a></b> <b><a href="lastSuccessfulBuild/artifact/build/poi-scratchpad/build/reports/japi.html">API Check POI-Scratchpad</a></b>
</p> </p>
''' '''

2
sonar/examples/pom.xml
View File

@ -36,7 +36,7 @@
<outputDirectory>${basedir}/src/main/java</outputDirectory> <outputDirectory>${basedir}/src/main/java</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../examples/src/main/java</directory> <directory>../../poi-examples/src/main/java</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>

8
sonar/excelant/pom.xml
View File

@ -31,7 +31,7 @@
<outputDirectory>${basedir}/src/main/java</outputDirectory> <outputDirectory>${basedir}/src/main/java</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../excelant/src/main/java</directory> <directory>../../poi-excelant/src/main/java</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
@ -47,10 +47,10 @@
<outputDirectory>${basedir}/src/main/resources</outputDirectory> <outputDirectory>${basedir}/src/main/resources</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../excelant/src/main/resources</directory> <directory>../../poi-excelant/src/main/resources</directory>
</resource> </resource>
<resource> <resource>
<directory>../../excelant/src/test/resources</directory> <directory>../../poi-excelant/src/test/resources</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
@ -66,7 +66,7 @@
<outputDirectory>${basedir}/src/test/java</outputDirectory> <outputDirectory>${basedir}/src/test/java</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../excelant/src/test/java</directory> <directory>../../poi-excelant/src/test/java</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>

2
sonar/integration-test/pom.xml
View File

@ -34,7 +34,7 @@
<directory>../../poi-integration/src/test/java</directory> <directory>../../poi-integration/src/test/java</directory>
</resource> </resource>
<resource> <resource>
<directory>../../main/src/test/java</directory> <directory>../../poi/src/test/java</directory>
<includes> <includes>
<include>org/apache/poi/POIDataSamples.java</include> <include>org/apache/poi/POIDataSamples.java</include>
<include>org/apache/poi/util/NullPrintStream.java</include> <include>org/apache/poi/util/NullPrintStream.java</include>

16
sonar/main/pom.xml
View File

@ -30,7 +30,7 @@
<outputDirectory>${basedir}/src/main/java</outputDirectory> <outputDirectory>${basedir}/src/main/java</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../main/src/main/java</directory> <directory>../../poi/src/main/java</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
@ -45,7 +45,7 @@
<outputDirectory>${basedir}/src/main/resources</outputDirectory> <outputDirectory>${basedir}/src/main/resources</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../main/src/main/resources</directory> <directory>../../poi/src/main/resources</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
@ -61,10 +61,10 @@
<outputDirectory>${basedir}/src/test/java</outputDirectory> <outputDirectory>${basedir}/src/test/java</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../main/src/test/java</directory> <directory>../../poi/src/test/java</directory>
</resource> </resource>
<resource> <resource>
<directory>../../main/src/test/resources</directory> <directory>../../poi/src/test/resources</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
@ -128,5 +128,11 @@
<artifactId>SparseBitSet</artifactId> <artifactId>SparseBitSet</artifactId>
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
</dependencies> <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.9</version>
<scope>test</scope>
</dependency>
</dependencies>
</project> </project>

4
sonar/ooxml-full/pom.xml
View File

@ -34,7 +34,7 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<property name="xsdir" value="${basedir}/../../ooxml-schema/src/main/xmlschema/org/apache/poi"/> <property name="xsdir" value="${basedir}/../../poi-ooxml-full/src/main/xmlschema/org/apache/poi"/>
<copy todir="${basedir}/target/schemas"> <copy todir="${basedir}/target/schemas">
<zipfileset src="${xsdir}/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/> <zipfileset src="${xsdir}/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
<zipfileset src="${xsdir}/schemas/OpenPackagingConventions-XMLSchema.zip" includes="opc-digSig.xsd,opc-relationships.xsd"/> <zipfileset src="${xsdir}/schemas/OpenPackagingConventions-XMLSchema.zip" includes="opc-digSig.xsd,opc-relationships.xsd"/>
@ -100,7 +100,7 @@
<directory>${basedir}/target/generated-resources</directory> <directory>${basedir}/target/generated-resources</directory>
</resource> </resource>
<resource> <resource>
<directory>${basedir}/../../ooxml-schema/src/ooxml-full/java9</directory> <directory>${basedir}/../../poi-ooxml-full/src/main/java9</directory>
<targetPath>META-INF/versions/9</targetPath> <targetPath>META-INF/versions/9</targetPath>
<includes> <includes>
<include>*.class</include> <include>*.class</include>

8
sonar/ooxml/pom.xml
View File

@ -28,7 +28,7 @@
<outputDirectory>${basedir}/src/main/java</outputDirectory> <outputDirectory>${basedir}/src/main/java</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../ooxml/src/main/java</directory> <directory>../../poi-ooxml/src/main/java</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
@ -43,7 +43,7 @@
<outputDirectory>${basedir}/src/main/resources</outputDirectory> <outputDirectory>${basedir}/src/main/resources</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../ooxml/src/main/resources</directory> <directory>../../poi-ooxml/src/main/resources</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
@ -58,10 +58,10 @@
<outputDirectory>${basedir}/src/test/java</outputDirectory> <outputDirectory>${basedir}/src/test/java</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../ooxml/src/test/java</directory> <directory>../../poi-ooxml/src/test/java</directory>
</resource> </resource>
<resource> <resource>
<directory>../../ooxml/src/test/resources</directory> <directory>../../poi-ooxml/src/test/resources</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>

8
sonar/scratchpad/pom.xml
View File

@ -37,7 +37,7 @@
<outputDirectory>${basedir}/src/main/java</outputDirectory> <outputDirectory>${basedir}/src/main/java</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../scratchpad/src/main/java</directory> <directory>../../poi-scratchpad/src/main/java</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
@ -53,7 +53,7 @@
<outputDirectory>${basedir}/src/main/resources</outputDirectory> <outputDirectory>${basedir}/src/main/resources</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../scratchpad/src/main/resources</directory> <directory>../../poi-scratchpad/src/main/resources</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
@ -69,10 +69,10 @@
<outputDirectory>${basedir}/src/test/java</outputDirectory> <outputDirectory>${basedir}/src/test/java</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../../scratchpad/src/test/java</directory> <directory>../../poi-scratchpad/src/test/java</directory>
</resource> </resource>
<resource> <resource>
<directory>../../scratchpad/src/test/resources</directory> <directory>../../poi-scratchpad/src/test/resources</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>