[pmd-commits] [pmd/pmd] c2dac2: Merge remote-tracking branch 'pmd/master'

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/pmd/pmd
  Commit: c2dac283c9306a8e91adf3b0ee76cf51151e9f62
      https://github.com/pmd/pmd/commit/c2dac283c9306a8e91adf3b0ee76cf51151e9f62
  Author: David Renz <dav...@up...>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
    M pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
    M pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
    M pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
    A pmd-core/src/test/java/net/sourceforge/pmd/cli/PMDTest.java
    A pmd-core/src/test/resources/net/sourceforge/pmd/cli/filelist.txt
    A pmd-core/src/test/resources/net/sourceforge/pmd/cli/filelist2.txt
    A pmd-core/src/test/resources/net/sourceforge/pmd/cli/src/anotherfile.dummy
    A pmd-core/src/test/resources/net/sourceforge/pmd/cli/src/somefile.dummy
    M pmd-java/src/main/resources/rulesets/java/naming.xml
    M pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/BooleanGetMethodName.xml
    A pmd-javascript/etc/grammar/es5.jj
    M pmd-javascript/pom.xml
    A pmd-javascript/src/main/ant/alljavacc.xml
    M pmd-javascript/src/main/java/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java
    M pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Parser.java
    A pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript5/Ecmascript5TokenManager.java
    M pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
    M src/site/markdown/overview/changelog.md
    M src/site/markdown/usage/running.md.vm

  Log Message:
  -----------
  Merge remote-tracking branch 'pmd/master'


  Commit: 918d1415dd5ba6c606786986aa59cc6b0cd3f1c8
      https://github.com/pmd/pmd/commit/918d1415dd5ba6c606786986aa59cc6b0cd3f1c8
  Author: David Renz <dav...@up...>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M pmd-apex/pom.xml
    M pmd-apex/repo/README.md
    A pmd-apex/repo/apex/apex-jorje-ide/1.0-sfdc-187-SNAPSHOT-55042bfc2e/apex-jorje-ide-1.0-sfdc-187-SNAPSHOT-55042bfc2e.jar
    A pmd-apex/repo/apex/apex-jorje-ide/1.0-sfdc-187-SNAPSHOT-55042bfc2e/apex-jorje-ide-1.0-sfdc-187-SNAPSHOT-55042bfc2e.pom
    R pmd-apex/repo/apex/apex-jorje-ide/1.0-sfdc-187-SNAPSHOT/apex-jorje-ide-1.0-sfdc-187-SNAPSHOT.jar
    R pmd-apex/repo/apex/apex-jorje-ide/1.0-sfdc-187-SNAPSHOT/apex-jorje-ide-1.0-sfdc-187-SNAPSHOT.pom
    R pmd-apex/repo/apex/apex-jorje-ide/1.0-sfdc-187-SNAPSHOT/maven-metadata-local.xml
    M pmd-apex/repo/apex/apex-jorje-ide/maven-metadata-local.xml
    A pmd-apex/repo/apex/apex-jorje-semantic/1.0-sfdc-187-SNAPSHOT-55042bfc2e/apex-jorje-semantic-1.0-sfdc-187-SNAPSHOT-55042bfc2e-tests.jar
    A pmd-apex/repo/apex/apex-jorje-semantic/1.0-sfdc-187-SNAPSHOT-55042bfc2e/apex-jorje-semantic-1.0-sfdc-187-SNAPSHOT-55042bfc2e.pom
    R pmd-apex/repo/apex/apex-jorje-semantic/1.0-sfdc-187-SNAPSHOT/apex-jorje-semantic-1.0-sfdc-187-SNAPSHOT-tests.jar
    R pmd-apex/repo/apex/apex-jorje-semantic/1.0-sfdc-187-SNAPSHOT/apex-jorje-semantic-1.0-sfdc-187-SNAPSHOT.pom
    R pmd-apex/repo/apex/apex-jorje-semantic/1.0-sfdc-187-SNAPSHOT/maven-metadata-local.xml
    M pmd-apex/repo/apex/apex-jorje-semantic/maven-metadata-local.xml
    M pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTrigger.java
    M pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/ExcessiveNodeCountRule.java
    M pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/ExcessivePublicCountRule.java
    M pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/StdCyclomaticComplexityRule.java
    A pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTriggerTest.java
    M pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
    A pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTestHelpers.java
    M pmd-core/pom.xml
    M pmd-core/src/main/java/net/sourceforge/pmd/cpd/CSVRenderer.java
    M pmd-core/src/test/java/net/sourceforge/pmd/cpd/CSVRendererTest.java
    M pmd-cpp/pom.xml
    M pmd-cs/pom.xml
    M pmd-dist/pom.xml
    M pmd-fortran/pom.xml
    M pmd-go/pom.xml
    M pmd-java/pom.xml
    M pmd-java8/pom.xml
    M pmd-javascript/pom.xml
    M pmd-jsp/pom.xml
    M pmd-matlab/pom.xml
    M pmd-objectivec/pom.xml
    M pmd-perl/pom.xml
    M pmd-php/pom.xml
    M pmd-plsql/pom.xml
    M pmd-python/pom.xml
    M pmd-ruby/pom.xml
    M pmd-scala/pom.xml
    M pmd-swift/pom.xml
    M pmd-test/pom.xml
    M pmd-ui/pom.xml
    M pmd-vm/pom.xml
    M pmd-xml/pom.xml
    M pom.xml
    M src/site/markdown/overview/changelog-old.md
    M src/site/markdown/overview/changelog.md

  Log Message:
  -----------
  Merge remote-tracking branch 'pmd/master'


  Commit: 947e2ec1ac3350c05f84cac44697bc1a7bf97d94
      https://github.com/pmd/pmd/commit/947e2ec1ac3350c05f84cac44697bc1a7bf97d94
  Author: David Renz <dav...@up...>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    A .travis-toolchains.xml
    M .travis.yml
    M pmd-core/src/main/java/net/sourceforge/pmd/cpd/XMLRenderer.java
    M pmd-core/src/test/java/net/sourceforge/pmd/cpd/CPDCommandLineInterfaceTest.java
    M pmd-javascript/pom.xml
    M pom.xml
    M src/site/markdown/overview/changelog.md

  Log Message:
  -----------
  Merge remote-tracking branch 'pmd/master'


Compare: https://github.com/pmd/pmd/compare/e95faa9f2828...947e2ec1ac33