Java: Add dependency to the java query pack and update lock file.

Author: michaelnebel

java/src/codeql-pack.lock.yml

@@ -5,6 +5,8 @@ dependencies:
     version: 1.1.4
   codeql/java-all:
     version: 4.1.1
+  codeql/java-queries:
+    version: 1.1.7
   codeql/mad:
     version: 1.0.10
   codeql/rangeanalysis:
@@ -13,6 +15,8 @@ dependencies:
     version: 1.0.10
   codeql/ssa:
     version: 1.0.10
+  codeql/suite-helpers:
+    version: 1.0.10
   codeql/threat-models:
     version: 1.0.10
   codeql/tutorial:

java/src/qlpack.yml

@@ -5,4 +5,5 @@ suites: suites
 defaultSuiteFile: suites/java.qls
 dependencies:
   codeql/java-all: '*'
+  codeql/java-queries: '*'
   githubsecuritylab/codeql-java-libs: '*'

java/test/TestUtilities/PrettyPrintModels.ql

@@ -5,7 +5,3 @@
 import semmle.code.java.dataflow.ExternalFlow
 import codeql.dataflow.test.ProvenancePathGraph
 import codeql.dataflow.test.ProvenancePathGraph::TestPostProcessing::TranslateProvenanceResults<interpretModelForTest/2>
-
-from string relation, int row, int column, string data
-where results(relation, row, column, data)
-select relation, row, column, data