From abc230c637c34dd9c2d0e709b6029be211307e23 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sun, 7 Jun 2020 11:51:10 +0200 Subject: [PATCH] [scala] Refactor project structure * Avoid using symlinks, this is very difficult to get working under Windows * Provide names for the different scala modules * Rename pmd-scala to pmd-scala-common * Restore main module pmd-scala for backwards compatibility --- .../pmd/lang/ast/test/BaseTreeDumpTest.kt | 2 +- pmd-scala-modules/pmd-scala-common/README.md | 8 ++ .../sourceforge/pmd/cpd/ScalaLanguage.java | 0 .../sourceforge/pmd/cpd/ScalaTokenizer.java | 0 .../pmd/lang/scala/ScalaLanguageHandler.java | 0 .../pmd/lang/scala/ScalaLanguageModule.java | 0 .../pmd/lang/scala/ScalaParser.java | 0 .../pmd/lang/scala/ScalaTreeBuilder.java | 0 .../pmd/lang/scala/ast/ASTCase.java | 0 .../pmd/lang/scala/ast/ASTCtorPrimary.java | 0 .../pmd/lang/scala/ast/ASTCtorSecondary.java | 0 .../pmd/lang/scala/ast/ASTDeclDef.java | 0 .../pmd/lang/scala/ast/ASTDeclType.java | 0 .../pmd/lang/scala/ast/ASTDeclVal.java | 0 .../pmd/lang/scala/ast/ASTDeclVar.java | 0 .../pmd/lang/scala/ast/ASTDefnClass.java | 0 .../pmd/lang/scala/ast/ASTDefnDef.java | 0 .../pmd/lang/scala/ast/ASTDefnMacro.java | 0 .../pmd/lang/scala/ast/ASTDefnObject.java | 0 .../pmd/lang/scala/ast/ASTDefnTrait.java | 0 .../pmd/lang/scala/ast/ASTDefnType.java | 0 .../pmd/lang/scala/ast/ASTDefnVal.java | 0 .../pmd/lang/scala/ast/ASTDefnVar.java | 0 .../scala/ast/ASTEnumeratorGenerator.java | 0 .../lang/scala/ast/ASTEnumeratorGuard.java | 0 .../pmd/lang/scala/ast/ASTEnumeratorVal.java | 0 .../pmd/lang/scala/ast/ASTImport.java | 0 .../pmd/lang/scala/ast/ASTImporteeName.java | 0 .../pmd/lang/scala/ast/ASTImporteeRename.java | 0 .../lang/scala/ast/ASTImporteeUnimport.java | 0 .../lang/scala/ast/ASTImporteeWildcard.java | 0 .../pmd/lang/scala/ast/ASTImporter.java | 0 .../pmd/lang/scala/ast/ASTInit.java | 0 .../pmd/lang/scala/ast/ASTLitBoolean.java | 0 .../pmd/lang/scala/ast/ASTLitByte.java | 0 .../pmd/lang/scala/ast/ASTLitChar.java | 0 .../pmd/lang/scala/ast/ASTLitDouble.java | 0 .../pmd/lang/scala/ast/ASTLitFloat.java | 0 .../pmd/lang/scala/ast/ASTLitInt.java | 0 .../pmd/lang/scala/ast/ASTLitLong.java | 0 .../pmd/lang/scala/ast/ASTLitNull.java | 0 .../pmd/lang/scala/ast/ASTLitShort.java | 0 .../pmd/lang/scala/ast/ASTLitString.java | 0 .../pmd/lang/scala/ast/ASTLitSymbol.java | 0 .../pmd/lang/scala/ast/ASTLitUnit.java | 0 .../pmd/lang/scala/ast/ASTModAbstract.java | 0 .../pmd/lang/scala/ast/ASTModAnnot.java | 0 .../pmd/lang/scala/ast/ASTModCase.java | 0 .../lang/scala/ast/ASTModContravariant.java | 0 .../pmd/lang/scala/ast/ASTModCovariant.java | 0 .../pmd/lang/scala/ast/ASTModFinal.java | 0 .../pmd/lang/scala/ast/ASTModImplicit.java | 0 .../pmd/lang/scala/ast/ASTModInline.java | 0 .../pmd/lang/scala/ast/ASTModLazy.java | 0 .../pmd/lang/scala/ast/ASTModOverride.java | 0 .../pmd/lang/scala/ast/ASTModPrivate.java | 0 .../pmd/lang/scala/ast/ASTModProtected.java | 0 .../pmd/lang/scala/ast/ASTModSealed.java | 0 .../pmd/lang/scala/ast/ASTModValParam.java | 0 .../pmd/lang/scala/ast/ASTModVarParam.java | 0 .../pmd/lang/scala/ast/ASTNameAnonymous.java | 0 .../lang/scala/ast/ASTNameIndeterminate.java | 0 .../pmd/lang/scala/ast/ASTPatAlternative.java | 0 .../pmd/lang/scala/ast/ASTPatBind.java | 0 .../pmd/lang/scala/ast/ASTPatExtract.java | 0 .../lang/scala/ast/ASTPatExtractInfix.java | 0 .../pmd/lang/scala/ast/ASTPatInterpolate.java | 0 .../pmd/lang/scala/ast/ASTPatSeqWildcard.java | 0 .../pmd/lang/scala/ast/ASTPatTuple.java | 0 .../pmd/lang/scala/ast/ASTPatTyped.java | 0 .../pmd/lang/scala/ast/ASTPatVar.java | 0 .../pmd/lang/scala/ast/ASTPatWildcard.java | 0 .../pmd/lang/scala/ast/ASTPatXml.java | 0 .../pmd/lang/scala/ast/ASTPkg.java | 0 .../pmd/lang/scala/ast/ASTPkgObject.java | 0 .../pmd/lang/scala/ast/ASTQuasi.java | 0 .../pmd/lang/scala/ast/ASTSelf.java | 0 .../pmd/lang/scala/ast/ASTSource.java | 0 .../pmd/lang/scala/ast/ASTTemplate.java | 0 .../pmd/lang/scala/ast/ASTTermAnnotate.java | 0 .../pmd/lang/scala/ast/ASTTermApply.java | 0 .../pmd/lang/scala/ast/ASTTermApplyInfix.java | 0 .../pmd/lang/scala/ast/ASTTermApplyType.java | 0 .../pmd/lang/scala/ast/ASTTermApplyUnary.java | 0 .../pmd/lang/scala/ast/ASTTermAscribe.java | 0 .../pmd/lang/scala/ast/ASTTermAssign.java | 0 .../pmd/lang/scala/ast/ASTTermBlock.java | 0 .../pmd/lang/scala/ast/ASTTermDo.java | 0 .../pmd/lang/scala/ast/ASTTermEta.java | 0 .../pmd/lang/scala/ast/ASTTermFor.java | 0 .../pmd/lang/scala/ast/ASTTermForYield.java | 0 .../pmd/lang/scala/ast/ASTTermFunction.java | 0 .../pmd/lang/scala/ast/ASTTermIf.java | 0 .../lang/scala/ast/ASTTermInterpolate.java | 0 .../pmd/lang/scala/ast/ASTTermMatch.java | 0 .../pmd/lang/scala/ast/ASTTermName.java | 0 .../pmd/lang/scala/ast/ASTTermNew.java | 0 .../lang/scala/ast/ASTTermNewAnonymous.java | 0 .../pmd/lang/scala/ast/ASTTermParam.java | 0 .../scala/ast/ASTTermPartialFunction.java | 0 .../lang/scala/ast/ASTTermPlaceholder.java | 0 .../pmd/lang/scala/ast/ASTTermRepeated.java | 0 .../pmd/lang/scala/ast/ASTTermReturn.java | 0 .../pmd/lang/scala/ast/ASTTermSelect.java | 0 .../pmd/lang/scala/ast/ASTTermSuper.java | 0 .../pmd/lang/scala/ast/ASTTermThis.java | 0 .../pmd/lang/scala/ast/ASTTermThrow.java | 0 .../pmd/lang/scala/ast/ASTTermTry.java | 0 .../lang/scala/ast/ASTTermTryWithHandler.java | 0 .../pmd/lang/scala/ast/ASTTermTuple.java | 0 .../pmd/lang/scala/ast/ASTTermWhile.java | 0 .../pmd/lang/scala/ast/ASTTermXml.java | 0 .../pmd/lang/scala/ast/ASTTypeAnd.java | 0 .../pmd/lang/scala/ast/ASTTypeAnnotate.java | 0 .../pmd/lang/scala/ast/ASTTypeApply.java | 0 .../pmd/lang/scala/ast/ASTTypeApplyInfix.java | 0 .../pmd/lang/scala/ast/ASTTypeBounds.java | 0 .../pmd/lang/scala/ast/ASTTypeByName.java | 0 .../lang/scala/ast/ASTTypeExistential.java | 0 .../pmd/lang/scala/ast/ASTTypeFunction.java | 0 .../scala/ast/ASTTypeImplicitFunction.java | 0 .../pmd/lang/scala/ast/ASTTypeLambda.java | 0 .../pmd/lang/scala/ast/ASTTypeMethod.java | 0 .../pmd/lang/scala/ast/ASTTypeName.java | 0 .../pmd/lang/scala/ast/ASTTypeOr.java | 0 .../pmd/lang/scala/ast/ASTTypeParam.java | 0 .../lang/scala/ast/ASTTypePlaceholder.java | 0 .../pmd/lang/scala/ast/ASTTypeProject.java | 0 .../pmd/lang/scala/ast/ASTTypeRefine.java | 0 .../pmd/lang/scala/ast/ASTTypeRepeated.java | 0 .../pmd/lang/scala/ast/ASTTypeSelect.java | 0 .../pmd/lang/scala/ast/ASTTypeSingleton.java | 0 .../pmd/lang/scala/ast/ASTTypeTuple.java | 0 .../pmd/lang/scala/ast/ASTTypeVar.java | 0 .../pmd/lang/scala/ast/ASTTypeWith.java | 0 .../pmd/lang/scala/ast/AbstractScalaNode.java | 0 .../pmd/lang/scala/ast/ScalaNode.java | 0 .../lang/scala/ast/ScalaParserVisitor.java | 0 .../scala/ast/ScalaParserVisitorAdapter.java | 0 .../pmd/lang/scala/rule/ScalaRule.java | 0 .../scala/rule/ScalaRuleChainVisitor.java | 0 .../scala/rule/ScalaRuleViolationFactory.java | 0 .../services/net.sourceforge.pmd.cpd.Language | 0 .../net.sourceforge.pmd.lang.Language | 0 .../category/scala/bestpractices.xml | 0 .../category/scala/categories.properties | 0 .../resources/category/scala/codestyle.xml | 0 .../main/resources/category/scala/design.xml | 0 .../category/scala/documentation.xml | 0 .../resources/category/scala/errorprone.xml | 0 .../category/scala/multithreading.xml | 0 .../resources/category/scala/performance.xml | 0 .../resources/category/scala/security.xml | 0 .../plugins/scala/compiler/Compiler.scala | 0 .../sonar/plugins/scala/compiler/Lexer.scala | 0 .../sonar/plugins/scala/compiler/Parser.scala | 0 .../sonar/plugins/scala/compiler/Token.scala | 0 .../plugins/scala/language/CodeDetector.scala | 0 .../sourceforge/pmd/LanguageVersionTest.java | 0 .../sourceforge/pmd/RulesetFactoryTest.java | 0 .../pmd/cpd/ScalaTokenizerTest.java | 0 .../pmd/lang/scala/ast/BaseScalaTest.java | 0 .../lang/scala/ast/ScalaParsingHelper.java | 0 .../pmd/lang/scala/rule/ScalaRuleTest.java | 0 .../pmd/lang/scala/rule/XPathRuleTest.java | 0 .../pmd/lang/scala/ast/ScalaParserTests.kt | 0 .../pmd/lang/scala/ast/ScalaTreeTests.kt | 0 .../pmd/lang/scala/ast/testdata/List.scala | 0 .../pmd/lang/scala/ast/testdata/List.txt | 0 .../pmd/lang/scala/ast/testdata/package.scala | 0 .../pmd/lang/scala/ast/testdata/package.txt | 0 .../resources/parserFiles/helloworld.scala | 0 .../tokenizerFiles/sample-LiftActor.scala | 0 pmd-scala-modules/pmd-scala_2.12/pom.xml | 94 ++++++++++--------- pmd-scala-modules/pmd-scala_2.12/src | 1 - pmd-scala-modules/pmd-scala_2.13/pom.xml | 60 +++++++++--- pmd-scala-modules/pmd-scala_2.13/src | 1 - .../pmd-scala => pmd-scala}/pom.xml | 16 +++- pom.xml | 4 +- 179 files changed, 119 insertions(+), 67 deletions(-) create mode 100644 pmd-scala-modules/pmd-scala-common/README.md rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/cpd/ScalaLanguage.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageHandler.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ScalaTreeBuilder.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaNode.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitor.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleChainVisitor.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleViolationFactory.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/category/scala/bestpractices.xml (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/category/scala/categories.properties (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/category/scala/codestyle.xml (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/category/scala/design.xml (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/category/scala/documentation.xml (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/category/scala/errorprone.xml (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/category/scala/multithreading.xml (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/category/scala/performance.xml (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/resources/category/scala/security.xml (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/scala/org/sonar/plugins/scala/compiler/Compiler.scala (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/scala/org/sonar/plugins/scala/compiler/Lexer.scala (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/scala/org/sonar/plugins/scala/compiler/Parser.scala (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/scala/org/sonar/plugins/scala/compiler/Token.scala (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/main/scala/org/sonar/plugins/scala/language/CodeDetector.scala (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/java/net/sourceforge/pmd/RulesetFactoryTest.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/java/net/sourceforge/pmd/cpd/ScalaTokenizerTest.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/java/net/sourceforge/pmd/lang/scala/ast/BaseScalaTest.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/java/net/sourceforge/pmd/lang/scala/rule/XPathRuleTest.java (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaParserTests.kt (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.scala (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.scala (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/resources/parserFiles/helloworld.scala (100%) rename pmd-scala-modules/{pmd-scala => pmd-scala-common}/src/test/resources/tokenizerFiles/sample-LiftActor.scala (100%) delete mode 120000 pmd-scala-modules/pmd-scala_2.12/src delete mode 120000 pmd-scala-modules/pmd-scala_2.13/src rename {pmd-scala-modules/pmd-scala => pmd-scala}/pom.xml (56%) diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseTreeDumpTest.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseTreeDumpTest.kt index 4e52a66651..4fab7ba383 100644 --- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseTreeDumpTest.kt +++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseTreeDumpTest.kt @@ -51,7 +51,7 @@ abstract class BaseTreeDumpTest( // Outputting a path makes for better error messages private val srcTestResources = let { - // this is set from maven surefire + // this is set from maven surefire - see parent pom.xml configuration for surefire (systemPropertyVariables) System.getProperty("mvn.project.src.test.resources") ?.let { Paths.get(it).toAbsolutePath() } // that's for when the tests are run inside the IDE diff --git a/pmd-scala-modules/pmd-scala-common/README.md b/pmd-scala-modules/pmd-scala-common/README.md new file mode 100644 index 0000000000..19624d2dec --- /dev/null +++ b/pmd-scala-modules/pmd-scala-common/README.md @@ -0,0 +1,8 @@ +# pmd-scala-common + +Contains shared code for the pmd-scala_2.12 and pmd-scala_2.13 modules. + +It is not a module in itself, since it needs to be used while cross-compiling +with a specific scala version. + +It should be source compatible with the oldest scala version we are supporting. diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/cpd/ScalaLanguage.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaLanguage.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/cpd/ScalaLanguage.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaLanguage.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageHandler.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageHandler.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageHandler.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageHandler.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaTreeBuilder.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaTreeBuilder.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaTreeBuilder.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaTreeBuilder.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaNode.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaNode.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaNode.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaNode.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitor.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitor.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitor.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitor.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleChainVisitor.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleChainVisitor.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleChainVisitor.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleChainVisitor.java diff --git a/pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleViolationFactory.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleViolationFactory.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleViolationFactory.java rename to pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleViolationFactory.java diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language b/pmd-scala-modules/pmd-scala-common/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language rename to pmd-scala-modules/pmd-scala-common/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language b/pmd-scala-modules/pmd-scala-common/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language rename to pmd-scala-modules/pmd-scala-common/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/category/scala/bestpractices.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/bestpractices.xml similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/category/scala/bestpractices.xml rename to pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/bestpractices.xml diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/category/scala/categories.properties b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/categories.properties similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/category/scala/categories.properties rename to pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/categories.properties diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/category/scala/codestyle.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/codestyle.xml similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/category/scala/codestyle.xml rename to pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/codestyle.xml diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/category/scala/design.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/design.xml similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/category/scala/design.xml rename to pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/design.xml diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/category/scala/documentation.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/documentation.xml similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/category/scala/documentation.xml rename to pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/documentation.xml diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/category/scala/errorprone.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/errorprone.xml similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/category/scala/errorprone.xml rename to pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/errorprone.xml diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/category/scala/multithreading.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/multithreading.xml similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/category/scala/multithreading.xml rename to pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/multithreading.xml diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/category/scala/performance.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/performance.xml similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/category/scala/performance.xml rename to pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/performance.xml diff --git a/pmd-scala-modules/pmd-scala/src/main/resources/category/scala/security.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/security.xml similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/resources/category/scala/security.xml rename to pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/security.xml diff --git a/pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/compiler/Compiler.scala b/pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/compiler/Compiler.scala similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/compiler/Compiler.scala rename to pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/compiler/Compiler.scala diff --git a/pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/compiler/Lexer.scala b/pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/compiler/Lexer.scala similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/compiler/Lexer.scala rename to pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/compiler/Lexer.scala diff --git a/pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/compiler/Parser.scala b/pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/compiler/Parser.scala similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/compiler/Parser.scala rename to pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/compiler/Parser.scala diff --git a/pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/compiler/Token.scala b/pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/compiler/Token.scala similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/compiler/Token.scala rename to pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/compiler/Token.scala diff --git a/pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/language/CodeDetector.scala b/pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/language/CodeDetector.scala similarity index 100% rename from pmd-scala-modules/pmd-scala/src/main/scala/org/sonar/plugins/scala/language/CodeDetector.scala rename to pmd-scala-modules/pmd-scala-common/src/main/scala/org/sonar/plugins/scala/language/CodeDetector.scala diff --git a/pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java rename to pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java diff --git a/pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/RulesetFactoryTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/RulesetFactoryTest.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/RulesetFactoryTest.java rename to pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/RulesetFactoryTest.java diff --git a/pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/cpd/ScalaTokenizerTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/cpd/ScalaTokenizerTest.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/cpd/ScalaTokenizerTest.java rename to pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/cpd/ScalaTokenizerTest.java diff --git a/pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/BaseScalaTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/ast/BaseScalaTest.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/BaseScalaTest.java rename to pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/ast/BaseScalaTest.java diff --git a/pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java rename to pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java diff --git a/pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java rename to pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java diff --git a/pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/XPathRuleTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/XPathRuleTest.java similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/XPathRuleTest.java rename to pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/XPathRuleTest.java diff --git a/pmd-scala-modules/pmd-scala/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaParserTests.kt b/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaParserTests.kt similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaParserTests.kt rename to pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaParserTests.kt diff --git a/pmd-scala-modules/pmd-scala/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt b/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt rename to pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt diff --git a/pmd-scala-modules/pmd-scala/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.scala b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.scala similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.scala rename to pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.scala diff --git a/pmd-scala-modules/pmd-scala/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt rename to pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt diff --git a/pmd-scala-modules/pmd-scala/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.scala b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.scala similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.scala rename to pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.scala diff --git a/pmd-scala-modules/pmd-scala/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt rename to pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt diff --git a/pmd-scala-modules/pmd-scala/src/test/resources/parserFiles/helloworld.scala b/pmd-scala-modules/pmd-scala-common/src/test/resources/parserFiles/helloworld.scala similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/resources/parserFiles/helloworld.scala rename to pmd-scala-modules/pmd-scala-common/src/test/resources/parserFiles/helloworld.scala diff --git a/pmd-scala-modules/pmd-scala/src/test/resources/tokenizerFiles/sample-LiftActor.scala b/pmd-scala-modules/pmd-scala-common/src/test/resources/tokenizerFiles/sample-LiftActor.scala similarity index 100% rename from pmd-scala-modules/pmd-scala/src/test/resources/tokenizerFiles/sample-LiftActor.scala rename to pmd-scala-modules/pmd-scala-common/src/test/resources/tokenizerFiles/sample-LiftActor.scala diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml index 8a0637fc69..8930224f8e 100644 --- a/pmd-scala-modules/pmd-scala_2.12/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml @@ -1,35 +1,36 @@ - + 4.0.0 + PMD Scala for Scala 2.12 pmd-scala_2.12 - + net.sourceforge.pmd pmd 6.25.0-SNAPSHOT ../.. - + 2.12 4.2.0 - + - - - - - - - - - - - - + ../pmd-scala-common/src/main/java + + + ../pmd-scala-common/src/main/resources + + + ../pmd-scala-common/src/test/java + + + ../pmd-scala-common/src/test/resources + + + maven-resources-plugin @@ -40,37 +41,40 @@ - + kotlin-maven-plugin org.jetbrains.kotlin - - - - - - - - - - - - - - - - - - - - - - + + + compile + + compile + + + + ../pmd-scala-common/src/main/kotlin + ../pmd-scala-common/src/main/java + + + + + test-compile + + test-compile + + + + ../pmd-scala-common/src/test/kotlin + ../pmd-scala-common/src/test/java + + + + - - + org.scalameta @@ -81,7 +85,7 @@ net.sourceforge.pmd pmd-core - + junit junit @@ -103,6 +107,4 @@ test - - diff --git a/pmd-scala-modules/pmd-scala_2.12/src b/pmd-scala-modules/pmd-scala_2.12/src deleted file mode 120000 index f1fe577fe1..0000000000 --- a/pmd-scala-modules/pmd-scala_2.12/src +++ /dev/null @@ -1 +0,0 @@ -../pmd-scala/src/ \ No newline at end of file diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml index 9466e1ef02..1214bb25d7 100644 --- a/pmd-scala-modules/pmd-scala_2.13/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml @@ -1,23 +1,36 @@ - + 4.0.0 + PMD Scala for Scala 2.13 pmd-scala_2.13 - + net.sourceforge.pmd pmd 6.25.0-SNAPSHOT ../.. - + 2.13 4.2.0 - + + ../pmd-scala-common/src/main/java + + + ../pmd-scala-common/src/main/resources + + + ../pmd-scala-common/src/test/java + + + ../pmd-scala-common/src/test/resources + + + maven-resources-plugin @@ -28,15 +41,40 @@ - + kotlin-maven-plugin org.jetbrains.kotlin + + + compile + + compile + + + + ../pmd-scala-common/src/main/kotlin + ../pmd-scala-common/src/main/java + + + + + test-compile + + test-compile + + + + ../pmd-scala-common/src/test/kotlin + ../pmd-scala-common/src/test/java + + + + - - + org.scalameta @@ -47,7 +85,7 @@ net.sourceforge.pmd pmd-core - + junit junit @@ -69,6 +107,4 @@ test - - diff --git a/pmd-scala-modules/pmd-scala_2.13/src b/pmd-scala-modules/pmd-scala_2.13/src deleted file mode 120000 index f1fe577fe1..0000000000 --- a/pmd-scala-modules/pmd-scala_2.13/src +++ /dev/null @@ -1 +0,0 @@ -../pmd-scala/src/ \ No newline at end of file diff --git a/pmd-scala-modules/pmd-scala/pom.xml b/pmd-scala/pom.xml similarity index 56% rename from pmd-scala-modules/pmd-scala/pom.xml rename to pmd-scala/pom.xml index 135af11711..5657463f77 100644 --- a/pmd-scala-modules/pmd-scala/pom.xml +++ b/pmd-scala/pom.xml @@ -4,14 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 pmd-scala - PMD Scala + PMD Scala - Transitional package (deprecated) + This is deprecated, use pmd-scala_2.13 directly pom - + net.sourceforge.pmd pmd 6.25.0-SNAPSHOT - ../.. + ../ - + + + + ${project.groupId} + pmd-scala_2.13 + ${project.version} + + diff --git a/pom.xml b/pom.xml index 7408e4e548..8793ac0b89 100644 --- a/pom.xml +++ b/pom.xml @@ -256,7 +256,7 @@ once alphabetical - ${project.basedir}/src/test/resources + ${project.build.testResources[0].directory} @@ -1030,7 +1030,7 @@ pmd-plsql pmd-python pmd-ruby - pmd-scala-modules/pmd-scala + pmd-scala pmd-scala-modules/pmd-scala_2.13 pmd-scala-modules/pmd-scala_2.12 pmd-swift