Changeset 16556 in josm


Ignore:
Timestamp:
2020-06-07T15:27:41+02:00 (5 weeks ago)
Author:
Don-vip
Message:

fix #19334 - Upgrade to error_prone 2.4.0

Location:
trunk
Files:
7 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/README

    r16262 r16556  
    155155    - checkstyle/           libs and config files for checkstyle (automatically detects code style
    156156                            problems in source code); can be launched as an ant target in build.xml
    157     - error_prone_ant.jar   used to detect code errors during compilation
    158157    - ivy/                  Apache Ivy binary, configuration file, and downloaded dependencies
    159158    - jacocoant.jar         used to include coverage data into JUnit test reports
     
    195194    -> https://github.com/drewnoakes/metadata-extractor
    196195* Signpost: OAuth library
    197     src/oauth, src/com/google
    198196    -> https://github.com/mttkay/signpost
    199197* MultiSplitPane: Small lib for GUI layout management
  • trunk/build.xml

    r16537 r16556  
    6464        <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
    6565        <property name="epsg.output" location="${resources.dir}/data/projection/custom-epsg"/>
    66         <property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
    67         <property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
    68         <property name="auto-value-annotations.jar" location="${tools.dir}/auto-value-annotations.jar"/>
    69         <property name="dataflow.jar" location="${tools.dir}/dataflow-shaded.jar"/>
    70         <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
    71         <property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
     66        <property name="error_prone_javac.jar" location="${tools.dir}/error_prone/javac.jar"/>
    7267        <property name="commons-lang3.jar" location="${tools.dir}/commons-lang3.jar"/>
    73         <property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
    7468        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
    7569        <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
     
    10599            <isset property="isJava9"/>
    106100        </condition>
    107         <path id="processor.path">
    108             <pathelement location="${error_prone_core.jar}"/>
    109             <pathelement location="${dataflow.jar}"/>
    110             <pathelement location="${javacutil.jar}"/>
    111             <pathelement location="${failureaccess.jar}"/>
    112             <pathelement location="${jformatstring.jar}"/>
    113             <pathelement location="${auto-value-annotations.jar}"/>
    114         </path>
    115101    </target>
    116102
     
    294280    </target>
    295281    <target name="compile" depends="init,javacc,compile-cots" unless="compile.notRequired" description="Compiles JOSM">
     282        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="errorprone.classpath" conf="errorprone"/>
     283        <ivy:retrieve log="download-only" file="${tools.ivy}" pattern="${tools.dir}/error_prone/[artifact].[ext]" conf="errorprone"/>
    296284        <!-- JOSM -->
    297285        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
    298             excludes="com/**,oauth/**,org/apache/commons/**,**/package-info.java"
     286            excludes="com/**,org/apache/commons/**,**/package-info.java"
    299287            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" encoding="UTF-8">
    300288            <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
    301289            <compilerarg line="-XDcompilePolicy=simple"/>
    302290            <compilerarg value="-processorpath"/>
    303             <compilerarg pathref="processor.path"/>
     291            <compilerarg pathref="errorprone.classpath"/>
    304292            <compilerarg value="-Xlint:cast"/>
    305293            <compilerarg value="-Xlint:deprecation"/>
     
    315303            <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
    316304            <compilerarg value="-XDignore.symbol.file"/>
    317             <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF -Xep:BadImport:OFF -Xep:UnnecessaryLambda:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF"/>
     305            <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF -Xep:BadImport:OFF -Xep:UnnecessaryLambda:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF -Xep:StaticAssignmentInConstructor:OFF"/>
    318306            <compilerarg line="-Xmaxwarns 1000"/>
    319307            <classpath>
     
    11471135        <delete dir="${lib.dir}"/>
    11481136        <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact]-[type].[ext]" conf="compile,runtime,sources,test"/>
    1149         <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle,pmd,spotbugs" file="${tools.ivy}"/>
     1137        <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle,pmd,spotbugs,errorprone" file="${tools.ivy}"/>
    11501138    </target>
    11511139    <target name="ivy-report" description="Generates Ivy reports of dependency resolving" depends="resolve">
  • trunk/tools

    • Property svn:ignore
      •  

        old new  
        11ivy-report
        22jacocoant.jar
         3error_prone
  • trunk/tools/ivy.xml

    r16391 r16556  
    99        <conf name="pmd" description="Everything needed for running PMD"/>
    1010        <conf name="spotbugs" description="Everything needed for running SpotBugs"/>
     11        <conf name="errorprone" description="Everything needed for running error-prone"/>
    1112    </configurations>
    1213    <dependencies>
     
    2728        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.0.1" conf="spotbugs->default"/>
    2829        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.0.1" conf="spotbugs->default"/>
     30        <!-- errorprone->default -->
     31        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.4.0" conf="errorprone->default"/>
    2932    </dependencies>
    3033</ivy-module>
Note: See TracChangeset for help on using the changeset viewer.