diff --git a/.gitignore b/.gitignore index 0ba0c1b4bd..ed8a7870af 100644 --- a/.gitignore +++ b/.gitignore @@ -20,18 +20,6 @@ ooxml-testlib/ junit*.properties TEST-org.apache.poi*.xml -# Sonar -.sonar -sonar/main/src/ -sonar/ooxml/src/ -sonar/scratchpad/src/ -sonar/ooxml-full/src/ -sonar/examples/src/ -sonar/excelant/src/ -sonar/integration-test/src/ -sonar/target -sonar/*/target - # IntelliJ /out/ /*/out/ diff --git a/build.xml b/build.xml index 9c90a8a08b..e2d57f98b6 100644 --- a/build.xml +++ b/build.xml @@ -639,13 +639,6 @@ under the License. - - - - - - - @@ -2002,6 +1995,7 @@ under the License. + @@ -2020,6 +2014,8 @@ under the License. + + @@ -2389,8 +2385,6 @@ under the License. out/**, tmp/**, gradle/**, - sonar/**/target/**, - sonar/*/src/**, compile-lib/**, ooxml-lib/**, ooxml-testlib/**, @@ -3031,26 +3025,16 @@ under the License. - - - - - - - - - - + @@ -3123,10 +3107,6 @@ under the License. - - - - @@ -3289,20 +3269,6 @@ under the License. - - - - - - - - - - diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index c72c898231..ece3c0c22e 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -280,7 +280,6 @@ poijobs.each { poijob -> /* remove xmlbeans while 4.0 is not stable */ includePattern('**/lib/ooxml/xmlbeans*.jar') includePattern('**/lib/ooxml/ooxml*.jar') - includePattern('sonar/*/target/**') /* remove ooxml-schemas while the builds migrate to 5th edition */ includePattern('build/xmlbean-*/**') /* remove remaining src debris */