Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix detecting Java 6 versus Java 7 or higher for Findbugs-version, this did not really work for some reason. 

Use real Java version, not ant.java.version as this is not correctly set sometimes .
Also print out some more Ant-version-information

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1755962 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2016-08-11 12:00:53 +00:00
parent fe172d48d9
commit 79306792a0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.xml
View File

@ -283,12 +283,9 @@ 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 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"> <condition property="findbugs.version" value="2.0.3" else="3.0.1">
<equals arg1="${ant.java.version}" arg2="1.6"/> <contains string="${java.version}" substring="1.6"/>
</condition> </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"/> <property name="findbugs.jar" location="${main.lib}/findbugs-noUpdateChecks-${findbugs.version}.zip"/>
@ -441,7 +438,7 @@ under the License.
<target name="help" description="Prints Apache POI's Ant usage help"> <target name="help" description="Prints Apache POI's Ant usage help">
<echo> <echo>
This is POI ${version.id} This is POI ${version.id}
Java Version ${ant.java.version} Java Version ${ant.java.version}/${java.version}
Timestamp ${DSTAMP} Timestamp ${DSTAMP}
The main targets of interest are: The main targets of interest are:
- clean Erase all build work products (ie. everything in the build directory) - 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="${dist.dir}"/>
<mkdir dir="${build.site}"/> <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 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"> <scriptdef name="release_tag" language="javascript">
var rel = ("REL_"+project.getProperty("version.id")).toUpperCase().replace(/\W/g,"_"); var rel = ("REL_"+project.getProperty("version.id")).toUpperCase().replace(/\W/g,"_");