You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2020/12/17 20:31:46 UTC
svn commit: r1884570 - in /poi/trunk/sonar: examples/pom.xml
excelant/pom.xml ooxml-full/pom.xml scratchpad/pom.xml
Author: fanningpj
Date: Thu Dec 17 20:31:46 2020
New Revision: 1884570
URL: http://svn.apache.org/viewvc?rev=1884570&view=rev
Log:
remove tabs
Modified:
poi/trunk/sonar/examples/pom.xml
poi/trunk/sonar/excelant/pom.xml
poi/trunk/sonar/ooxml-full/pom.xml
poi/trunk/sonar/scratchpad/pom.xml
Modified: poi/trunk/sonar/examples/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/examples/pom.xml?rev=1884570&r1=1884569&r2=1884570&view=diff
==============================================================================
--- poi/trunk/sonar/examples/pom.xml (original)
+++ poi/trunk/sonar/examples/pom.xml Thu Dec 17 20:31:46 2020
@@ -13,38 +13,38 @@
<name>Apache POI Examples package</name>
- <properties>
- <!-- There are no junit tests in the examples module -->
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <properties>
+ <!-- There are no junit tests in the examples module -->
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
<build>
- <plugins>
- <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${maven.plugin.resources.version}</version>
- <executions>
- <execution>
- <id>copy-sources</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/src/main/java</outputDirectory>
- <resources>
- <resource>
- <directory>../../src/examples/src</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- clean copied sources afterwards -->
- <plugin>
+ <plugins>
+ <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven.plugin.resources.version}</version>
+ <executions>
+ <execution>
+ <id>copy-sources</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/main/java</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../src/examples/src</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- clean copied sources afterwards -->
+ <plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven.plugin.clean.version}</version>
<configuration>
@@ -56,19 +56,19 @@
</filesets>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>poi-main</artifactId>
- <version>${project.version}</version>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>poi-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
Modified: poi/trunk/sonar/excelant/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/excelant/pom.xml?rev=1884570&r1=1884569&r2=1884570&view=diff
==============================================================================
--- poi/trunk/sonar/excelant/pom.xml (original)
+++ poi/trunk/sonar/excelant/pom.xml Thu Dec 17 20:31:46 2020
@@ -14,64 +14,64 @@
<name>Apache POI ExcelAnt package</name>
<build>
- <plugins>
- <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${maven.plugin.resources.version}</version>
- <executions>
- <execution>
- <id>copy-sources</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/src/main/java</outputDirectory>
- <resources>
- <resource>
- <directory>../../src/excelant/java</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-resources</id>
- <!-- here the phase you need -->
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/src/main/resources</outputDirectory>
- <resources>
- <resource>
- <directory>../../src/excelant/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-tests</id>
- <!-- here the phase you need -->
- <phase>generate-test-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/src/test/java</outputDirectory>
- <resources>
- <resource>
- <directory>../../src/excelant/testcases</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- clean copied sources afterwards -->
- <plugin>
+ <plugins>
+ <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven.plugin.resources.version}</version>
+ <executions>
+ <execution>
+ <id>copy-sources</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/main/java</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../src/excelant/java</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources</id>
+ <!-- here the phase you need -->
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/main/resources</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../src/excelant/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-tests</id>
+ <!-- here the phase you need -->
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/test/java</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../src/excelant/testcases</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- clean copied sources afterwards -->
+ <plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven.plugin.clean.version}</version>
<configuration>
@@ -83,32 +83,32 @@
</filesets>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>poi-main</artifactId>
- <version>${project.version}</version>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>poi-main</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>poi-main</artifactId>
- <version>${project.version}</version>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>poi-main</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${project.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.10.9</version>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.10.9</version>
</dependency>
</dependencies>
</project>
Modified: poi/trunk/sonar/ooxml-full/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml-full/pom.xml?rev=1884570&r1=1884569&r2=1884570&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml-full/pom.xml (original)
+++ poi/trunk/sonar/ooxml-full/pom.xml Thu Dec 17 20:31:46 2020
@@ -14,129 +14,129 @@
<name>Apache POI - Openxmlformats 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>
- <maven.compiler.fork>true</maven.compiler.fork>
- </properties>
+ <properties>
+ <!-- see http://docs.codehaus.org/display/SONAR/Narrowing+the+Focus for details of this property -->
+ <sonar.exclusions>target/generated-sources/*</sonar.exclusions>
+ <maven.compiler.fork>true</maven.compiler.fork>
+ </properties>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven.plugin.antrun.version}</version>
- <executions>
- <execution>
- <id>copy-xmltype-and-xsdconfig</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <property name="xsdir" value="${basedir}/../../src/ooxml/resources/org/apache/poi"/>
- <copy todir="${basedir}/target/schemas">
- <zipfileset src="${xsdir}/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
- <zipfileset src="${xsdir}/schemas/OpenPackagingConventions-XMLSchema.zip" includes="opc-digSig.xsd,opc-relationships.xsd"/>
- <fileset dir="${xsdir}/xdgf" includes="*.xsd,*.xsdconfig"/>
- <fileset dir="${xsdir}/schemas" includes="*.xsd,*.xsdconfig"/>
- <fileset dir="${xsdir}/poifs/crypt" includes="signatureInfo.xsd"/>
- </copy>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <!-- need to use exec instead of java, because SchemaCompiler calls System.exit() -->
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>java</executable>
- <arguments>
- <argument>-classpath</argument>
- <!-- automatically creates the classpath using all project dependencies,
- also adding the project build directory -->
- <classpath/>
- <argument>org.apache.xmlbeans.impl.tool.SchemaCompiler</argument>
- <argument>-srconly</argument>
- <argument>-name</argument>
- <argument>ooxml</argument>
- <argument>-repackage</argument>
- <argument>org.apache.xmlbeans.metadata:org.apache.poi.schemas.ooxml</argument>
- <argument>-d</argument>
- <argument>${basedir}/target/generated-resources</argument>
- <argument>-src</argument>
- <argument>${basedir}/target/generated-sources</argument>
- <argument>${basedir}/target/schemas</argument>
- </arguments>
- <additionalClasspathElements>
- <additionalClasspathElement>
- ${basedir}/../../lib/ooxml/xmlbeans-4.0.0.jar
- </additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <goals>
- <goal>add-source</goal>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${basedir}/target/generated-resources</directory>
- </resource>
- <resource>
- <directory>${basedir}/../../src/multimodule/ooxml-full/java9</directory>
- <targetPath>META-INF/versions/9</targetPath>
- <includes>
- <include>*.class</include>
- </includes>
- </resource>
- </resources>
- <sources>
- <source>${basedir}/target/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
- <configuration>
- <archive>
- <manifestEntries>
- <Multi-Release>true</Multi-Release>
- <Automatic-Module-Name>org.apache.poi.ooxml.schemas</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.plugin.antrun.version}</version>
+ <executions>
+ <execution>
+ <id>copy-xmltype-and-xsdconfig</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <property name="xsdir" value="${basedir}/../../src/ooxml/resources/org/apache/poi"/>
+ <copy todir="${basedir}/target/schemas">
+ <zipfileset src="${xsdir}/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
+ <zipfileset src="${xsdir}/schemas/OpenPackagingConventions-XMLSchema.zip" includes="opc-digSig.xsd,opc-relationships.xsd"/>
+ <fileset dir="${xsdir}/xdgf" includes="*.xsd,*.xsdconfig"/>
+ <fileset dir="${xsdir}/schemas" includes="*.xsd,*.xsdconfig"/>
+ <fileset dir="${xsdir}/poifs/crypt" includes="signatureInfo.xsd"/>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <goals>
+ <!-- need to use exec instead of java, because SchemaCompiler calls System.exit() -->
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>java</executable>
+ <arguments>
+ <argument>-classpath</argument>
+ <!-- automatically creates the classpath using all project dependencies,
+ also adding the project build directory -->
+ <classpath/>
+ <argument>org.apache.xmlbeans.impl.tool.SchemaCompiler</argument>
+ <argument>-srconly</argument>
+ <argument>-name</argument>
+ <argument>ooxml</argument>
+ <argument>-repackage</argument>
+ <argument>org.apache.xmlbeans.metadata:org.apache.poi.schemas.ooxml</argument>
+ <argument>-d</argument>
+ <argument>${basedir}/target/generated-resources</argument>
+ <argument>-src</argument>
+ <argument>${basedir}/target/generated-sources</argument>
+ <argument>${basedir}/target/schemas</argument>
+ </arguments>
+ <additionalClasspathElements>
+ <additionalClasspathElement>
+ ${basedir}/../../lib/ooxml/xmlbeans-4.0.0.jar
+ </additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <goals>
+ <goal>add-source</goal>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/generated-resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../src/multimodule/ooxml-full/java9</directory>
+ <targetPath>META-INF/versions/9</targetPath>
+ <includes>
+ <include>*.class</include>
+ </includes>
+ </resource>
+ </resources>
+ <sources>
+ <source>${basedir}/target/generated-sources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Multi-Release>true</Multi-Release>
+ <Automatic-Module-Name>org.apache.poi.ooxml.schemas</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>poi-main</artifactId>
Modified: poi/trunk/sonar/scratchpad/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/scratchpad/pom.xml?rev=1884570&r1=1884569&r2=1884570&view=diff
==============================================================================
--- poi/trunk/sonar/scratchpad/pom.xml (original)
+++ poi/trunk/sonar/scratchpad/pom.xml Thu Dec 17 20:31:46 2020
@@ -13,71 +13,71 @@
<name>Apache POI Scratchpad package</name>
- <properties>
- <!-- 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>
+ <properties>
+ <!-- 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>
- <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${maven.plugin.resources.version}</version>
- <executions>
- <execution>
- <id>copy-sources</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/src/main/java</outputDirectory>
- <resources>
- <resource>
- <directory>../../src/scratchpad/src</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-resources</id>
- <!-- here the phase you need -->
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/src/main/resources</outputDirectory>
- <resources>
- <resource>
- <directory>../../src/resources/scratchpad</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-tests</id>
- <!-- here the phase you need -->
- <phase>generate-test-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/src/test/java</outputDirectory>
- <resources>
- <resource>
- <directory>../../src/scratchpad/testcases</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- clean copied sources afterwards -->
- <plugin>
+ <plugins>
+ <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven.plugin.resources.version}</version>
+ <executions>
+ <execution>
+ <id>copy-sources</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/main/java</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../src/scratchpad/src</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources</id>
+ <!-- here the phase you need -->
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/main/resources</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../src/resources/scratchpad</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-tests</id>
+ <!-- here the phase you need -->
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/test/java</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../src/scratchpad/testcases</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- clean copied sources afterwards -->
+ <plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven.plugin.clean.version}</version>
<configuration>
@@ -89,21 +89,21 @@
</filesets>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>poi-main</artifactId>
- <version>${project.version}</version>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>poi-main</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>poi-main</artifactId>
- <version>${project.version}</version>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>poi-main</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org