diff options
| author | Dominik Stadler <centic@apache.org> | 2015-08-25 19:04:11 +0000 |
|---|---|---|
| committer | Dominik Stadler <centic@apache.org> | 2015-08-25 19:04:11 +0000 |
| commit | 61de04b84908d9a785ae81c68b48dabec3926b3c (patch) | |
| tree | 433f92de60b2e6172f84f62e74ec202267d1154a | |
| parent | e41a5e93d38d69e143ab6b79400fe8f7e7e85acf (diff) | |
| download | poi-61de04b84908d9a785ae81c68b48dabec3926b3c.tar.gz poi-61de04b84908d9a785ae81c68b48dabec3926b3c.zip | |
Next try for Sonar Maven build: Specify the src-pathes in the various pom.xml files
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1697758 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | sonar/examples/pom.xml | 6 | ||||
| -rw-r--r-- | sonar/excelant/pom.xml | 6 | ||||
| -rw-r--r-- | sonar/main/pom.xml | 6 | ||||
| -rw-r--r-- | sonar/ooxml/pom.xml | 6 | ||||
| -rw-r--r-- | sonar/pom.xml | 4 | ||||
| -rw-r--r-- | sonar/scratchpad/pom.xml | 4 |
6 files changed, 28 insertions, 4 deletions
diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml index 641b47ab57..4f13ac70bf 100644 --- a/sonar/examples/pom.xml +++ b/sonar/examples/pom.xml @@ -13,6 +13,12 @@ <name>Apache POI Examples package</name> + <properties> + <!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks --> + <sonar.sources>${basedir}/../../src/examples/src</sonar.sources> + <!-- tests are automatically found in Maven --> + </properties> + <build> <plugins> <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! --> diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml index 2efd544908..66ec9bbeba 100644 --- a/sonar/excelant/pom.xml +++ b/sonar/excelant/pom.xml @@ -13,6 +13,12 @@ <name>Apache POI ExcelAnt package</name> + <properties> + <!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks --> + <sonar.sources>${basedir}/../../src/excelant/java</sonar.sources> + <!-- tests are automatically found in Maven --> + </properties> + <build> <plugins> <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! --> diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml index d962229758..d762c90502 100644 --- a/sonar/main/pom.xml +++ b/sonar/main/pom.xml @@ -13,6 +13,12 @@ <name>Apache POI Main package</name> + <properties> + <!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks --> + <sonar.sources>${basedir}/../../src/java</sonar.sources> + <!-- tests are automatically found in Maven --> + </properties> + <build> <plugins> <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! --> diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index 4df81fe121..42bd514e16 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -12,6 +12,12 @@ <packaging>jar</packaging> <name>Apache POI OOXML package</name> + + <properties> + <!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks --> + <sonar.sources>${basedir}/../../src/ooxml/java</sonar.sources> + <!-- tests are automatically found in Maven --> + </properties> <build> <plugins> diff --git a/sonar/pom.xml b/sonar/pom.xml index 7c1beeac30..cc53d40f34 100644 --- a/sonar/pom.xml +++ b/sonar/pom.xml @@ -65,9 +65,7 @@ <properties> <project.build.sourceEncoding>ASCII</project.build.sourceEncoding> - <sonar.sources>${basedir}/../src/contrib/src,${basedir}/../src/examples/src,${basedir}/../src/excelant/java,${basedir}/../src/java,${basedir}/../src/ooxml/java,${basedir}/../src/scratchpad/examples,${basedir}/../src/,${basedir}/../src/scratchpad/src</sonar.sources> - <!-- tests are automatically found in Maven ../src/integrationtest,../src/contrib/testcases,../src/excelant/testcases,../src/ooxml/testcases,../src/scratchpad/testcases,../src/testcases --> - </properties> + </properties> <build> <pluginManagement> diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml index c3dc3112a1..46f37439fc 100644 --- a/sonar/scratchpad/pom.xml +++ b/sonar/scratchpad/pom.xml @@ -14,10 +14,12 @@ <name>Apache POI Scratchpad package</name> <properties> + <!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks --> + <sonar.sources>${basedir}/../../src/scratchpad/examples,${basedir}/../../src/scratchpad/src</sonar.sources> + <!-- tests are automatically found in Maven --> <!-- Exclude some generated code from Sonar analysis --> <sonar.exclusions>src/main/java/org/apache/poi/hwpf/model/types/*,src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/*</sonar.exclusions> </properties> - <build> <plugins> |