diff options
| author | Dominik Stadler <centic@apache.org> | 2021-04-08 20:10:53 +0000 |
|---|---|---|
| committer | Dominik Stadler <centic@apache.org> | 2021-04-08 20:10:53 +0000 |
| commit | 30d8d1773596008d8333c282e420f19d8215d44a (patch) | |
| tree | 769cf91a3dae169b5c0886436397cca8a3599819 /sonar | |
| parent | 329ae952d27814ebbc6138d32b6b228dc1da4ca9 (diff) | |
| download | poi-30d8d1773596008d8333c282e420f19d8215d44a.tar.gz poi-30d8d1773596008d8333c282e420f19d8215d44a.zip | |
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
Diffstat (limited to 'sonar')
| -rw-r--r-- | sonar/examples/pom.xml | 2 | ||||
| -rw-r--r-- | sonar/excelant/pom.xml | 8 | ||||
| -rw-r--r-- | sonar/integration-test/pom.xml | 2 | ||||
| -rw-r--r-- | sonar/main/pom.xml | 16 | ||||
| -rw-r--r-- | sonar/ooxml-full/pom.xml | 4 | ||||
| -rw-r--r-- | sonar/ooxml/pom.xml | 8 | ||||
| -rw-r--r-- | sonar/scratchpad/pom.xml | 8 |
7 files changed, 27 insertions, 21 deletions
diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml index a6851591e9..cbeb37f092 100644 --- a/sonar/examples/pom.xml +++ b/sonar/examples/pom.xml @@ -36,7 +36,7 @@ <outputDirectory>${basedir}/src/main/java</outputDirectory> <resources> <resource> - <directory>../../examples/src/main/java</directory> + <directory>../../poi-examples/src/main/java</directory> </resource> </resources> </configuration> diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml index 7dceeabfa2..20bfcf4c62 100644 --- a/sonar/excelant/pom.xml +++ b/sonar/excelant/pom.xml @@ -31,7 +31,7 @@ <outputDirectory>${basedir}/src/main/java</outputDirectory> <resources> <resource> - <directory>../../excelant/src/main/java</directory> + <directory>../../poi-excelant/src/main/java</directory> </resource> </resources> </configuration> @@ -47,10 +47,10 @@ <outputDirectory>${basedir}/src/main/resources</outputDirectory> <resources> <resource> - <directory>../../excelant/src/main/resources</directory> + <directory>../../poi-excelant/src/main/resources</directory> </resource> <resource> - <directory>../../excelant/src/test/resources</directory> + <directory>../../poi-excelant/src/test/resources</directory> </resource> </resources> </configuration> @@ -66,7 +66,7 @@ <outputDirectory>${basedir}/src/test/java</outputDirectory> <resources> <resource> - <directory>../../excelant/src/test/java</directory> + <directory>../../poi-excelant/src/test/java</directory> </resource> </resources> </configuration> diff --git a/sonar/integration-test/pom.xml b/sonar/integration-test/pom.xml index 583d28ec6b..7fe0e86e2c 100644 --- a/sonar/integration-test/pom.xml +++ b/sonar/integration-test/pom.xml @@ -34,7 +34,7 @@ <directory>../../poi-integration/src/test/java</directory> </resource> <resource> - <directory>../../main/src/test/java</directory> + <directory>../../poi/src/test/java</directory> <includes> <include>org/apache/poi/POIDataSamples.java</include> <include>org/apache/poi/util/NullPrintStream.java</include> diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml index 3383554035..d5c2aeefa7 100644 --- a/sonar/main/pom.xml +++ b/sonar/main/pom.xml @@ -30,7 +30,7 @@ <outputDirectory>${basedir}/src/main/java</outputDirectory> <resources> <resource> - <directory>../../main/src/main/java</directory> + <directory>../../poi/src/main/java</directory> </resource> </resources> </configuration> @@ -45,7 +45,7 @@ <outputDirectory>${basedir}/src/main/resources</outputDirectory> <resources> <resource> - <directory>../../main/src/main/resources</directory> + <directory>../../poi/src/main/resources</directory> </resource> </resources> </configuration> @@ -61,10 +61,10 @@ <outputDirectory>${basedir}/src/test/java</outputDirectory> <resources> <resource> - <directory>../../main/src/test/java</directory> + <directory>../../poi/src/test/java</directory> </resource> <resource> - <directory>../../main/src/test/resources</directory> + <directory>../../poi/src/test/resources</directory> </resource> </resources> </configuration> @@ -128,5 +128,11 @@ <artifactId>SparseBitSet</artifactId> <version>1.2</version> </dependency> - </dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.10.9</version> + <scope>test</scope> + </dependency> + </dependencies> </project> diff --git a/sonar/ooxml-full/pom.xml b/sonar/ooxml-full/pom.xml index 263136d962..3b10eff008 100644 --- a/sonar/ooxml-full/pom.xml +++ b/sonar/ooxml-full/pom.xml @@ -34,7 +34,7 @@ </goals> <configuration> <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"> <zipfileset src="${xsdir}/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/> <zipfileset src="${xsdir}/schemas/OpenPackagingConventions-XMLSchema.zip" includes="opc-digSig.xsd,opc-relationships.xsd"/> @@ -100,7 +100,7 @@ <directory>${basedir}/target/generated-resources</directory> </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> <includes> <include>*.class</include> diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index e181ca3171..83845c591e 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -28,7 +28,7 @@ <outputDirectory>${basedir}/src/main/java</outputDirectory> <resources> <resource> - <directory>../../ooxml/src/main/java</directory> + <directory>../../poi-ooxml/src/main/java</directory> </resource> </resources> </configuration> @@ -43,7 +43,7 @@ <outputDirectory>${basedir}/src/main/resources</outputDirectory> <resources> <resource> - <directory>../../ooxml/src/main/resources</directory> + <directory>../../poi-ooxml/src/main/resources</directory> </resource> </resources> </configuration> @@ -58,10 +58,10 @@ <outputDirectory>${basedir}/src/test/java</outputDirectory> <resources> <resource> - <directory>../../ooxml/src/test/java</directory> + <directory>../../poi-ooxml/src/test/java</directory> </resource> <resource> - <directory>../../ooxml/src/test/resources</directory> + <directory>../../poi-ooxml/src/test/resources</directory> </resource> </resources> </configuration> diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml index 639d930358..b5d1e80ef7 100644 --- a/sonar/scratchpad/pom.xml +++ b/sonar/scratchpad/pom.xml @@ -37,7 +37,7 @@ <outputDirectory>${basedir}/src/main/java</outputDirectory> <resources> <resource> - <directory>../../scratchpad/src/main/java</directory> + <directory>../../poi-scratchpad/src/main/java</directory> </resource> </resources> </configuration> @@ -53,7 +53,7 @@ <outputDirectory>${basedir}/src/main/resources</outputDirectory> <resources> <resource> - <directory>../../scratchpad/src/main/resources</directory> + <directory>../../poi-scratchpad/src/main/resources</directory> </resource> </resources> </configuration> @@ -69,10 +69,10 @@ <outputDirectory>${basedir}/src/test/java</outputDirectory> <resources> <resource> - <directory>../../scratchpad/src/test/java</directory> + <directory>../../poi-scratchpad/src/test/java</directory> </resource> <resource> - <directory>../../scratchpad/src/test/resources</directory> + <directory>../../poi-scratchpad/src/test/resources</directory> </resource> </resources> </configuration> |