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

diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index 641b47ab5740fdb7badc00ff6fe7fec8a8baa80a..4f13ac70bf5b0887ba0ebe48021539382c19ca3c 100644 (file)
--- 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 2efd5449082cc27057be9ffde8f0e72dbaafbb28..66ec9bbebaa7d8208b7116137f49b67d31485d21 100644 (file)
--- 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 d96222975801f54a693fd28755a021fa7e605055..d762c90502e4c2021fa871b021025f9e6b1602db 100644 (file)
--- 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 4df81fe121ca02d6e8f1f603e911d655551962e0..42bd514e16d69cb411f0f6806ddbbc5ea640e4d8 100644 (file)
--- 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 7c1beeac30b94899a405c97ec8e0a6aac635c03c..cc53d40f34b5ab8459adb4fe81a62c606355d0f5 100644 (file)
--- 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 c3dc3112a12a9db72d2d02694fe79246209a2b38..46f37439fcf3eeaa26df79a4556e1bb61491d4b6 100644 (file)
--- 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>