diff --git a/java/ql/examples/qlpack.yml b/java/ql/examples/qlpack.yml index 5f87efb4c27..98265c98bc1 100644 --- a/java/ql/examples/qlpack.yml +++ b/java/ql/examples/qlpack.yml @@ -1,3 +1,3 @@ name: codeql-java-examples version: 0.0.0 -libraryPathDependencies: codeql-java +libraryPathDependencies: codeql/java-all diff --git a/java/ql/src/Customizations.qll b/java/ql/lib/Customizations.qll similarity index 100% rename from java/ql/src/Customizations.qll rename to java/ql/lib/Customizations.qll diff --git a/java/ql/src/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme similarity index 100% rename from java/ql/src/config/semmlecode.dbscheme rename to java/ql/lib/config/semmlecode.dbscheme diff --git a/java/ql/src/config/semmlecode.dbscheme.stats b/java/ql/lib/config/semmlecode.dbscheme.stats similarity index 100% rename from java/ql/src/config/semmlecode.dbscheme.stats rename to java/ql/lib/config/semmlecode.dbscheme.stats diff --git a/java/ql/src/java.qll b/java/ql/lib/java.qll similarity index 100% rename from java/ql/src/java.qll rename to java/ql/lib/java.qll diff --git a/java/ql/lib/qlpack.lock.yml b/java/ql/lib/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/java/ql/lib/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml new file mode 100644 index 00000000000..eb189236c2a --- /dev/null +++ b/java/ql/lib/qlpack.yml @@ -0,0 +1,7 @@ +name: codeql/java-all +version: 0.0.2 +dbscheme: config/semmlecode.dbscheme +extractor: java +library: true +dependencies: + codeql/java-upgrades: 0.0.2 diff --git a/java/ql/src/semmle/code/FileSystem.qll b/java/ql/lib/semmle/code/FileSystem.qll similarity index 100% rename from java/ql/src/semmle/code/FileSystem.qll rename to java/ql/lib/semmle/code/FileSystem.qll diff --git a/java/ql/src/semmle/code/Location.qll b/java/ql/lib/semmle/code/Location.qll similarity index 100% rename from java/ql/src/semmle/code/Location.qll rename to java/ql/lib/semmle/code/Location.qll diff --git a/java/ql/src/semmle/code/SMAP.qll b/java/ql/lib/semmle/code/SMAP.qll similarity index 100% rename from java/ql/src/semmle/code/SMAP.qll rename to java/ql/lib/semmle/code/SMAP.qll diff --git a/java/ql/src/semmle/code/Unit.qll b/java/ql/lib/semmle/code/Unit.qll similarity index 100% rename from java/ql/src/semmle/code/Unit.qll rename to java/ql/lib/semmle/code/Unit.qll diff --git a/java/ql/src/semmle/code/configfiles/ConfigFiles.qll b/java/ql/lib/semmle/code/configfiles/ConfigFiles.qll similarity index 100% rename from java/ql/src/semmle/code/configfiles/ConfigFiles.qll rename to java/ql/lib/semmle/code/configfiles/ConfigFiles.qll diff --git a/java/ql/src/semmle/code/java/Annotation.qll b/java/ql/lib/semmle/code/java/Annotation.qll similarity index 100% rename from java/ql/src/semmle/code/java/Annotation.qll rename to java/ql/lib/semmle/code/java/Annotation.qll diff --git a/java/ql/src/semmle/code/java/Collections.qll b/java/ql/lib/semmle/code/java/Collections.qll similarity index 100% rename from java/ql/src/semmle/code/java/Collections.qll rename to java/ql/lib/semmle/code/java/Collections.qll diff --git a/java/ql/src/semmle/code/java/CompilationUnit.qll b/java/ql/lib/semmle/code/java/CompilationUnit.qll similarity index 100% rename from java/ql/src/semmle/code/java/CompilationUnit.qll rename to java/ql/lib/semmle/code/java/CompilationUnit.qll diff --git a/java/ql/src/semmle/code/java/Completion.qll b/java/ql/lib/semmle/code/java/Completion.qll similarity index 100% rename from java/ql/src/semmle/code/java/Completion.qll rename to java/ql/lib/semmle/code/java/Completion.qll diff --git a/java/ql/src/semmle/code/java/Concurrency.qll b/java/ql/lib/semmle/code/java/Concurrency.qll similarity index 100% rename from java/ql/src/semmle/code/java/Concurrency.qll rename to java/ql/lib/semmle/code/java/Concurrency.qll diff --git a/java/ql/src/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll similarity index 100% rename from java/ql/src/semmle/code/java/ControlFlowGraph.qll rename to java/ql/lib/semmle/code/java/ControlFlowGraph.qll diff --git a/java/ql/src/semmle/code/java/Conversions.qll b/java/ql/lib/semmle/code/java/Conversions.qll similarity index 100% rename from java/ql/src/semmle/code/java/Conversions.qll rename to java/ql/lib/semmle/code/java/Conversions.qll diff --git a/java/ql/src/semmle/code/java/Dependency.qll b/java/ql/lib/semmle/code/java/Dependency.qll similarity index 100% rename from java/ql/src/semmle/code/java/Dependency.qll rename to java/ql/lib/semmle/code/java/Dependency.qll diff --git a/java/ql/src/semmle/code/java/DependencyCounts.qll b/java/ql/lib/semmle/code/java/DependencyCounts.qll similarity index 100% rename from java/ql/src/semmle/code/java/DependencyCounts.qll rename to java/ql/lib/semmle/code/java/DependencyCounts.qll diff --git a/java/ql/src/semmle/code/java/Element.qll b/java/ql/lib/semmle/code/java/Element.qll similarity index 100% rename from java/ql/src/semmle/code/java/Element.qll rename to java/ql/lib/semmle/code/java/Element.qll diff --git a/java/ql/src/semmle/code/java/Exception.qll b/java/ql/lib/semmle/code/java/Exception.qll similarity index 100% rename from java/ql/src/semmle/code/java/Exception.qll rename to java/ql/lib/semmle/code/java/Exception.qll diff --git a/java/ql/src/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll similarity index 100% rename from java/ql/src/semmle/code/java/Expr.qll rename to java/ql/lib/semmle/code/java/Expr.qll diff --git a/java/ql/src/semmle/code/java/GeneratedFiles.qll b/java/ql/lib/semmle/code/java/GeneratedFiles.qll similarity index 100% rename from java/ql/src/semmle/code/java/GeneratedFiles.qll rename to java/ql/lib/semmle/code/java/GeneratedFiles.qll diff --git a/java/ql/src/semmle/code/java/Generics.qll b/java/ql/lib/semmle/code/java/Generics.qll similarity index 100% rename from java/ql/src/semmle/code/java/Generics.qll rename to java/ql/lib/semmle/code/java/Generics.qll diff --git a/java/ql/src/semmle/code/java/Import.qll b/java/ql/lib/semmle/code/java/Import.qll similarity index 100% rename from java/ql/src/semmle/code/java/Import.qll rename to java/ql/lib/semmle/code/java/Import.qll diff --git a/java/ql/src/semmle/code/java/J2EE.qll b/java/ql/lib/semmle/code/java/J2EE.qll similarity index 100% rename from java/ql/src/semmle/code/java/J2EE.qll rename to java/ql/lib/semmle/code/java/J2EE.qll diff --git a/java/ql/src/semmle/code/java/JDK.qll b/java/ql/lib/semmle/code/java/JDK.qll similarity index 100% rename from java/ql/src/semmle/code/java/JDK.qll rename to java/ql/lib/semmle/code/java/JDK.qll diff --git a/java/ql/src/semmle/code/java/JDKAnnotations.qll b/java/ql/lib/semmle/code/java/JDKAnnotations.qll similarity index 100% rename from java/ql/src/semmle/code/java/JDKAnnotations.qll rename to java/ql/lib/semmle/code/java/JDKAnnotations.qll diff --git a/java/ql/src/semmle/code/java/JMX.qll b/java/ql/lib/semmle/code/java/JMX.qll similarity index 100% rename from java/ql/src/semmle/code/java/JMX.qll rename to java/ql/lib/semmle/code/java/JMX.qll diff --git a/java/ql/src/semmle/code/java/Javadoc.qll b/java/ql/lib/semmle/code/java/Javadoc.qll similarity index 100% rename from java/ql/src/semmle/code/java/Javadoc.qll rename to java/ql/lib/semmle/code/java/Javadoc.qll diff --git a/java/ql/src/semmle/code/java/Maps.qll b/java/ql/lib/semmle/code/java/Maps.qll similarity index 100% rename from java/ql/src/semmle/code/java/Maps.qll rename to java/ql/lib/semmle/code/java/Maps.qll diff --git a/java/ql/src/semmle/code/java/Member.qll b/java/ql/lib/semmle/code/java/Member.qll similarity index 100% rename from java/ql/src/semmle/code/java/Member.qll rename to java/ql/lib/semmle/code/java/Member.qll diff --git a/java/ql/src/semmle/code/java/Modifier.qll b/java/ql/lib/semmle/code/java/Modifier.qll similarity index 100% rename from java/ql/src/semmle/code/java/Modifier.qll rename to java/ql/lib/semmle/code/java/Modifier.qll diff --git a/java/ql/src/semmle/code/java/Modules.qll b/java/ql/lib/semmle/code/java/Modules.qll similarity index 100% rename from java/ql/src/semmle/code/java/Modules.qll rename to java/ql/lib/semmle/code/java/Modules.qll diff --git a/java/ql/src/semmle/code/java/NumberFormatException.qll b/java/ql/lib/semmle/code/java/NumberFormatException.qll similarity index 100% rename from java/ql/src/semmle/code/java/NumberFormatException.qll rename to java/ql/lib/semmle/code/java/NumberFormatException.qll diff --git a/java/ql/src/semmle/code/java/Package.qll b/java/ql/lib/semmle/code/java/Package.qll similarity index 100% rename from java/ql/src/semmle/code/java/Package.qll rename to java/ql/lib/semmle/code/java/Package.qll diff --git a/java/ql/src/semmle/code/java/PrettyPrintAst.qll b/java/ql/lib/semmle/code/java/PrettyPrintAst.qll similarity index 100% rename from java/ql/src/semmle/code/java/PrettyPrintAst.qll rename to java/ql/lib/semmle/code/java/PrettyPrintAst.qll diff --git a/java/ql/src/semmle/code/java/PrintAst.ql b/java/ql/lib/semmle/code/java/PrintAst.ql similarity index 100% rename from java/ql/src/semmle/code/java/PrintAst.ql rename to java/ql/lib/semmle/code/java/PrintAst.ql diff --git a/java/ql/src/semmle/code/java/PrintAst.qll b/java/ql/lib/semmle/code/java/PrintAst.qll similarity index 100% rename from java/ql/src/semmle/code/java/PrintAst.qll rename to java/ql/lib/semmle/code/java/PrintAst.qll diff --git a/java/ql/src/semmle/code/java/Reflection.qll b/java/ql/lib/semmle/code/java/Reflection.qll similarity index 100% rename from java/ql/src/semmle/code/java/Reflection.qll rename to java/ql/lib/semmle/code/java/Reflection.qll diff --git a/java/ql/src/semmle/code/java/Serializability.qll b/java/ql/lib/semmle/code/java/Serializability.qll similarity index 100% rename from java/ql/src/semmle/code/java/Serializability.qll rename to java/ql/lib/semmle/code/java/Serializability.qll diff --git a/java/ql/src/semmle/code/java/Statement.qll b/java/ql/lib/semmle/code/java/Statement.qll similarity index 100% rename from java/ql/src/semmle/code/java/Statement.qll rename to java/ql/lib/semmle/code/java/Statement.qll diff --git a/java/ql/src/semmle/code/java/StringFormat.qll b/java/ql/lib/semmle/code/java/StringFormat.qll similarity index 100% rename from java/ql/src/semmle/code/java/StringFormat.qll rename to java/ql/lib/semmle/code/java/StringFormat.qll diff --git a/java/ql/src/semmle/code/java/Type.qll b/java/ql/lib/semmle/code/java/Type.qll similarity index 100% rename from java/ql/src/semmle/code/java/Type.qll rename to java/ql/lib/semmle/code/java/Type.qll diff --git a/java/ql/src/semmle/code/java/UnitTests.qll b/java/ql/lib/semmle/code/java/UnitTests.qll similarity index 100% rename from java/ql/src/semmle/code/java/UnitTests.qll rename to java/ql/lib/semmle/code/java/UnitTests.qll diff --git a/java/ql/src/semmle/code/java/Variable.qll b/java/ql/lib/semmle/code/java/Variable.qll similarity index 100% rename from java/ql/src/semmle/code/java/Variable.qll rename to java/ql/lib/semmle/code/java/Variable.qll diff --git a/java/ql/src/semmle/code/java/arithmetic/Overflow.qll b/java/ql/lib/semmle/code/java/arithmetic/Overflow.qll similarity index 100% rename from java/ql/src/semmle/code/java/arithmetic/Overflow.qll rename to java/ql/lib/semmle/code/java/arithmetic/Overflow.qll diff --git a/java/ql/src/semmle/code/java/comparison/Comparison.qll b/java/ql/lib/semmle/code/java/comparison/Comparison.qll similarity index 100% rename from java/ql/src/semmle/code/java/comparison/Comparison.qll rename to java/ql/lib/semmle/code/java/comparison/Comparison.qll diff --git a/java/ql/src/semmle/code/java/controlflow/BasicBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll similarity index 100% rename from java/ql/src/semmle/code/java/controlflow/BasicBlocks.qll rename to java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll diff --git a/java/ql/src/semmle/code/java/controlflow/Dominance.qll b/java/ql/lib/semmle/code/java/controlflow/Dominance.qll similarity index 100% rename from java/ql/src/semmle/code/java/controlflow/Dominance.qll rename to java/ql/lib/semmle/code/java/controlflow/Dominance.qll diff --git a/java/ql/src/semmle/code/java/controlflow/Guards.qll b/java/ql/lib/semmle/code/java/controlflow/Guards.qll similarity index 100% rename from java/ql/src/semmle/code/java/controlflow/Guards.qll rename to java/ql/lib/semmle/code/java/controlflow/Guards.qll diff --git a/java/ql/src/semmle/code/java/controlflow/Paths.qll b/java/ql/lib/semmle/code/java/controlflow/Paths.qll similarity index 100% rename from java/ql/src/semmle/code/java/controlflow/Paths.qll rename to java/ql/lib/semmle/code/java/controlflow/Paths.qll diff --git a/java/ql/src/semmle/code/java/controlflow/UnreachableBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll similarity index 100% rename from java/ql/src/semmle/code/java/controlflow/UnreachableBlocks.qll rename to java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll diff --git a/java/ql/src/semmle/code/java/controlflow/internal/GuardsLogic.qll b/java/ql/lib/semmle/code/java/controlflow/internal/GuardsLogic.qll similarity index 100% rename from java/ql/src/semmle/code/java/controlflow/internal/GuardsLogic.qll rename to java/ql/lib/semmle/code/java/controlflow/internal/GuardsLogic.qll diff --git a/java/ql/src/semmle/code/java/controlflow/internal/Preconditions.qll b/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll similarity index 100% rename from java/ql/src/semmle/code/java/controlflow/internal/Preconditions.qll rename to java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll diff --git a/java/ql/src/semmle/code/java/controlflow/unreachableblocks/ExcludeDebuggingProfilingLogging.qll b/java/ql/lib/semmle/code/java/controlflow/unreachableblocks/ExcludeDebuggingProfilingLogging.qll similarity index 100% rename from java/ql/src/semmle/code/java/controlflow/unreachableblocks/ExcludeDebuggingProfilingLogging.qll rename to java/ql/lib/semmle/code/java/controlflow/unreachableblocks/ExcludeDebuggingProfilingLogging.qll diff --git a/java/ql/src/semmle/code/java/dataflow/Bound.qll b/java/ql/lib/semmle/code/java/dataflow/Bound.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/Bound.qll rename to java/ql/lib/semmle/code/java/dataflow/Bound.qll diff --git a/java/ql/src/semmle/code/java/dataflow/DataFlow.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/DataFlow.qll rename to java/ql/lib/semmle/code/java/dataflow/DataFlow.qll diff --git a/java/ql/src/semmle/code/java/dataflow/DataFlow2.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow2.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/DataFlow2.qll rename to java/ql/lib/semmle/code/java/dataflow/DataFlow2.qll diff --git a/java/ql/src/semmle/code/java/dataflow/DataFlow3.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow3.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/DataFlow3.qll rename to java/ql/lib/semmle/code/java/dataflow/DataFlow3.qll diff --git a/java/ql/src/semmle/code/java/dataflow/DataFlow4.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow4.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/DataFlow4.qll rename to java/ql/lib/semmle/code/java/dataflow/DataFlow4.qll diff --git a/java/ql/src/semmle/code/java/dataflow/DataFlow5.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow5.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/DataFlow5.qll rename to java/ql/lib/semmle/code/java/dataflow/DataFlow5.qll diff --git a/java/ql/src/semmle/code/java/dataflow/DataFlow6.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow6.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/DataFlow6.qll rename to java/ql/lib/semmle/code/java/dataflow/DataFlow6.qll diff --git a/java/ql/src/semmle/code/java/dataflow/DefUse.qll b/java/ql/lib/semmle/code/java/dataflow/DefUse.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/DefUse.qll rename to java/ql/lib/semmle/code/java/dataflow/DefUse.qll diff --git a/java/ql/src/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/ExternalFlow.qll rename to java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll diff --git a/java/ql/src/semmle/code/java/dataflow/FlowSources.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/FlowSources.qll rename to java/ql/lib/semmle/code/java/dataflow/FlowSources.qll diff --git a/java/ql/src/semmle/code/java/dataflow/FlowSteps.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/FlowSteps.qll rename to java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll diff --git a/java/ql/src/semmle/code/java/dataflow/FlowSummary.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSummary.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/FlowSummary.qll rename to java/ql/lib/semmle/code/java/dataflow/FlowSummary.qll diff --git a/java/ql/src/semmle/code/java/dataflow/InstanceAccess.qll b/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/InstanceAccess.qll rename to java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll diff --git a/java/ql/src/semmle/code/java/dataflow/IntegerGuards.qll b/java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/IntegerGuards.qll rename to java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll diff --git a/java/ql/src/semmle/code/java/dataflow/ModulusAnalysis.qll b/java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/ModulusAnalysis.qll rename to java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll diff --git a/java/ql/src/semmle/code/java/dataflow/NullGuards.qll b/java/ql/lib/semmle/code/java/dataflow/NullGuards.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/NullGuards.qll rename to java/ql/lib/semmle/code/java/dataflow/NullGuards.qll diff --git a/java/ql/src/semmle/code/java/dataflow/Nullness.qll b/java/ql/lib/semmle/code/java/dataflow/Nullness.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/Nullness.qll rename to java/ql/lib/semmle/code/java/dataflow/Nullness.qll diff --git a/java/ql/src/semmle/code/java/dataflow/RangeAnalysis.qll b/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/RangeAnalysis.qll rename to java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll diff --git a/java/ql/src/semmle/code/java/dataflow/RangeUtils.qll b/java/ql/lib/semmle/code/java/dataflow/RangeUtils.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/RangeUtils.qll rename to java/ql/lib/semmle/code/java/dataflow/RangeUtils.qll diff --git a/java/ql/src/semmle/code/java/dataflow/SSA.qll b/java/ql/lib/semmle/code/java/dataflow/SSA.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/SSA.qll rename to java/ql/lib/semmle/code/java/dataflow/SSA.qll diff --git a/java/ql/src/semmle/code/java/dataflow/SignAnalysis.qll b/java/ql/lib/semmle/code/java/dataflow/SignAnalysis.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/SignAnalysis.qll rename to java/ql/lib/semmle/code/java/dataflow/SignAnalysis.qll diff --git a/java/ql/src/semmle/code/java/dataflow/TaintTracking.qll b/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/TaintTracking.qll rename to java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll diff --git a/java/ql/src/semmle/code/java/dataflow/TaintTracking2.qll b/java/ql/lib/semmle/code/java/dataflow/TaintTracking2.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/TaintTracking2.qll rename to java/ql/lib/semmle/code/java/dataflow/TaintTracking2.qll diff --git a/java/ql/src/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/TypeFlow.qll rename to java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/BaseSSA.qll b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/BaseSSA.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/ContainerFlow.qll b/java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/ContainerFlow.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowDispatch.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowDispatch.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowDispatch.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowDispatch.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowForSerializability.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowForSerializability.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowForSerializability.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowForSerializability.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl6.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl6.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplSpecific.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplSpecific.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplSpecific.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowNodes.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowNodes.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowNodes.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowPrivate.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowPrivate.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/DataFlowUtil.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/BoundSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/BoundSpecific.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/BoundSpecific.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/BoundSpecific.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingParameter.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingParameter.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingParameter.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll diff --git a/java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingParameter.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingParameter.qll similarity index 100% rename from java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingParameter.qll rename to java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingParameter.qll diff --git a/java/ql/src/semmle/code/java/deadcode/DeadCode.qll b/java/ql/lib/semmle/code/java/deadcode/DeadCode.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/DeadCode.qll rename to java/ql/lib/semmle/code/java/deadcode/DeadCode.qll diff --git a/java/ql/src/semmle/code/java/deadcode/DeadCodeCustomizations.qll b/java/ql/lib/semmle/code/java/deadcode/DeadCodeCustomizations.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/DeadCodeCustomizations.qll rename to java/ql/lib/semmle/code/java/deadcode/DeadCodeCustomizations.qll diff --git a/java/ql/src/semmle/code/java/deadcode/DeadEnumConstant.qll b/java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/DeadEnumConstant.qll rename to java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll diff --git a/java/ql/src/semmle/code/java/deadcode/DeadField.qll b/java/ql/lib/semmle/code/java/deadcode/DeadField.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/DeadField.qll rename to java/ql/lib/semmle/code/java/deadcode/DeadField.qll diff --git a/java/ql/src/semmle/code/java/deadcode/EntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/EntryPoints.qll rename to java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll diff --git a/java/ql/src/semmle/code/java/deadcode/SpringEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/SpringEntryPoints.qll rename to java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll diff --git a/java/ql/src/semmle/code/java/deadcode/StrutsEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/StrutsEntryPoints.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/StrutsEntryPoints.qll rename to java/ql/lib/semmle/code/java/deadcode/StrutsEntryPoints.qll diff --git a/java/ql/src/semmle/code/java/deadcode/TestEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/TestEntryPoints.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/TestEntryPoints.qll rename to java/ql/lib/semmle/code/java/deadcode/TestEntryPoints.qll diff --git a/java/ql/src/semmle/code/java/deadcode/WebEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/WebEntryPoints.qll rename to java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll diff --git a/java/ql/src/semmle/code/java/deadcode/frameworks/CamelEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/frameworks/CamelEntryPoints.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/frameworks/CamelEntryPoints.qll rename to java/ql/lib/semmle/code/java/deadcode/frameworks/CamelEntryPoints.qll diff --git a/java/ql/src/semmle/code/java/deadcode/frameworks/FitNesseEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/frameworks/FitNesseEntryPoints.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/frameworks/FitNesseEntryPoints.qll rename to java/ql/lib/semmle/code/java/deadcode/frameworks/FitNesseEntryPoints.qll diff --git a/java/ql/src/semmle/code/java/deadcode/frameworks/GigaSpacesXAPEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/frameworks/GigaSpacesXAPEntryPoints.qll similarity index 100% rename from java/ql/src/semmle/code/java/deadcode/frameworks/GigaSpacesXAPEntryPoints.qll rename to java/ql/lib/semmle/code/java/deadcode/frameworks/GigaSpacesXAPEntryPoints.qll diff --git a/java/ql/src/semmle/code/java/dispatch/DispatchFlow.qll b/java/ql/lib/semmle/code/java/dispatch/DispatchFlow.qll similarity index 100% rename from java/ql/src/semmle/code/java/dispatch/DispatchFlow.qll rename to java/ql/lib/semmle/code/java/dispatch/DispatchFlow.qll diff --git a/java/ql/src/semmle/code/java/dispatch/ObjFlow.qll b/java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll similarity index 100% rename from java/ql/src/semmle/code/java/dispatch/ObjFlow.qll rename to java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll diff --git a/java/ql/src/semmle/code/java/dispatch/VirtualDispatch.qll b/java/ql/lib/semmle/code/java/dispatch/VirtualDispatch.qll similarity index 100% rename from java/ql/src/semmle/code/java/dispatch/VirtualDispatch.qll rename to java/ql/lib/semmle/code/java/dispatch/VirtualDispatch.qll diff --git a/java/ql/src/semmle/code/java/dispatch/WrappedInvocation.qll b/java/ql/lib/semmle/code/java/dispatch/WrappedInvocation.qll similarity index 100% rename from java/ql/src/semmle/code/java/dispatch/WrappedInvocation.qll rename to java/ql/lib/semmle/code/java/dispatch/WrappedInvocation.qll diff --git a/java/ql/src/semmle/code/java/frameworks/ApacheHttp.qll b/java/ql/lib/semmle/code/java/frameworks/ApacheHttp.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/ApacheHttp.qll rename to java/ql/lib/semmle/code/java/frameworks/ApacheHttp.qll diff --git a/java/ql/src/semmle/code/java/frameworks/ApacheLdap.qll b/java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/ApacheLdap.qll rename to java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Assertions.qll b/java/ql/lib/semmle/code/java/frameworks/Assertions.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Assertions.qll rename to java/ql/lib/semmle/code/java/frameworks/Assertions.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Camel.qll b/java/ql/lib/semmle/code/java/frameworks/Camel.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Camel.qll rename to java/ql/lib/semmle/code/java/frameworks/Camel.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Castor.qll b/java/ql/lib/semmle/code/java/frameworks/Castor.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Castor.qll rename to java/ql/lib/semmle/code/java/frameworks/Castor.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Cucumber.qll b/java/ql/lib/semmle/code/java/frameworks/Cucumber.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Cucumber.qll rename to java/ql/lib/semmle/code/java/frameworks/Cucumber.qll diff --git a/java/ql/src/semmle/code/java/frameworks/FastJson.qll b/java/ql/lib/semmle/code/java/frameworks/FastJson.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/FastJson.qll rename to java/ql/lib/semmle/code/java/frameworks/FastJson.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Guice.qll b/java/ql/lib/semmle/code/java/frameworks/Guice.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Guice.qll rename to java/ql/lib/semmle/code/java/frameworks/Guice.qll diff --git a/java/ql/src/semmle/code/java/frameworks/HessianBurlap.qll b/java/ql/lib/semmle/code/java/frameworks/HessianBurlap.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/HessianBurlap.qll rename to java/ql/lib/semmle/code/java/frameworks/HessianBurlap.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Hibernate.qll b/java/ql/lib/semmle/code/java/frameworks/Hibernate.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Hibernate.qll rename to java/ql/lib/semmle/code/java/frameworks/Hibernate.qll diff --git a/java/ql/src/semmle/code/java/frameworks/JAXB.qll b/java/ql/lib/semmle/code/java/frameworks/JAXB.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/JAXB.qll rename to java/ql/lib/semmle/code/java/frameworks/JAXB.qll diff --git a/java/ql/src/semmle/code/java/frameworks/JUnitAnnotations.qll b/java/ql/lib/semmle/code/java/frameworks/JUnitAnnotations.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/JUnitAnnotations.qll rename to java/ql/lib/semmle/code/java/frameworks/JUnitAnnotations.qll diff --git a/java/ql/src/semmle/code/java/frameworks/JYaml.qll b/java/ql/lib/semmle/code/java/frameworks/JYaml.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/JYaml.qll rename to java/ql/lib/semmle/code/java/frameworks/JYaml.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Jabsorb.qll b/java/ql/lib/semmle/code/java/frameworks/Jabsorb.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Jabsorb.qll rename to java/ql/lib/semmle/code/java/frameworks/Jabsorb.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Jackson.qll b/java/ql/lib/semmle/code/java/frameworks/Jackson.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Jackson.qll rename to java/ql/lib/semmle/code/java/frameworks/Jackson.qll diff --git a/java/ql/src/semmle/code/java/frameworks/JavaxAnnotations.qll b/java/ql/lib/semmle/code/java/frameworks/JavaxAnnotations.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/JavaxAnnotations.qll rename to java/ql/lib/semmle/code/java/frameworks/JavaxAnnotations.qll diff --git a/java/ql/src/semmle/code/java/frameworks/JavaxJson.qll b/java/ql/lib/semmle/code/java/frameworks/JavaxJson.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/JavaxJson.qll rename to java/ql/lib/semmle/code/java/frameworks/JavaxJson.qll diff --git a/java/ql/src/semmle/code/java/frameworks/JaxWS.qll b/java/ql/lib/semmle/code/java/frameworks/JaxWS.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/JaxWS.qll rename to java/ql/lib/semmle/code/java/frameworks/JaxWS.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Jdbc.qll b/java/ql/lib/semmle/code/java/frameworks/Jdbc.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Jdbc.qll rename to java/ql/lib/semmle/code/java/frameworks/Jdbc.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Jndi.qll b/java/ql/lib/semmle/code/java/frameworks/Jndi.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Jndi.qll rename to java/ql/lib/semmle/code/java/frameworks/Jndi.qll diff --git a/java/ql/src/semmle/code/java/frameworks/JoddJson.qll b/java/ql/lib/semmle/code/java/frameworks/JoddJson.ql similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/JoddJson.qll rename to java/ql/lib/semmle/code/java/frameworks/JoddJson.ql diff --git a/java/ql/src/semmle/code/java/frameworks/JsonIo.qll b/java/ql/lib/semmle/code/java/frameworks/JsonIo.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/JsonIo.qll rename to java/ql/lib/semmle/code/java/frameworks/JsonIo.qll diff --git a/java/ql/src/semmle/code/java/frameworks/JsonJava.qll b/java/ql/lib/semmle/code/java/frameworks/JsonJava.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/JsonJava.qll rename to java/ql/lib/semmle/code/java/frameworks/JsonJava.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Kryo.qll b/java/ql/lib/semmle/code/java/frameworks/Kryo.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Kryo.qll rename to java/ql/lib/semmle/code/java/frameworks/Kryo.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Lombok.qll b/java/ql/lib/semmle/code/java/frameworks/Lombok.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Lombok.qll rename to java/ql/lib/semmle/code/java/frameworks/Lombok.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Mockito.qll b/java/ql/lib/semmle/code/java/frameworks/Mockito.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Mockito.qll rename to java/ql/lib/semmle/code/java/frameworks/Mockito.qll diff --git a/java/ql/src/semmle/code/java/frameworks/MyBatis.qll b/java/ql/lib/semmle/code/java/frameworks/MyBatis.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/MyBatis.qll rename to java/ql/lib/semmle/code/java/frameworks/MyBatis.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Networking.qll b/java/ql/lib/semmle/code/java/frameworks/Networking.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Networking.qll rename to java/ql/lib/semmle/code/java/frameworks/Networking.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Optional.qll b/java/ql/lib/semmle/code/java/frameworks/Optional.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Optional.qll rename to java/ql/lib/semmle/code/java/frameworks/Optional.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Properties.qll b/java/ql/lib/semmle/code/java/frameworks/Properties.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Properties.qll rename to java/ql/lib/semmle/code/java/frameworks/Properties.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Protobuf.qll b/java/ql/lib/semmle/code/java/frameworks/Protobuf.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Protobuf.qll rename to java/ql/lib/semmle/code/java/frameworks/Protobuf.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Rmi.qll b/java/ql/lib/semmle/code/java/frameworks/Rmi.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Rmi.qll rename to java/ql/lib/semmle/code/java/frameworks/Rmi.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Selenium.qll b/java/ql/lib/semmle/code/java/frameworks/Selenium.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Selenium.qll rename to java/ql/lib/semmle/code/java/frameworks/Selenium.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Servlets.qll b/java/ql/lib/semmle/code/java/frameworks/Servlets.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Servlets.qll rename to java/ql/lib/semmle/code/java/frameworks/Servlets.qll diff --git a/java/ql/src/semmle/code/java/frameworks/SnakeYaml.qll b/java/ql/lib/semmle/code/java/frameworks/SnakeYaml.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/SnakeYaml.qll rename to java/ql/lib/semmle/code/java/frameworks/SnakeYaml.qll diff --git a/java/ql/src/semmle/code/java/frameworks/SpringJdbc.qll b/java/ql/lib/semmle/code/java/frameworks/SpringJdbc.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/SpringJdbc.qll rename to java/ql/lib/semmle/code/java/frameworks/SpringJdbc.qll diff --git a/java/ql/src/semmle/code/java/frameworks/SpringLdap.qll b/java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/SpringLdap.qll rename to java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll diff --git a/java/ql/src/semmle/code/java/frameworks/SpringWeb.qll b/java/ql/lib/semmle/code/java/frameworks/SpringWeb.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/SpringWeb.qll rename to java/ql/lib/semmle/code/java/frameworks/SpringWeb.qll diff --git a/java/ql/src/semmle/code/java/frameworks/Thrift.qll b/java/ql/lib/semmle/code/java/frameworks/Thrift.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/Thrift.qll rename to java/ql/lib/semmle/code/java/frameworks/Thrift.qll diff --git a/java/ql/src/semmle/code/java/frameworks/UnboundId.qll b/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/UnboundId.qll rename to java/ql/lib/semmle/code/java/frameworks/UnboundId.qll diff --git a/java/ql/src/semmle/code/java/frameworks/XStream.qll b/java/ql/lib/semmle/code/java/frameworks/XStream.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/XStream.qll rename to java/ql/lib/semmle/code/java/frameworks/XStream.qll diff --git a/java/ql/src/semmle/code/java/frameworks/YamlBeans.qll b/java/ql/lib/semmle/code/java/frameworks/YamlBeans.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/YamlBeans.qll rename to java/ql/lib/semmle/code/java/frameworks/YamlBeans.qll diff --git a/java/ql/src/semmle/code/java/frameworks/android/Android.qll b/java/ql/lib/semmle/code/java/frameworks/android/Android.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/android/Android.qll rename to java/ql/lib/semmle/code/java/frameworks/android/Android.qll diff --git a/java/ql/src/semmle/code/java/frameworks/android/Intent.qll b/java/ql/lib/semmle/code/java/frameworks/android/Intent.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/android/Intent.qll rename to java/ql/lib/semmle/code/java/frameworks/android/Intent.qll diff --git a/java/ql/src/semmle/code/java/frameworks/android/SQLite.qll b/java/ql/lib/semmle/code/java/frameworks/android/SQLite.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/android/SQLite.qll rename to java/ql/lib/semmle/code/java/frameworks/android/SQLite.qll diff --git a/java/ql/src/semmle/code/java/frameworks/android/SharedPreferences.qll b/java/ql/lib/semmle/code/java/frameworks/android/SharedPreferences.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/android/SharedPreferences.qll rename to java/ql/lib/semmle/code/java/frameworks/android/SharedPreferences.qll diff --git a/java/ql/src/semmle/code/java/frameworks/android/WebView.qll b/java/ql/lib/semmle/code/java/frameworks/android/WebView.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/android/WebView.qll rename to java/ql/lib/semmle/code/java/frameworks/android/WebView.qll diff --git a/java/ql/src/semmle/code/java/frameworks/android/XmlParsing.qll b/java/ql/lib/semmle/code/java/frameworks/android/XmlParsing.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/android/XmlParsing.qll rename to java/ql/lib/semmle/code/java/frameworks/android/XmlParsing.qll diff --git a/java/ql/src/semmle/code/java/frameworks/android/XssSinks.qll b/java/ql/lib/semmle/code/java/frameworks/android/XssSinks.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/android/XssSinks.qll rename to java/ql/lib/semmle/code/java/frameworks/android/XssSinks.qll diff --git a/java/ql/src/semmle/code/java/frameworks/apache/Collections.qll b/java/ql/lib/semmle/code/java/frameworks/apache/Collections.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/apache/Collections.qll rename to java/ql/lib/semmle/code/java/frameworks/apache/Collections.qll diff --git a/java/ql/src/semmle/code/java/frameworks/apache/Exec.qll b/java/ql/lib/semmle/code/java/frameworks/apache/Exec.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/apache/Exec.qll rename to java/ql/lib/semmle/code/java/frameworks/apache/Exec.qll diff --git a/java/ql/src/semmle/code/java/frameworks/apache/Lang.qll b/java/ql/lib/semmle/code/java/frameworks/apache/Lang.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/apache/Lang.qll rename to java/ql/lib/semmle/code/java/frameworks/apache/Lang.qll diff --git a/java/ql/src/semmle/code/java/frameworks/camel/CamelJavaAnnotations.qll b/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaAnnotations.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/camel/CamelJavaAnnotations.qll rename to java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaAnnotations.qll diff --git a/java/ql/src/semmle/code/java/frameworks/camel/CamelJavaDSL.qll b/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaDSL.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/camel/CamelJavaDSL.qll rename to java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaDSL.qll diff --git a/java/ql/src/semmle/code/java/frameworks/gigaspaces/GigaSpaces.qll b/java/ql/lib/semmle/code/java/frameworks/gigaspaces/GigaSpaces.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/gigaspaces/GigaSpaces.qll rename to java/ql/lib/semmle/code/java/frameworks/gigaspaces/GigaSpaces.qll diff --git a/java/ql/src/semmle/code/java/frameworks/google/GoogleHttpClientApi.qll b/java/ql/lib/semmle/code/java/frameworks/google/GoogleHttpClientApi.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/google/GoogleHttpClientApi.qll rename to java/ql/lib/semmle/code/java/frameworks/google/GoogleHttpClientApi.qll diff --git a/java/ql/src/semmle/code/java/frameworks/guava/Base.qll b/java/ql/lib/semmle/code/java/frameworks/guava/Base.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/guava/Base.qll rename to java/ql/lib/semmle/code/java/frameworks/guava/Base.qll diff --git a/java/ql/src/semmle/code/java/frameworks/guava/Cache.qll b/java/ql/lib/semmle/code/java/frameworks/guava/Cache.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/guava/Cache.qll rename to java/ql/lib/semmle/code/java/frameworks/guava/Cache.qll diff --git a/java/ql/src/semmle/code/java/frameworks/guava/Collections.qll b/java/ql/lib/semmle/code/java/frameworks/guava/Collections.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/guava/Collections.qll rename to java/ql/lib/semmle/code/java/frameworks/guava/Collections.qll diff --git a/java/ql/src/semmle/code/java/frameworks/guava/Guava.qll b/java/ql/lib/semmle/code/java/frameworks/guava/Guava.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/guava/Guava.qll rename to java/ql/lib/semmle/code/java/frameworks/guava/Guava.qll diff --git a/java/ql/src/semmle/code/java/frameworks/guava/IO.qll b/java/ql/lib/semmle/code/java/frameworks/guava/IO.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/guava/IO.qll rename to java/ql/lib/semmle/code/java/frameworks/guava/IO.qll diff --git a/java/ql/src/semmle/code/java/frameworks/gwt/GWT.qll b/java/ql/lib/semmle/code/java/frameworks/gwt/GWT.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/gwt/GWT.qll rename to java/ql/lib/semmle/code/java/frameworks/gwt/GWT.qll diff --git a/java/ql/src/semmle/code/java/frameworks/gwt/GwtUiBinder.qll b/java/ql/lib/semmle/code/java/frameworks/gwt/GwtUiBinder.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/gwt/GwtUiBinder.qll rename to java/ql/lib/semmle/code/java/frameworks/gwt/GwtUiBinder.qll diff --git a/java/ql/src/semmle/code/java/frameworks/gwt/GwtUiBinderXml.qll b/java/ql/lib/semmle/code/java/frameworks/gwt/GwtUiBinderXml.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/gwt/GwtUiBinderXml.qll rename to java/ql/lib/semmle/code/java/frameworks/gwt/GwtUiBinderXml.qll diff --git a/java/ql/src/semmle/code/java/frameworks/gwt/GwtXml.qll b/java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/gwt/GwtXml.qll rename to java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll diff --git a/java/ql/src/semmle/code/java/frameworks/j2objc/J2ObjC.qll b/java/ql/lib/semmle/code/java/frameworks/j2objc/J2ObjC.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/j2objc/J2ObjC.qll rename to java/ql/lib/semmle/code/java/frameworks/j2objc/J2ObjC.qll diff --git a/java/ql/src/semmle/code/java/frameworks/jOOQ.qll b/java/ql/lib/semmle/code/java/frameworks/jOOQ.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/jOOQ.qll rename to java/ql/lib/semmle/code/java/frameworks/jOOQ.qll diff --git a/java/ql/src/semmle/code/java/frameworks/jackson/JacksonSerializability.qll b/java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/jackson/JacksonSerializability.qll rename to java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javaee/JavaServerFaces.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javaee/JavaServerFaces.qll rename to java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javaee/Persistence.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/Persistence.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javaee/Persistence.qll rename to java/ql/lib/semmle/code/java/frameworks/javaee/Persistence.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javaee/PersistenceXML.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javaee/PersistenceXML.qll rename to java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javaee/ejb/EJB.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javaee/ejb/EJB.qll rename to java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll rename to java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javaee/ejb/EJBRestrictions.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBRestrictions.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javaee/ejb/EJBRestrictions.qll rename to java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBRestrictions.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javaee/jsf/JSFAnnotations.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFAnnotations.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javaee/jsf/JSFAnnotations.qll rename to java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFAnnotations.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll rename to java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javase/Http.qll b/java/ql/lib/semmle/code/java/frameworks/javase/Http.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javase/Http.qll rename to java/ql/lib/semmle/code/java/frameworks/javase/Http.qll diff --git a/java/ql/src/semmle/code/java/frameworks/javase/WebSocket.qll b/java/ql/lib/semmle/code/java/frameworks/javase/WebSocket.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/javase/WebSocket.qll rename to java/ql/lib/semmle/code/java/frameworks/javase/WebSocket.qll diff --git a/java/ql/src/semmle/code/java/frameworks/play/Play.qll b/java/ql/lib/semmle/code/java/frameworks/play/Play.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/play/Play.qll rename to java/ql/lib/semmle/code/java/frameworks/play/Play.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/Spring.qll b/java/ql/lib/semmle/code/java/frameworks/spring/Spring.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/Spring.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/Spring.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringAbstractRef.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringAbstractRef.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringAlias.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringAlias.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringArgType.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringArgType.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringAttribute.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringAttribute.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringAutowire.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringAutowire.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringBean.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringBean.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringBeanFile.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBeanFile.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringBeanFile.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringBeanFile.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringBeanRefType.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBeanRefType.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringBeanRefType.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringBeanRefType.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringBeans.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBeans.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringBeans.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringBeans.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringCache.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringCache.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringCache.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringCache.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringCamel.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringCamel.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringComponentScan.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringComponentScan.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringConstructorArg.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringConstructorArg.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringController.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringController.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringController.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringController.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringDescription.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringDescription.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringEntry.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringEntry.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringFlex.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringFlex.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringHttp.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringHttp.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringHttp.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringHttp.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringIdRef.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringIdRef.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringIdRef.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringIdRef.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringImport.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringImport.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringInitializingBean.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringInitializingBean.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringInitializingBean.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringInitializingBean.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringKey.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringKey.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringList.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringList.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringList.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringList.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringListOrSet.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringListOrSet.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringListOrSet.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringListOrSet.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringLookupMethod.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringLookupMethod.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringMap.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMap.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringMap.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringMap.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringMergable.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringMergable.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringMeta.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringMeta.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringNull.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringNull.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringProfile.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProfile.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringProfile.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringProfile.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringProp.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringProp.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringProperty.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringProperty.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringProps.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProps.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringProps.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringProps.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringQualifier.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringQualifier.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringRef.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringRef.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringRef.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringRef.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringSet.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringSet.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringSet.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringSet.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringUi.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringUi.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringUi.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringUi.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringUtil.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringUtil.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringUtil.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringUtil.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringValidation.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringValidation.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringValidation.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringValidation.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringValue.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringValue.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringWeb.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringWeb.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringWeb.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringWeb.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringWebClient.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringWebClient.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringWebClient.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringWebClient.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringWebMultipart.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringWebMultipart.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringWebMultipart.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringWebMultipart.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringWebUtil.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringWebUtil.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringWebUtil.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringWebUtil.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringXMLElement.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/SpringXMLElement.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll b/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll diff --git a/java/ql/src/semmle/code/java/frameworks/spring/metrics/MetricSpringBeanFile.qll b/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBeanFile.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/spring/metrics/MetricSpringBeanFile.qll rename to java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBeanFile.qll diff --git a/java/ql/src/semmle/code/java/frameworks/struts/StrutsActions.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/struts/StrutsActions.qll rename to java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll diff --git a/java/ql/src/semmle/code/java/frameworks/struts/StrutsAnnotations.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsAnnotations.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/struts/StrutsAnnotations.qll rename to java/ql/lib/semmle/code/java/frameworks/struts/StrutsAnnotations.qll diff --git a/java/ql/src/semmle/code/java/frameworks/struts/StrutsConventions.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/struts/StrutsConventions.qll rename to java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll diff --git a/java/ql/src/semmle/code/java/frameworks/struts/StrutsXML.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll similarity index 100% rename from java/ql/src/semmle/code/java/frameworks/struts/StrutsXML.qll rename to java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll diff --git a/java/ql/src/semmle/code/java/metrics/MetricCallable.qll b/java/ql/lib/semmle/code/java/metrics/MetricCallable.qll similarity index 100% rename from java/ql/src/semmle/code/java/metrics/MetricCallable.qll rename to java/ql/lib/semmle/code/java/metrics/MetricCallable.qll diff --git a/java/ql/src/semmle/code/java/metrics/MetricElement.qll b/java/ql/lib/semmle/code/java/metrics/MetricElement.qll similarity index 100% rename from java/ql/src/semmle/code/java/metrics/MetricElement.qll rename to java/ql/lib/semmle/code/java/metrics/MetricElement.qll diff --git a/java/ql/src/semmle/code/java/metrics/MetricField.qll b/java/ql/lib/semmle/code/java/metrics/MetricField.qll similarity index 100% rename from java/ql/src/semmle/code/java/metrics/MetricField.qll rename to java/ql/lib/semmle/code/java/metrics/MetricField.qll diff --git a/java/ql/src/semmle/code/java/metrics/MetricPackage.qll b/java/ql/lib/semmle/code/java/metrics/MetricPackage.qll similarity index 100% rename from java/ql/src/semmle/code/java/metrics/MetricPackage.qll rename to java/ql/lib/semmle/code/java/metrics/MetricPackage.qll diff --git a/java/ql/src/semmle/code/java/metrics/MetricRefType.qll b/java/ql/lib/semmle/code/java/metrics/MetricRefType.qll similarity index 100% rename from java/ql/src/semmle/code/java/metrics/MetricRefType.qll rename to java/ql/lib/semmle/code/java/metrics/MetricRefType.qll diff --git a/java/ql/src/semmle/code/java/metrics/MetricStmt.qll b/java/ql/lib/semmle/code/java/metrics/MetricStmt.qll similarity index 100% rename from java/ql/src/semmle/code/java/metrics/MetricStmt.qll rename to java/ql/lib/semmle/code/java/metrics/MetricStmt.qll diff --git a/java/ql/src/semmle/code/java/security/CommandArguments.qll b/java/ql/lib/semmle/code/java/security/CommandArguments.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/CommandArguments.qll rename to java/ql/lib/semmle/code/java/security/CommandArguments.qll diff --git a/java/ql/src/semmle/code/java/security/CommandLineQuery.qll b/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/CommandLineQuery.qll rename to java/ql/lib/semmle/code/java/security/CommandLineQuery.qll diff --git a/java/ql/src/semmle/code/java/security/ControlledString.qll b/java/ql/lib/semmle/code/java/security/ControlledString.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/ControlledString.qll rename to java/ql/lib/semmle/code/java/security/ControlledString.qll diff --git a/java/ql/src/semmle/code/java/security/Encryption.qll b/java/ql/lib/semmle/code/java/security/Encryption.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/Encryption.qll rename to java/ql/lib/semmle/code/java/security/Encryption.qll diff --git a/java/ql/src/semmle/code/java/security/ExternalAPIs.qll b/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/ExternalAPIs.qll rename to java/ql/lib/semmle/code/java/security/ExternalAPIs.qll diff --git a/java/ql/src/semmle/code/java/security/ExternalProcess.qll b/java/ql/lib/semmle/code/java/security/ExternalProcess.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/ExternalProcess.qll rename to java/ql/lib/semmle/code/java/security/ExternalProcess.qll diff --git a/java/ql/src/semmle/code/java/security/FileReadWrite.qll b/java/ql/lib/semmle/code/java/security/FileReadWrite.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/FileReadWrite.qll rename to java/ql/lib/semmle/code/java/security/FileReadWrite.qll diff --git a/java/ql/src/semmle/code/java/security/FileWritable.qll b/java/ql/lib/semmle/code/java/security/FileWritable.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/FileWritable.qll rename to java/ql/lib/semmle/code/java/security/FileWritable.qll diff --git a/java/ql/src/semmle/code/java/security/GroovyInjection.qll b/java/ql/lib/semmle/code/java/security/GroovyInjection.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/GroovyInjection.qll rename to java/ql/lib/semmle/code/java/security/GroovyInjection.qll diff --git a/java/ql/src/semmle/code/java/security/GroovyInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/GroovyInjectionQuery.qll rename to java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll diff --git a/java/ql/src/semmle/code/java/security/InformationLeak.qll b/java/ql/lib/semmle/code/java/security/InformationLeak.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/InformationLeak.qll rename to java/ql/lib/semmle/code/java/security/InformationLeak.qll diff --git a/java/ql/src/semmle/code/java/security/JWT.qll b/java/ql/lib/semmle/code/java/security/JWT.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/JWT.qll rename to java/ql/lib/semmle/code/java/security/JWT.qll diff --git a/java/ql/src/semmle/code/java/security/JexlInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/JexlInjectionQuery.qll rename to java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll diff --git a/java/ql/src/semmle/code/java/security/JexlInjectionSinkModels.qll b/java/ql/lib/semmle/code/java/security/JexlInjectionSinkModels.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/JexlInjectionSinkModels.qll rename to java/ql/lib/semmle/code/java/security/JexlInjectionSinkModels.qll diff --git a/java/ql/src/semmle/code/java/security/JndiInjection.qll b/java/ql/lib/semmle/code/java/security/JndiInjection.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/JndiInjection.qll rename to java/ql/lib/semmle/code/java/security/JndiInjection.qll diff --git a/java/ql/src/semmle/code/java/security/JndiInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/JndiInjectionQuery.qll rename to java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll diff --git a/java/ql/src/semmle/code/java/security/LdapInjection.qll b/java/ql/lib/semmle/code/java/security/LdapInjection.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/LdapInjection.qll rename to java/ql/lib/semmle/code/java/security/LdapInjection.qll diff --git a/java/ql/src/semmle/code/java/security/MissingJWTSignatureCheckQuery.qll b/java/ql/lib/semmle/code/java/security/MissingJWTSignatureCheckQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/MissingJWTSignatureCheckQuery.qll rename to java/ql/lib/semmle/code/java/security/MissingJWTSignatureCheckQuery.qll diff --git a/java/ql/src/semmle/code/java/security/MvelInjection.qll b/java/ql/lib/semmle/code/java/security/MvelInjection.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/MvelInjection.qll rename to java/ql/lib/semmle/code/java/security/MvelInjection.qll diff --git a/java/ql/src/semmle/code/java/security/MvelInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/MvelInjectionQuery.qll rename to java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll diff --git a/java/ql/src/semmle/code/java/security/OgnlInjection.qll b/java/ql/lib/semmle/code/java/security/OgnlInjection.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/OgnlInjection.qll rename to java/ql/lib/semmle/code/java/security/OgnlInjection.qll diff --git a/java/ql/src/semmle/code/java/security/OgnlInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/OgnlInjectionQuery.qll rename to java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll diff --git a/java/ql/src/semmle/code/java/security/PathCreation.qll b/java/ql/lib/semmle/code/java/security/PathCreation.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/PathCreation.qll rename to java/ql/lib/semmle/code/java/security/PathCreation.qll diff --git a/java/ql/src/semmle/code/java/security/QueryInjection.qll b/java/ql/lib/semmle/code/java/security/QueryInjection.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/QueryInjection.qll rename to java/ql/lib/semmle/code/java/security/QueryInjection.qll diff --git a/java/ql/src/semmle/code/java/security/RandomDataSource.qll b/java/ql/lib/semmle/code/java/security/RandomDataSource.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/RandomDataSource.qll rename to java/ql/lib/semmle/code/java/security/RandomDataSource.qll diff --git a/java/ql/src/semmle/code/java/security/RandomQuery.qll b/java/ql/lib/semmle/code/java/security/RandomQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/RandomQuery.qll rename to java/ql/lib/semmle/code/java/security/RandomQuery.qll diff --git a/java/ql/src/semmle/code/java/security/RelativePaths.qll b/java/ql/lib/semmle/code/java/security/RelativePaths.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/RelativePaths.qll rename to java/ql/lib/semmle/code/java/security/RelativePaths.qll diff --git a/java/ql/src/semmle/code/java/security/RequestForgery.qll b/java/ql/lib/semmle/code/java/security/RequestForgery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/RequestForgery.qll rename to java/ql/lib/semmle/code/java/security/RequestForgery.qll diff --git a/java/ql/src/semmle/code/java/security/RequestForgeryConfig.qll b/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/RequestForgeryConfig.qll rename to java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll diff --git a/java/ql/src/semmle/code/java/security/ResponseSplitting.qll b/java/ql/lib/semmle/code/java/security/ResponseSplitting.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/ResponseSplitting.qll rename to java/ql/lib/semmle/code/java/security/ResponseSplitting.qll diff --git a/java/ql/src/semmle/code/java/security/SecurityFlag.qll b/java/ql/lib/semmle/code/java/security/SecurityFlag.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/SecurityFlag.qll rename to java/ql/lib/semmle/code/java/security/SecurityFlag.qll diff --git a/java/ql/src/semmle/code/java/security/SecurityTests.qll b/java/ql/lib/semmle/code/java/security/SecurityTests.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/SecurityTests.qll rename to java/ql/lib/semmle/code/java/security/SecurityTests.qll diff --git a/java/ql/src/semmle/code/java/security/SensitiveActions.qll b/java/ql/lib/semmle/code/java/security/SensitiveActions.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/SensitiveActions.qll rename to java/ql/lib/semmle/code/java/security/SensitiveActions.qll diff --git a/java/ql/src/semmle/code/java/security/SqlUnescapedLib.qll b/java/ql/lib/semmle/code/java/security/SqlUnescapedLib.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/SqlUnescapedLib.qll rename to java/ql/lib/semmle/code/java/security/SqlUnescapedLib.qll diff --git a/java/ql/src/semmle/code/java/security/UnsafeAndroidAccess.qll b/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccess.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/UnsafeAndroidAccess.qll rename to java/ql/lib/semmle/code/java/security/UnsafeAndroidAccess.qll diff --git a/java/ql/src/semmle/code/java/security/UnsafeAndroidAccessQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/UnsafeAndroidAccessQuery.qll rename to java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll diff --git a/java/ql/src/semmle/code/java/security/UnsafeDeserializationQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/UnsafeDeserializationQuery.qll rename to java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll diff --git a/java/ql/src/semmle/code/java/security/UrlRedirect.qll b/java/ql/lib/semmle/code/java/security/UrlRedirect.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/UrlRedirect.qll rename to java/ql/lib/semmle/code/java/security/UrlRedirect.qll diff --git a/java/ql/src/semmle/code/java/security/Validation.qll b/java/ql/lib/semmle/code/java/security/Validation.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/Validation.qll rename to java/ql/lib/semmle/code/java/security/Validation.qll diff --git a/java/ql/src/semmle/code/java/security/XPath.qll b/java/ql/lib/semmle/code/java/security/XPath.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/XPath.qll rename to java/ql/lib/semmle/code/java/security/XPath.qll diff --git a/java/ql/src/semmle/code/java/security/XSS.qll b/java/ql/lib/semmle/code/java/security/XSS.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/XSS.qll rename to java/ql/lib/semmle/code/java/security/XSS.qll diff --git a/java/ql/src/semmle/code/java/security/XmlParsers.qll b/java/ql/lib/semmle/code/java/security/XmlParsers.qll similarity index 100% rename from java/ql/src/semmle/code/java/security/XmlParsers.qll rename to java/ql/lib/semmle/code/java/security/XmlParsers.qll diff --git a/java/ql/src/semmle/code/xml/AndroidManifest.qll b/java/ql/lib/semmle/code/xml/AndroidManifest.qll similarity index 100% rename from java/ql/src/semmle/code/xml/AndroidManifest.qll rename to java/ql/lib/semmle/code/xml/AndroidManifest.qll diff --git a/java/ql/src/semmle/code/xml/Ant.qll b/java/ql/lib/semmle/code/xml/Ant.qll similarity index 100% rename from java/ql/src/semmle/code/xml/Ant.qll rename to java/ql/lib/semmle/code/xml/Ant.qll diff --git a/java/ql/src/semmle/code/xml/MavenPom.qll b/java/ql/lib/semmle/code/xml/MavenPom.qll similarity index 100% rename from java/ql/src/semmle/code/xml/MavenPom.qll rename to java/ql/lib/semmle/code/xml/MavenPom.qll diff --git a/java/ql/src/semmle/code/xml/WebXML.qll b/java/ql/lib/semmle/code/xml/WebXML.qll similarity index 100% rename from java/ql/src/semmle/code/xml/WebXML.qll rename to java/ql/lib/semmle/code/xml/WebXML.qll diff --git a/java/ql/src/semmle/code/xml/XML.qll b/java/ql/lib/semmle/code/xml/XML.qll similarity index 100% rename from java/ql/src/semmle/code/xml/XML.qll rename to java/ql/lib/semmle/code/xml/XML.qll diff --git a/java/ql/src/semmle/files/FileSystem.qll b/java/ql/lib/semmle/files/FileSystem.qll similarity index 100% rename from java/ql/src/semmle/files/FileSystem.qll rename to java/ql/lib/semmle/files/FileSystem.qll diff --git a/java/ql/src/codeql-suites/java-code-scanning.qls b/java/ql/src/codeql-suites/java-code-scanning.qls index e63526f5626..9074f8e7bf9 100644 --- a/java/ql/src/codeql-suites/java-code-scanning.qls +++ b/java/ql/src/codeql-suites/java-code-scanning.qls @@ -1,4 +1,4 @@ - description: Standard Code Scanning queries for Java -- qlpack: codeql-java +- queries: . - apply: code-scanning-selectors.yml from: codeql/suite-helpers diff --git a/java/ql/src/codeql-suites/java-lgtm-full.qls b/java/ql/src/codeql-suites/java-lgtm-full.qls index 3fc3a23e05e..90b25aa4d05 100644 --- a/java/ql/src/codeql-suites/java-lgtm-full.qls +++ b/java/ql/src/codeql-suites/java-lgtm-full.qls @@ -1,5 +1,5 @@ - description: Standard LGTM queries for Java, including ones not displayed by default -- qlpack: codeql-java +- queries: . - apply: lgtm-selectors.yml from: codeql/suite-helpers # These are only for IDE use. diff --git a/java/ql/src/codeql-suites/java-security-and-quality.qls b/java/ql/src/codeql-suites/java-security-and-quality.qls index 356e1259830..2b9ca6c132f 100644 --- a/java/ql/src/codeql-suites/java-security-and-quality.qls +++ b/java/ql/src/codeql-suites/java-security-and-quality.qls @@ -1,4 +1,4 @@ - description: Security-and-quality queries for Java -- qlpack: codeql-java +- queries: . - apply: security-and-quality-selectors.yml from: codeql/suite-helpers diff --git a/java/ql/src/codeql-suites/java-security-extended.qls b/java/ql/src/codeql-suites/java-security-extended.qls index af306a9e06e..4429c105456 100644 --- a/java/ql/src/codeql-suites/java-security-extended.qls +++ b/java/ql/src/codeql-suites/java-security-extended.qls @@ -1,4 +1,4 @@ - description: Security-extended queries for Java -- qlpack: codeql-java +- queries: . - apply: security-extended-selectors.yml from: codeql/suite-helpers diff --git a/java/ql/src/qlpack.lock.yml b/java/ql/src/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/java/ql/src/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml index 7c48700e295..23f00c438be 100644 --- a/java/ql/src/qlpack.yml +++ b/java/ql/src/qlpack.yml @@ -1,5 +1,7 @@ -name: codeql-java -version: 0.0.0 -dbscheme: config/semmlecode.dbscheme +name: codeql/java-queries +version: 0.0.2 suites: codeql-suites extractor: java +dependencies: + codeql/java-all: ^0.0.2 + codeql/suite-helpers: ^0.0.2 diff --git a/java/ql/test/qlpack.lock.yml b/java/ql/test/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/java/ql/test/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/java/ql/test/qlpack.yml b/java/ql/test/qlpack.yml index 1db4e776c00..b3b242c8d50 100644 --- a/java/ql/test/qlpack.yml +++ b/java/ql/test/qlpack.yml @@ -1,5 +1,7 @@ -name: codeql-java-tests +name: codeql/java-tests version: 0.0.0 -libraryPathDependencies: codeql-java +dependencies: + codeql/java-all: ^0.0.1 + codeql/java-queries: ^0.0.1 extractor: java tests: . diff --git a/java/upgrades/qlpack.lock.yml b/java/upgrades/qlpack.lock.yml new file mode 100644 index 00000000000..06dd07fc7dc --- /dev/null +++ b/java/upgrades/qlpack.lock.yml @@ -0,0 +1,4 @@ +--- +dependencies: {} +compiled: false +lockVersion: 1.0.0 diff --git a/java/upgrades/qlpack.yml b/java/upgrades/qlpack.yml index aee4ed51c3e..fde82dcada2 100644 --- a/java/upgrades/qlpack.yml +++ b/java/upgrades/qlpack.yml @@ -1,2 +1,4 @@ -name: codeql-java-upgrades +name: codeql/java-upgrades upgrades: . +library: true +version: 0.0.2 diff --git a/misc/legacy-support/java/qlpack.yml b/misc/legacy-support/java/qlpack.yml index 0773c30c9f9..e314f7a93b7 100644 --- a/misc/legacy-support/java/qlpack.yml +++ b/misc/legacy-support/java/qlpack.yml @@ -1,4 +1,4 @@ name: legacy-libraries-java version: 0.0.0 libraryPathDependencies: - - codeql-java + - codeql/java-all