diff options
Diffstat (limited to 'sonar')
| -rw-r--r-- | sonar/examples/pom.xml | 41 | ||||
| -rw-r--r-- | sonar/excelant/pom.xml | 77 | ||||
| -rw-r--r-- | sonar/main/pom.xml | 77 | ||||
| -rw-r--r-- | sonar/ooxml-schema-encryption/pom.xml | 2 | ||||
| -rw-r--r-- | sonar/ooxml-schema/pom.xml | 2 | ||||
| -rw-r--r-- | sonar/ooxml/pom.xml | 84 | ||||
| -rw-r--r-- | sonar/pom.xml | 2 | ||||
| -rw-r--r-- | sonar/scratchpad/pom.xml | 77 |
8 files changed, 320 insertions, 42 deletions
diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml index be0cd111a8..5064a51afc 100644 --- a/sonar/examples/pom.xml +++ b/sonar/examples/pom.xml @@ -12,9 +12,46 @@ <packaging>jar</packaging> <name>Apache POI Examples package</name> - + <build> - <sourceDirectory>../../src/examples/src</sourceDirectory> + <plugins> + <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/main/java</outputDirectory> + <resources> + <resource> + <directory>../../src/examples/src</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <!-- clean copied sources afterwards --> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.5</version> + <configuration> + <filesets> + <fileset> + <directory>src</directory> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> + </plugins> </build> <dependencies> diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml index 478a9364be..8cc86ec07e 100644 --- a/sonar/excelant/pom.xml +++ b/sonar/excelant/pom.xml @@ -14,13 +14,76 @@ <name>Apache POI ExcelAnt package</name> <build> - <sourceDirectory>../../src/excelant/java</sourceDirectory> - <testSourceDirectory>../../src/excelant/testcases</testSourceDirectory> - <resources> - <resource> - <directory>../../src/excelant/resources</directory> - </resource> - </resources> + <plugins> + <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/main/java</outputDirectory> + <resources> + <resource> + <directory>../../src/excelant/java</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources</id> + <!-- here the phase you need --> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/main/resources</outputDirectory> + <resources> + <resource> + <directory>../../src/excelant/resources</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-tests</id> + <!-- here the phase you need --> + <phase>generate-test-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/test/java</outputDirectory> + <resources> + <resource> + <directory>../../src/excelant/testcases</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <!-- clean copied sources afterwards --> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.5</version> + <configuration> + <filesets> + <fileset> + <directory>src</directory> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> + </plugins> </build> <dependencies> diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml index 81e87aa168..6527e75b01 100644 --- a/sonar/main/pom.xml +++ b/sonar/main/pom.xml @@ -14,15 +14,76 @@ <name>Apache POI Main package</name> <build> - <sourceDirectory>../../src/java</sourceDirectory> - <testSourceDirectory>../../src/testcases</testSourceDirectory> - <resources> - <resource> - <directory>../../src/resources/main</directory> - </resource> - </resources> - <plugins> + <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/main/java</outputDirectory> + <resources> + <resource> + <directory>../../src/java</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources</id> + <!-- here the phase you need --> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/main/resources</outputDirectory> + <resources> + <resource> + <directory>../../src/resources/main</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-tests</id> + <!-- here the phase you need --> + <phase>generate-test-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/test/java</outputDirectory> + <resources> + <resource> + <directory>../../src/testcases</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <!-- clean copied sources afterwards --> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.5</version> + <configuration> + <filesets> + <fileset> + <directory>src</directory> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> + <!-- provide the test-jar for other modules --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/sonar/ooxml-schema-encryption/pom.xml b/sonar/ooxml-schema-encryption/pom.xml index 9fd2370277..aa723d0d6f 100644 --- a/sonar/ooxml-schema-encryption/pom.xml +++ b/sonar/ooxml-schema-encryption/pom.xml @@ -14,8 +14,6 @@ <name>Apach POI - Openxmlformats Encryption Schema package</name> <build> - <sourceDirectory>target/generated-sources/xmlbeans</sourceDirectory> - <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml index 92e0111c8f..92426b486b 100644 --- a/sonar/ooxml-schema/pom.xml +++ b/sonar/ooxml-schema/pom.xml @@ -14,8 +14,6 @@ <name>Apach POI - Openxmlformats Schema package</name> <build> - <sourceDirectory>target/generated-sources/xmlbeans</sourceDirectory> - <plugins> <!-- Download and unpack the OfficeOpenXML Schema and use xmlbeans to create classes from the XSDs --> <plugin> diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index 0ece9d6235..bc1feabb4d 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -12,15 +12,78 @@ <packaging>jar</packaging> <name>Apache POI OOXML package</name> - + <build> - <sourceDirectory>../../src/ooxml/java</sourceDirectory> - <testSourceDirectory>../../src/ooxml/testcases</testSourceDirectory> - <resources> - <resource> - <directory>../../src/resources/ooxml</directory> - </resource> - </resources> + <plugins> + <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/main/java</outputDirectory> + <resources> + <resource> + <directory>../../src/ooxml/java</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources</id> + <!-- here the phase you need --> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/main/resources</outputDirectory> + <resources> + <resource> + <directory>../../src/resources/ooxml</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-tests</id> + <!-- here the phase you need --> + <phase>generate-test-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/test/java</outputDirectory> + <resources> + <resource> + <directory>../../src/ooxml/testcases</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <!-- clean copied sources afterwards --> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.5</version> + <configuration> + <filesets> + <fileset> + <directory>src</directory> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> + </plugins> </build> <dependencies> @@ -46,11 +109,6 @@ <type>test-jar</type> <scope>test</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>poi-scratchpad</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.xmlbeans</groupId> diff --git a/sonar/pom.xml b/sonar/pom.xml index 2232fe5e09..8d54d14d1d 100644 --- a/sonar/pom.xml +++ b/sonar/pom.xml @@ -9,7 +9,7 @@ <packaging>pom</packaging> <version>3.11-SNAPSHOT</version> - <name>Apache POI Parent Project</name> + <name>Apache POI - the Java API for Microsoft Documents</name> <description>Maven build of Apache POI for Sonar checks</description> <url>http://poi.apache.org/</url> diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml index 3824eeaace..24e8045d76 100644 --- a/sonar/scratchpad/pom.xml +++ b/sonar/scratchpad/pom.xml @@ -14,13 +14,76 @@ <name>Apache POI Scratchpad package</name> <build> - <sourceDirectory>../../src/scratchpad/src</sourceDirectory> - <testSourceDirectory>../../src/scratchpad/testcases</testSourceDirectory> - <resources> - <resource> - <directory>../../src/resources/scratchpad</directory> - </resource> - </resources> + <plugins> + <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/main/java</outputDirectory> + <resources> + <resource> + <directory>../../src/scratchpad/src</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resources</id> + <!-- here the phase you need --> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/main/resources</outputDirectory> + <resources> + <resource> + <directory>../../src/resources/scratchpad</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-tests</id> + <!-- here the phase you need --> + <phase>generate-test-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/src/test/java</outputDirectory> + <resources> + <resource> + <directory>../../src/scratchpad/testcases</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <!-- clean copied sources afterwards --> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.5</version> + <configuration> + <filesets> + <fileset> + <directory>src</directory> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> + </plugins> </build> <dependencies> |