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 2016/08/19 20:57:56 UTC
svn commit: r1756967 [1/3] - in /poi/branches/hssf_cryptoapi: ./ sonar/
sonar/examples/ sonar/excelant/ sonar/main/ sonar/ooxml-schema-encryption/
sonar/ooxml-schema-security/ sonar/ooxml-schema/ sonar/ooxml/
sonar/scratchpad/ src/ooxml/java/org/apache...
Author: kiwiwings
Date: Fri Aug 19 20:57:56 2016
New Revision: 1756967
URL: http://svn.apache.org/viewvc?rev=1756967&view=rev
Log:
merge trunk to branch
Added:
poi/branches/hssf_cryptoapi/src/testcases/org/apache/poi/TestPOITestCase.java
- copied unchanged from r1756964, poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java
Modified:
poi/branches/hssf_cryptoapi/build.xml
poi/branches/hssf_cryptoapi/sonar/examples/pom.xml
poi/branches/hssf_cryptoapi/sonar/excelant/pom.xml
poi/branches/hssf_cryptoapi/sonar/main/pom.xml
poi/branches/hssf_cryptoapi/sonar/ooxml-schema-encryption/pom.xml
poi/branches/hssf_cryptoapi/sonar/ooxml-schema-security/pom.xml
poi/branches/hssf_cryptoapi/sonar/ooxml-schema/pom.xml
poi/branches/hssf_cryptoapi/sonar/ooxml/pom.xml
poi/branches/hssf_cryptoapi/sonar/pom.xml
poi/branches/hssf_cryptoapi/sonar/scratchpad/pom.xml
poi/branches/hssf_cryptoapi/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java (contents, props changed)
poi/branches/hssf_cryptoapi/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
poi/branches/hssf_cryptoapi/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
poi/branches/hssf_cryptoapi/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java
poi/branches/hssf_cryptoapi/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
poi/branches/hssf_cryptoapi/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
poi/branches/hssf_cryptoapi/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
poi/branches/hssf_cryptoapi/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
poi/branches/hssf_cryptoapi/src/testcases/org/apache/poi/POITestCase.java
Modified: poi/branches/hssf_cryptoapi/build.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/build.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/build.xml (original)
+++ poi/branches/hssf_cryptoapi/build.xml Fri Aug 19 20:57:56 2016
@@ -40,7 +40,7 @@ under the License.
<description>The Apache POI project Ant build.</description>
- <property name="version.id" value="3.15-beta3"/>
+ <property name="version.id" value="3.15-beta4"/>
<property name="release.rc" value="RC1"/>
<property environment="env"/>
@@ -283,13 +283,10 @@ under the License.
NOTE: we did not update to 3.x yet because it requires Java 7, but we are still supporting Java 6 currently
===========================================================================================================
-->
- <condition property="findbugs.jdk6">
- <equals arg1="${ant.java.version}" arg2="1.6"/>
+ <condition property="findbugs.version" value="2.0.3" else="3.0.1">
+ <contains string="${java.version}" substring="1.6"/>
</condition>
- <property name="findbugs.version" value="2.0.3" if:set="findbugs.jdk6"/>
- <property name="findbugs.version" value="3.0.1" unless:set="findbugs.jdk6"/>
- <echo message="Findbugs-Version: ${findbugs.version} for Java ${ant.java.version}"/>
- <property name="findbugs.url" value="http://prdownloads.sourceforge.net/findbugs/findbugs-noUpdateChecks-${findbugs.version}.zip?download"/>
+ <property name="findbugs.url" value="http://prdownloads.sourceforge.net/findbugs/findbugs-noUpdateChecks-${findbugs.version}.zip?download"/>
<property name="findbugs.jar" location="${main.lib}/findbugs-noUpdateChecks-${findbugs.version}.zip"/>
<propertyset id="junit.properties">
@@ -441,7 +438,7 @@ under the License.
<target name="help" description="Prints Apache POI's Ant usage help">
<echo>
This is POI ${version.id}
- Java Version ${ant.java.version}
+ Java Version ${ant.java.version}/${java.version}
Timestamp ${DSTAMP}
The main targets of interest are:
- clean Erase all build work products (ie. everything in the build directory)
@@ -480,7 +477,9 @@ under the License.
<mkdir dir="${dist.dir}"/>
<mkdir dir="${build.site}"/>
+ <echo message="Using Ant: ${ant.version} from ${ant.home}, Ant detected Java ${ant.java.version} (may be different than actual Java sometimes...)" />
<echo message="Using Java: ${java.version}/${java.runtime.version}/${java.vm.version}/${java.vm.name} from ${java.vm.vendor} on ${os.name}: ${os.version}" />
+ <echo message="Using Findbugs: ${findbugs.version} for Java ${java.version}"/>
<scriptdef name="release_tag" language="javascript">
var rel = ("REL_"+project.getProperty("version.id")).toUpperCase().replace(/\W/g,"_");
Modified: poi/branches/hssf_cryptoapi/sonar/examples/pom.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/sonar/examples/pom.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/sonar/examples/pom.xml (original)
+++ poi/branches/hssf_cryptoapi/sonar/examples/pom.xml Fri Aug 19 20:57:56 2016
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
- <version>3.15-beta3-SNAPSHOT</version>
+ <version>3.15-beta4-SNAPSHOT</version>
</parent>
<artifactId>poi-examples</artifactId>
<packaging>jar</packaging>
Modified: poi/branches/hssf_cryptoapi/sonar/excelant/pom.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/sonar/excelant/pom.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/sonar/excelant/pom.xml (original)
+++ poi/branches/hssf_cryptoapi/sonar/excelant/pom.xml Fri Aug 19 20:57:56 2016
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
- <version>3.15-beta3-SNAPSHOT</version>
+ <version>3.15-beta4-SNAPSHOT</version>
</parent>
<artifactId>poi-excelant</artifactId>
<packaging>jar</packaging>
Modified: poi/branches/hssf_cryptoapi/sonar/main/pom.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/sonar/main/pom.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/sonar/main/pom.xml (original)
+++ poi/branches/hssf_cryptoapi/sonar/main/pom.xml Fri Aug 19 20:57:56 2016
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
- <version>3.15-beta3-SNAPSHOT</version>
+ <version>3.15-beta4-SNAPSHOT</version>
</parent>
<artifactId>poi-main</artifactId>
<packaging>jar</packaging>
Modified: poi/branches/hssf_cryptoapi/sonar/ooxml-schema-encryption/pom.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/sonar/ooxml-schema-encryption/pom.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/sonar/ooxml-schema-encryption/pom.xml (original)
+++ poi/branches/hssf_cryptoapi/sonar/ooxml-schema-encryption/pom.xml Fri Aug 19 20:57:56 2016
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
- <version>3.15-beta3-SNAPSHOT</version>
+ <version>3.15-beta4-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>poi-ooxml-schema-encryption</artifactId>
Modified: poi/branches/hssf_cryptoapi/sonar/ooxml-schema-security/pom.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/sonar/ooxml-schema-security/pom.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/sonar/ooxml-schema-security/pom.xml (original)
+++ poi/branches/hssf_cryptoapi/sonar/ooxml-schema-security/pom.xml Fri Aug 19 20:57:56 2016
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
- <version>3.15-beta3-SNAPSHOT</version>
+ <version>3.15-beta4-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>poi-ooxml-schema-security</artifactId>
Modified: poi/branches/hssf_cryptoapi/sonar/ooxml-schema/pom.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/sonar/ooxml-schema/pom.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/sonar/ooxml-schema/pom.xml (original)
+++ poi/branches/hssf_cryptoapi/sonar/ooxml-schema/pom.xml Fri Aug 19 20:57:56 2016
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
- <version>3.15-beta3-SNAPSHOT</version>
+ <version>3.15-beta4-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>poi-ooxml-schema</artifactId>
Modified: poi/branches/hssf_cryptoapi/sonar/ooxml/pom.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/sonar/ooxml/pom.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/sonar/ooxml/pom.xml (original)
+++ poi/branches/hssf_cryptoapi/sonar/ooxml/pom.xml Fri Aug 19 20:57:56 2016
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
- <version>3.15-beta3-SNAPSHOT</version>
+ <version>3.15-beta4-SNAPSHOT</version>
</parent>
<artifactId>poi-ooxml</artifactId>
<packaging>jar</packaging>
Modified: poi/branches/hssf_cryptoapi/sonar/pom.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/sonar/pom.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/sonar/pom.xml (original)
+++ poi/branches/hssf_cryptoapi/sonar/pom.xml Fri Aug 19 20:57:56 2016
@@ -3,7 +3,7 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<packaging>pom</packaging>
- <version>3.15-beta3-SNAPSHOT</version>
+ <version>3.15-beta4-SNAPSHOT</version>
<name>Apache POI - the Java API for Microsoft Documents</name>
<description>Maven build of Apache POI for Sonar checks</description>
<url>http://poi.apache.org/</url>
Modified: poi/branches/hssf_cryptoapi/sonar/scratchpad/pom.xml
URL: http://svn.apache.org/viewvc/poi/branches/hssf_cryptoapi/sonar/scratchpad/pom.xml?rev=1756967&r1=1756966&r2=1756967&view=diff
==============================================================================
--- poi/branches/hssf_cryptoapi/sonar/scratchpad/pom.xml (original)
+++ poi/branches/hssf_cryptoapi/sonar/scratchpad/pom.xml Fri Aug 19 20:57:56 2016
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
- <version>3.15-beta3-SNAPSHOT</version>
+ <version>3.15-beta4-SNAPSHOT</version>
</parent>
<artifactId>poi-scratchpad</artifactId>
<packaging>jar</packaging>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org