You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2020/01/07 00:44:02 UTC

svn commit: r1872400 - in /poi/trunk/sonar: integration-test/ integration-test/pom.xml pom.xml

Author: kiwiwings
Date: Tue Jan  7 00:44:01 2020
New Revision: 1872400

URL: http://svn.apache.org/viewvc?rev=1872400&view=rev
Log:
add integration-test to sonar to update test coverage

Added:
    poi/trunk/sonar/integration-test/
    poi/trunk/sonar/integration-test/pom.xml
      - copied, changed from r1872397, poi/trunk/sonar/ooxml/pom.xml
Modified:
    poi/trunk/sonar/pom.xml

Copied: poi/trunk/sonar/integration-test/pom.xml (from r1872397, poi/trunk/sonar/ooxml/pom.xml)
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/integration-test/pom.xml?p2=poi/trunk/sonar/integration-test/pom.xml&p1=poi/trunk/sonar/ooxml/pom.xml&r1=1872397&r2=1872400&rev=1872400&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/integration-test/pom.xml Tue Jan  7 00:44:01 2020
@@ -8,10 +8,10 @@
         <artifactId>poi-parent</artifactId>
         <version>4.1.2-SNAPSHOT</version>
     </parent>
-    <artifactId>poi-ooxml</artifactId>
+    <artifactId>integration-test</artifactId>
     <packaging>jar</packaging>
 
-    <name>Apache POI OOXML package</name>
+    <name>Apache POI integration test</name>
 
     <build>
         <plugins>
@@ -21,36 +21,6 @@
                 <version>${maven.plugin.resources.version}</version>
                 <executions>
                     <execution>
-                        <id>copy-sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>../../src/ooxml/java</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/src/main/resources</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>../../src/resources/ooxml</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
                         <id>copy-tests</id>
                         <phase>generate-test-sources</phase>
                         <goals>
@@ -60,7 +30,7 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/ooxml/testcases</directory>
+                                    <directory>../../src/integrationtest</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -84,7 +54,7 @@
                         </fileset>
                     </filesets>
                 </configuration>
-            </plugin>			
+            </plugin>
 
 
             <!-- set jvm parameters for surefire plugin -->
@@ -94,6 +64,7 @@
                 <version>${maven.plugin.surefire.version}</version>
                 <configuration>
                     <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=${basedir}/target/tmp -XX:-OmitStackTraceInFastThrow</argLine>
+                    <workingDirectory>../..</workingDirectory>
                 </configuration>
             </plugin>
         </plugins>
@@ -102,65 +73,21 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>poi-ooxml-schema</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>poi-ooxml-schema-encryption</artifactId>
+            <artifactId>poi-ooxml</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>poi-ooxml-schema-security</artifactId>
+            <artifactId>poi-scratchpad</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>poi-main</artifactId>
+            <artifactId>poi-examples</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>poi-main</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
-          <groupId>org.apache.xmlbeans</groupId>
-          <artifactId>xmlbeans</artifactId>
-          <version>${xmlbeans.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.62</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.62</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.santuario</groupId>
-            <artifactId>xmlsec</artifactId>
-            <version>2.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>1.19</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.virtuald</groupId>
-            <artifactId>curvesapi</artifactId>
-            <version>1.06</version>
-        </dependency>
-  
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
@@ -180,17 +107,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>1.19</version>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.10.7</version>
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <!-- don't add it to the distribution -->
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-all</artifactId>
-            <version>1.11</version>
-        </dependency>
+
+
     </dependencies>
 </project>

Modified: poi/trunk/sonar/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/pom.xml?rev=1872400&r1=1872399&r2=1872400&view=diff
==============================================================================
--- poi/trunk/sonar/pom.xml (original)
+++ poi/trunk/sonar/pom.xml Tue Jan  7 00:44:01 2020
@@ -64,6 +64,7 @@
         <module>scratchpad</module>
         <module>excelant</module>
         <module>examples</module>
+        <module>integration-test</module>
     </modules>
 
     <properties>
@@ -73,15 +74,15 @@
 
         <!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
         <xmlbeans.version>3.1.0</xmlbeans.version>
-        <junit.version>4.12</junit.version>
-        <xmlunit.version>2.5.1</xmlunit.version>
+        <junit.version>4.13</junit.version>
+        <xmlunit.version>2.6.3</xmlunit.version>
         <mockito.version>2.13.0</mockito.version>
-        <maven.plugin.resources.version>3.0.1</maven.plugin.resources.version>
-        <maven.plugin.jar.version>3.0.1</maven.plugin.jar.version>
-        <maven.plugin.clean.version>3.0.0</maven.plugin.clean.version>
+        <maven.plugin.resources.version>3.1.0</maven.plugin.resources.version>
+        <maven.plugin.jar.version>3.2.0</maven.plugin.jar.version>
+        <maven.plugin.clean.version>3.1.0</maven.plugin.clean.version>
         <maven.plugin.download.version>1.1.0</maven.plugin.download.version>
         <maven.plugin.antrun.version>1.8</maven.plugin.antrun.version>
-        <maven.plugin.surefire.version>2.19.1</maven.plugin.surefire.version>
+        <maven.plugin.surefire.version>3.0.0-M4</maven.plugin.surefire.version>
     </properties>
 
     <build>
@@ -90,7 +91,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
+                    <version>3.8.1</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org