moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

sonar xmlbeans fix

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1696355 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2015-08-18 01:16:26 +00:00
parent 0377dbbb3e
commit 61a491dca9
2 changed files with 43 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
sonar/ooxml-schema-encryption/pom.xml
View File

@ -18,90 +18,40 @@
<sonar.exclusions>target/generated-sources/*</sonar.exclusions> <sonar.exclusions>target/generated-sources/*</sonar.exclusions>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId> <artifactId>xmlbeans-maven-plugin</artifactId>
<version>2.3.3</version> <version>2.3.3</version>
<executions> <executions>
<execution> <execution>
<phase>generate-sources</phase> <phase>generate-sources</phase>
<goals> <goals>
<goal>xmlbeans</goal> <goal>xmlbeans</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<schemaDirectory>../../src/ooxml/resources/org/apache/poi/poifs/crypt</schemaDirectory> <schemaDirectory>../../src/ooxml/resources/org/apache/poi/poifs/crypt</schemaDirectory>
<sourceSchemas>
<sourceSchema>encryptionInfo.xsd</sourceSchema>
</sourceSchemas>
<xmlConfigs>
<xmlConfig implementation="java.io.File">../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig</xmlConfig>
</xmlConfigs>
<javaSource>1.5</javaSource> <javaSource>1.5</javaSource>
<optimize>yes</optimize> <optimize>yes</optimize>
</configuration> </configuration>
</plugin> </plugin>
<!-- TODO: ugly workaround as XMLBeans in Maven creates slightly different source compared to the Ant XMLBeans task!?!
see http://stackoverflow.com/questions/21796000/xmlbeans-creates-different-code-when-running-via-ant-and-maven
-->
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<!-- Note: There is a bug with version 1.5.2 which caused the replacement to not find any files sometimes! -->
<version>1.5.1</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<includes>
<include>target/generated-sources/xmlbeans/com/microsoft/schemas/office/x2006/encryption/CTKeyEncryptor.java</include>
<include>target/generated-sources/xmlbeans/com/microsoft/schemas/office/x2006/encryption/impl/CTKeyEncryptorImpl.java</include>
<include>target/generated-sources/xmlbeans/com/microsoft/schemas/office/x2006/keyEncryptor/password/impl/EncryptedKeyDocumentImpl.java</include>
<include>target/generated-sources/xmlbeans/com/microsoft/schemas/office/x2006/keyEncryptor/certificate/EncryptedKeyDocument.java</include>
<include>target/generated-sources/xmlbeans/com/microsoft/schemas/office/x2006/keyEncryptor/certificate/impl/EncryptedKeyDocumentImpl.java</include>
<include>target/generated-sources/xmlbeans/com/microsoft/schemas/office/x2006/keyEncryptor/password/EncryptedKeyDocument.java</include>
<include>target/generated-sources/xmlbeans/com/microsoft/schemas/office/x2006/keyEncryptor/password/impl/EncryptedKeyDocumentImpl.java</include>
</includes>
<replacements>
<replacement>
<token>etEncryptedKey2</token>
<value>etEncryptedCertificateKey</value>
</replacement>
<replacement>
<token>etEncryptedKey</token>
<value>etEncryptedPasswordKey</value>
</replacement>
<replacement>
<token>ewEncryptedKey2</token>
<value>ewEncryptedCertificateKey</value>
</replacement>
<replacement>
<token>ewEncryptedKey</token>
<value>ewEncryptedPasswordKey</value>
</replacement>
<replacement>
<token>encryptedKey2\)</token>
<value>encryptedCertificateKey)</value>
</replacement>
<replacement>
<token>encryptedKey\)</token>
<value>encryptedPasswordKey)</value>
</replacement>
</replacements>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.xmlbeans</groupId> <groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId> <artifactId>xmlbeans</artifactId>
<version>2.6.0</version> <version>2.6.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

56
sonar/ooxml-schema-security/pom.xml
View File

@ -20,56 +20,38 @@
<build> <build>
<plugins> <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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>xmlbeans-maven-plugin</artifactId>
<version>1.6</version> <version>2.3.3</version>
<executions> <executions>
<execution> <execution>
<id>build-jar</id>
<phase>generate-sources</phase> <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> <goals>
<goal>run</goal> <goal>xmlbeans</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> <configuration>
<schemaDirectory>../../src/ooxml/resources/org/apache/poi/poifs/crypt</schemaDirectory>
<!-- copy resulting files from the jar-file as "resources" as otherwise Sonar does not pick them up --> <sourceSchemas>
<plugin> <sourceSchema>signatureInfo.xsd</sourceSchema>
<artifactId>maven-resources-plugin</artifactId> </sourceSchemas>
<version>2.6</version> <noUpa>true</noUpa>
<executions> <noPvr>true</noPvr>
<execution> <javaSource>1.5</javaSource>
<id>copy-sources</id> <optimize>yes</optimize>
<phase>generate-sources</phase> </configuration>
<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> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.6.0</version>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>poi-main</artifactId> <artifactId>poi-main</artifactId>