Try to make Sonar builds run again: add missing dependency, add ooxml-schema-security, don't depend on dir test-data and build-directory directly, don't override a POILogger that is set via System Properties

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1696165 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 108 insertions, 4 deletions

diff --git a/sonar/ooxml-schema-security/pom.xml b/sonar/ooxml-schema-security/pom.xml
new file mode 100644
index 0000000000..7debcf290e
--- /dev/null
+++ b/sonar/ooxml-schema-security/pom.xml
@@ -0,0 +1,84 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                             http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.poi</groupId>
+        <artifactId>poi-parent</artifactId>
+        <version>3.12-SNAPSHOT</version>
+    </parent>
+    <artifactId>poi-ooxml-schema-security</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Apach POI - Openxmlformats Security-Schema package</name>
+
+	<properties>
+		<!-- see http://docs.codehaus.org/display/SONAR/Narrowing+the+Focus for details of this property -->
+		<sonar.exclusions>target/generated-sources/*</sonar.exclusions>
+	</properties>
+  
+    <build>
+		<plugins>
+			<!-- reuse Ant build here instead of trying to tweak Maven to do this as we got stuck 
+			because we cannot provide "-noupa -nopvr" using the xmlbeans-maven-plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.6</version>
+				<executions>
+					<execution>
+						<id>build-jar</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<target>
+								<echo message="build jar-file for ooxml-security" />
+								<ant dir="../.." target="compile-ooxml-xsds" useNativeBasedir="true"/>
+								<unzip src="../../ooxml-lib/ooxml-security-1.0.jar" dest="target/jar"/>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- copy resulting files from the jar-file as "resources" as otherwise Sonar does not pick them up -->
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<id>copy-sources</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/src/main/resources</outputDirectory>
+							<resources>          
+								<resource>
+									<directory>target/jar</directory>
+								</resource>
+							</resources>              
+						</configuration>            
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>poi-main</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 994b232ea1..4df81fe121 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -22,7 +22,6 @@
 				<executions>
 					<execution>
 						<id>copy-sources</id>
-						<!-- here the phase you need -->
 						<phase>generate-sources</phase>
 						<goals>
 							<goal>copy-resources</goal>
@@ -38,7 +37,6 @@
 					</execution>
 					<execution>
 						<id>copy-resources</id>
-						<!-- here the phase you need -->
 						<phase>generate-resources</phase>
 						<goals>
 							<goal>copy-resources</goal>
@@ -54,7 +52,6 @@
 					</execution>
 					<execution>
 						<id>copy-tests</id>
-						<!-- here the phase you need -->
 						<phase>generate-test-sources</phase>
 						<goals>
 							<goal>copy-resources</goal>
@@ -98,6 +95,11 @@
 			<version>${project.version}</version>
         </dependency>
         <dependency>
+			<groupId>${project.groupId}</groupId>
+            <artifactId>poi-ooxml-schema-security</artifactId>
+			<version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>poi-main</artifactId>
 			<version>${project.version}</version>
@@ -116,6 +118,22 @@
 		  <version>2.6.0</version>
 		</dependency>
 		
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcpkix-jdk15on</artifactId>
+			<version>1.51</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk15on</artifactId>
+			<version>1.51</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.santuario</groupId>
+			<artifactId>xmlsec</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+  
 		<!-- non-test dependency for OOXMLLite -->
         <dependency>
             <groupId>junit</groupId>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 99796faaff..6117e93555 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -56,6 +56,7 @@
 		<module>main</module>
 		<module>ooxml-schema</module>
 		<module>ooxml-schema-encryption</module>
+		<module>ooxml-schema-security</module>
 		<module>ooxml</module>
 		<module>scratchpad</module>
 		<module>excelant</module>
@@ -100,7 +101,8 @@
 					<java.awt.headless>true</java.awt.headless>
 					<org.apache.poi.util.POILogger>org.apache.poi.util.NullLogger</org.apache.poi.util.POILogger>
 				</systemPropertyVariables>
-				<argLine>-Duser.language=en -Duser.country=US</argLine>
+				<!-- use to following to analyze OOM issues:  -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -->
+				<argLine>-Duser.language=en -Duser.country=US -Xmx512m</argLine>
 				<excludes>
 					<exclude>**/All*Tests.java</exclude>
 					<exclude>**/TestUnfixedBugs.java</exclude>