Moved from experimental to standard

java/ql/src/Security/CWE/CWE-917/OgnlInjection.ql

@@ -12,8 +12,8 @@
 
 import java
 import semmle.code.java.dataflow.FlowSources
+import semmle.code.java.security.OgnlInjection
 import DataFlow::PathGraph
-import OgnlInjectionLib
 
 /**
  * A taint-tracking configuration for unvalidated user input that is used in OGNL EL evaluation.

java/ql/src/semmle/code/java/dataflow/ExternalFlow.qll

@@ -81,6 +81,7 @@ private module Frameworks {
   private import semmle.code.java.security.XSS
   private import semmle.code.java.security.LdapInjection
   private import semmle.code.java.security.XPath
+  private import semmle.code.java.security.OgnlInjection
 }
 
 private predicate sourceModelCsv(string row) {

java/ql/test/experimental/query-tests/security/CWE-917/OgnlInjection.qlref

@@ -1 +0,0 @@
-experimental/Security/CWE/CWE-917/OgnlInjection.ql

java/ql/test/experimental/query-tests/security/CWE-917/options

@@ -1 +0,0 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.2.3:${testdir}/../../../stubs/ognl-3.2.14:${testdir}/../../../stubs/struts2-core-2.5.22

java/ql/test/query-tests/security/CWE-917/OgnlInjection.qlref

@@ -0,0 +1 @@
+Security/CWE/CWE-917/OgnlInjection.ql

java/ql/test/query-tests/security/CWE-917/options

@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.2.3:${testdir}/../../../stubs/ognl-3.2.14:${testdir}/../../../stubs/struts2-core-2.5.22