diff --git a/demo-output.yaml b/demo-output.yaml
index 12864c19..8816e0e6 100644
--- a/demo-output.yaml
+++ b/demo-output.yaml
@@ -156,47 +156,57 @@
           matchingXML: |-
             <groupId>javax</groupId><artifactId>javaee-api</artifactId><!-- This leads to https://github.com/konveyor/analyzer-lsp/issues/390
                              as the property cannot be resolved here but only in the parent POM --><version>${javaee-api.version}</version><scope>provided</scope>
+      - uri: file:///analyzer-lsp/examples/java/example/pom.xml
+        message: |-
+          <groupId>javax</groupId><artifactId>javaee-api</artifactId><!-- This leads to https://github.com/konveyor/analyzer-lsp/issues/390
+                           as the property cannot be resolved here but only in the parent POM --><version>${javaee-api.version}</version><scope>provided</scope>
+        variables:
+          data: dependency
+          innerText: "\n            javax\n            javaee-api\n            \n            ${javaee-api.version}\n            provided\n        "
+          matchingXML: |-
+            <groupId>javax</groupId><artifactId>javaee-api</artifactId><!-- This leads to https://github.com/konveyor/analyzer-lsp/issues/390
+                             as the property cannot be resolved here but only in the parent POM --><version>${javaee-api.version}</version><scope>provided</scope>
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: <groupId>io.fabric8</groupId><artifactId>kubernetes-client-api</artifactId><version>6.0.0</version>
         codeSnip: |-
-          30        <version>4.11</version>
-          31        <scope>test</scope>
-          32      </dependency>
-          33      <dependency>
-          34        <groupId>io.fabric8</groupId>
-          35        <artifactId>kubernetes-client</artifactId>
-          36        <version>6.0.0</version>
-          37      </dependency>
-          38      <dependency>
-          39        <groupId>io.fabric8</groupId>
-          40        <artifactId>kubernetes-client-api</artifactId>
-          41        <version>6.0.0</version>
-          42      </dependency>
-          43      <dependency>
-          44        <groupId>javax</groupId>
-          45        <artifactId>javaee-api</artifactId>
-          46        <version>${javaee-api.version}</version>
-          47        <scope>provided</scope>
-          48      </dependency>
-          49      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->
-          50      <dependency>
-        lineNumber: 39
+          31        <version>4.11</version>
+          32        <scope>test</scope>
+          33      </dependency>
+          34      <dependency>
+          35        <groupId>io.fabric8</groupId>
+          36        <artifactId>kubernetes-client</artifactId>
+          37        <version>6.0.0</version>
+          38      </dependency>
+          39      <dependency>
+          40        <groupId>io.fabric8</groupId>
+          41        <artifactId>kubernetes-client-api</artifactId>
+          42        <version>6.0.0</version>
+          43      </dependency>
+          44      <dependency>
+          45        <groupId>javax</groupId>
+          46        <artifactId>javaee-api</artifactId>
+          47        <version>${javaee-api.version}</version>
+          48        <scope>provided</scope>
+          49      </dependency>
+          50      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->
+          51      <dependency>
+        lineNumber: 40
         variables:
           data: dependency
           innerText: "\n      io.fabric8\n      kubernetes-client-api\n      6.0.0\n    "
           matchingXML: <groupId>io.fabric8</groupId><artifactId>kubernetes-client-api</artifactId><version>6.0.0</version>
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: <groupId>io.fabric8</groupId><artifactId>kubernetes-client</artifactId><version>6.0.0</version>
-        codeSnip: "25  \n26    <dependencies>\n27      <dependency>\n28        <groupId>junit</groupId>\n29        <artifactId>junit</artifactId>\n30        <version>4.11</version>\n31        <scope>test</scope>\n32      </dependency>\n33      <dependency>\n34        <groupId>io.fabric8</groupId>\n35        <artifactId>kubernetes-client</artifactId>\n36        <version>6.0.0</version>\n37      </dependency>\n38      <dependency>\n39        <groupId>io.fabric8</groupId>\n40        <artifactId>kubernetes-client-api</artifactId>\n41        <version>6.0.0</version>\n42      </dependency>\n43      <dependency>\n44        <groupId>javax</groupId>\n45        <artifactId>javaee-api</artifactId>"
-        lineNumber: 34
+        codeSnip: "26  \n27    <dependencies>\n28      <dependency>\n29        <groupId>junit</groupId>\n30        <artifactId>junit</artifactId>\n31        <version>4.11</version>\n32        <scope>test</scope>\n33      </dependency>\n34      <dependency>\n35        <groupId>io.fabric8</groupId>\n36        <artifactId>kubernetes-client</artifactId>\n37        <version>6.0.0</version>\n38      </dependency>\n39      <dependency>\n40        <groupId>io.fabric8</groupId>\n41        <artifactId>kubernetes-client-api</artifactId>\n42        <version>6.0.0</version>\n43      </dependency>\n44      <dependency>\n45        <groupId>javax</groupId>\n46        <artifactId>javaee-api</artifactId>"
+        lineNumber: 35
         variables:
           data: dependency
           innerText: "\n      io.fabric8\n      kubernetes-client\n      6.0.0\n    "
           matchingXML: <groupId>io.fabric8</groupId><artifactId>kubernetes-client</artifactId><version>6.0.0</version>
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: <groupId>io.netty</groupId><artifactId>netty-transport-native-epoll</artifactId><version>4.1.76.Final</version><classifier>linux-x86_64</classifier><scope>runtime</scope>
-        codeSnip: "42      </dependency>\n43      <dependency>\n44        <groupId>javax</groupId>\n45        <artifactId>javaee-api</artifactId>\n46        <version>${javaee-api.version}</version>\n47        <scope>provided</scope>\n48      </dependency>\n49      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->\n50      <dependency>\n51        <groupId>io.netty</groupId>\n52        <artifactId>netty-transport-native-epoll</artifactId>\n53        <version>4.1.76.Final</version>\n54        <classifier>linux-x86_64</classifier>\n55        <scope>runtime</scope>\n56      </dependency>\n57    </dependencies>\n58  \n59    <build>\n60      <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->\n61        <plugins>\n62          <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->"
-        lineNumber: 51
+        codeSnip: "43      </dependency>\n44      <dependency>\n45        <groupId>javax</groupId>\n46        <artifactId>javaee-api</artifactId>\n47        <version>${javaee-api.version}</version>\n48        <scope>provided</scope>\n49      </dependency>\n50      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->\n51      <dependency>\n52        <groupId>io.netty</groupId>\n53        <artifactId>netty-transport-native-epoll</artifactId>\n54        <version>4.1.76.Final</version>\n55        <classifier>linux-x86_64</classifier>\n56        <scope>runtime</scope>\n57      </dependency>\n58    </dependencies>\n59  \n60    <build>\n61      <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->\n62        <plugins>\n63          <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->"
+        lineNumber: 52
         variables:
           data: dependency
           innerText: "\n      io.netty\n      netty-transport-native-epoll\n      4.1.76.Final\n      linux-x86_64\n      runtime\n    "
@@ -204,36 +214,36 @@
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: <groupId>javax</groupId><artifactId>javaee-api</artifactId><version>${javaee-api.version}</version><scope>provided</scope>
         codeSnip: |-
-          35        <artifactId>kubernetes-client</artifactId>
-          36        <version>6.0.0</version>
-          37      </dependency>
-          38      <dependency>
-          39        <groupId>io.fabric8</groupId>
-          40        <artifactId>kubernetes-client-api</artifactId>
-          41        <version>6.0.0</version>
-          42      </dependency>
-          43      <dependency>
-          44        <groupId>javax</groupId>
-          45        <artifactId>javaee-api</artifactId>
-          46        <version>${javaee-api.version}</version>
-          47        <scope>provided</scope>
-          48      </dependency>
-          49      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->
-          50      <dependency>
-          51        <groupId>io.netty</groupId>
-          52        <artifactId>netty-transport-native-epoll</artifactId>
-          53        <version>4.1.76.Final</version>
-          54        <classifier>linux-x86_64</classifier>
-          55        <scope>runtime</scope>
-        lineNumber: 44
+          36        <artifactId>kubernetes-client</artifactId>
+          37        <version>6.0.0</version>
+          38      </dependency>
+          39      <dependency>
+          40        <groupId>io.fabric8</groupId>
+          41        <artifactId>kubernetes-client-api</artifactId>
+          42        <version>6.0.0</version>
+          43      </dependency>
+          44      <dependency>
+          45        <groupId>javax</groupId>
+          46        <artifactId>javaee-api</artifactId>
+          47        <version>${javaee-api.version}</version>
+          48        <scope>provided</scope>
+          49      </dependency>
+          50      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->
+          51      <dependency>
+          52        <groupId>io.netty</groupId>
+          53        <artifactId>netty-transport-native-epoll</artifactId>
+          54        <version>4.1.76.Final</version>
+          55        <classifier>linux-x86_64</classifier>
+          56        <scope>runtime</scope>
+        lineNumber: 45
         variables:
           data: dependency
           innerText: "\n      javax\n      javaee-api\n      ${javaee-api.version}\n      provided\n    "
           matchingXML: <groupId>javax</groupId><artifactId>javaee-api</artifactId><version>${javaee-api.version}</version><scope>provided</scope>
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: <groupId>junit</groupId><artifactId>junit</artifactId><version>4.11</version><scope>test</scope>
-        codeSnip: "19    <properties>\n20      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n21      <maven.compiler.source>1.7</maven.compiler.source>\n22      <maven.compiler.target>1.7</maven.compiler.target>\n23      <javaee-api.version>7.0</javaee-api.version>\n24    </properties>\n25  \n26    <dependencies>\n27      <dependency>\n28        <groupId>junit</groupId>\n29        <artifactId>junit</artifactId>\n30        <version>4.11</version>\n31        <scope>test</scope>\n32      </dependency>\n33      <dependency>\n34        <groupId>io.fabric8</groupId>\n35        <artifactId>kubernetes-client</artifactId>\n36        <version>6.0.0</version>\n37      </dependency>\n38      <dependency>\n39        <groupId>io.fabric8</groupId>"
-        lineNumber: 28
+        codeSnip: "20    <properties>\n21      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n22      <maven.compiler.source>1.7</maven.compiler.source>\n23      <maven.compiler.target>1.7</maven.compiler.target>\n24      <javaee-api.version>7.0</javaee-api.version>\n25    </properties>\n26  \n27    <dependencies>\n28      <dependency>\n29        <groupId>junit</groupId>\n30        <artifactId>junit</artifactId>\n31        <version>4.11</version>\n32        <scope>test</scope>\n33      </dependency>\n34      <dependency>\n35        <groupId>io.fabric8</groupId>\n36        <artifactId>kubernetes-client</artifactId>\n37        <version>6.0.0</version>\n38      </dependency>\n39      <dependency>\n40        <groupId>io.fabric8</groupId>"
+        lineNumber: 29
         variables:
           data: dependency
           innerText: "\n      junit\n      junit\n      4.11\n      test\n    "
@@ -297,15 +307,15 @@
       incidents:
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: dependency io.fabric8.kubernetes-client with 6.0.0 is bad and you should feel bad for using it
-        codeSnip: "25  \n26    <dependencies>\n27      <dependency>\n28        <groupId>junit</groupId>\n29        <artifactId>junit</artifactId>\n30        <version>4.11</version>\n31        <scope>test</scope>\n32      </dependency>\n33      <dependency>\n34        <groupId>io.fabric8</groupId>\n35        <artifactId>kubernetes-client</artifactId>\n36        <version>6.0.0</version>\n37      </dependency>\n38      <dependency>\n39        <groupId>io.fabric8</groupId>\n40        <artifactId>kubernetes-client-api</artifactId>\n41        <version>6.0.0</version>\n42      </dependency>\n43      <dependency>\n44        <groupId>javax</groupId>\n45        <artifactId>javaee-api</artifactId>"
-        lineNumber: 34
+        codeSnip: "26  \n27    <dependencies>\n28      <dependency>\n29        <groupId>junit</groupId>\n30        <artifactId>junit</artifactId>\n31        <version>4.11</version>\n32        <scope>test</scope>\n33      </dependency>\n34      <dependency>\n35        <groupId>io.fabric8</groupId>\n36        <artifactId>kubernetes-client</artifactId>\n37        <version>6.0.0</version>\n38      </dependency>\n39      <dependency>\n40        <groupId>io.fabric8</groupId>\n41        <artifactId>kubernetes-client-api</artifactId>\n42        <version>6.0.0</version>\n43      </dependency>\n44      <dependency>\n45        <groupId>javax</groupId>\n46        <artifactId>javaee-api</artifactId>"
+        lineNumber: 35
         variables:
           name: io.fabric8.kubernetes-client
           version: 6.0.0
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: dependency junit.junit with 4.11 is bad and you should feel bad for using it
-        codeSnip: "19    <properties>\n20      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n21      <maven.compiler.source>1.7</maven.compiler.source>\n22      <maven.compiler.target>1.7</maven.compiler.target>\n23      <javaee-api.version>7.0</javaee-api.version>\n24    </properties>\n25  \n26    <dependencies>\n27      <dependency>\n28        <groupId>junit</groupId>\n29        <artifactId>junit</artifactId>\n30        <version>4.11</version>\n31        <scope>test</scope>\n32      </dependency>\n33      <dependency>\n34        <groupId>io.fabric8</groupId>\n35        <artifactId>kubernetes-client</artifactId>\n36        <version>6.0.0</version>\n37      </dependency>\n38      <dependency>\n39        <groupId>io.fabric8</groupId>"
-        lineNumber: 28
+        codeSnip: "20    <properties>\n21      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n22      <maven.compiler.source>1.7</maven.compiler.source>\n23      <maven.compiler.target>1.7</maven.compiler.target>\n24      <javaee-api.version>7.0</javaee-api.version>\n25    </properties>\n26  \n27    <dependencies>\n28      <dependency>\n29        <groupId>junit</groupId>\n30        <artifactId>junit</artifactId>\n31        <version>4.11</version>\n32        <scope>test</scope>\n33      </dependency>\n34      <dependency>\n35        <groupId>io.fabric8</groupId>\n36        <artifactId>kubernetes-client</artifactId>\n37        <version>6.0.0</version>\n38      </dependency>\n39      <dependency>\n40        <groupId>io.fabric8</groupId>"
+        lineNumber: 29
         variables:
           name: junit.junit
           version: "4.11"
@@ -318,6 +328,55 @@
         lineNumber: 10
         variables:
           file: file:///analyzer-lsp/examples/golang/main.go
+      - uri: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+        message: apiextensions/v1beta1/customresourcedefinitions is deprecated, apiextensions/v1/customresourcedefinitions should be used instead
+        codeSnip: " 1  package com.example.apps;\n 2  \n 3  import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;\n 4  \n 5  public class App \n 6  {\n 7  \n 8      /**\n 9       * {@link CustomResourceDefinition}\n10       * @param args\n11       */\n12      public static void main( String[] args )\n13      {"
+        lineNumber: 3
+        variables:
+          file: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+          kind: Module
+          name: io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition
+      - uri: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+        message: apiextensions/v1beta1/customresourcedefinitions is deprecated, apiextensions/v1/customresourcedefinitions should be used instead
+        codeSnip: " 4  \n 5  public class App \n 6  {\n 7  \n 8      /**\n 9       * {@link CustomResourceDefinition}\n10       * @param args\n11       */\n12      public static void main( String[] args )\n13      {\n14          CustomResourceDefinition crd = new CustomResourceDefinition();\n15          System.out.println( crd );\n16  \n17          GenericClass<String> element = new GenericClass<String>(\"Hello world!\");\n18          element.get();\n19      }\n20  }\n"
+        lineNumber: 14
+        variables:
+          file: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+          kind: Method
+          name: main
+    lang-ref-003:
+      description: ""
+      category: potential
+      incidents:
+      - uri: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+        message: java found apiextensions/v1/customresourcedefinitions found file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java:14
+        codeSnip: " 4  \n 5  public class App \n 6  {\n 7  \n 8      /**\n 9       * {@link CustomResourceDefinition}\n10       * @param args\n11       */\n12      public static void main( String[] args )\n13      {\n14          CustomResourceDefinition crd = new CustomResourceDefinition();\n15          System.out.println( crd );\n16  \n17          GenericClass<String> element = new GenericClass<String>(\"Hello world!\");\n18          element.get();\n19      }\n20  }\n"
+        lineNumber: 14
+        variables:
+          file: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+          kind: Method
+          name: main
+      - uri: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+        message: java found apiextensions/v1/customresourcedefinitions found file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java:3
+        codeSnip: " 1  package com.example.apps;\n 2  \n 3  import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;\n 4  \n 5  public class App \n 6  {\n 7  \n 8      /**\n 9       * {@link CustomResourceDefinition}\n10       * @param args\n11       */\n12      public static void main( String[] args )\n13      {"
+        lineNumber: 3
+        variables:
+          file: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+          kind: Module
+          name: io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition
+    lang-ref-004:
+      description: ""
+      category: potential
+      incidents:
+      - uri: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+        message: found generic call
+        codeSnip: " 8      /**\n 9       * {@link CustomResourceDefinition}\n10       * @param args\n11       */\n12      public static void main( String[] args )\n13      {\n14          CustomResourceDefinition crd = new CustomResourceDefinition();\n15          System.out.println( crd );\n16  \n17          GenericClass<String> element = new GenericClass<String>(\"Hello world!\");\n18          element.get();\n19      }\n20  }\n"
+        lineNumber: 18
+        variables:
+          VariableName: element
+          file: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/App.java
+          kind: Method
+          name: main
     multiple-actions-001:
       description: ""
       category: potential
@@ -364,6 +423,46 @@
         lineNumber: 27
         variables:
           file: file:///analyzer-lsp/examples/python/main.py
+    singleton-sessionbean-00001:
+      description: ""
+      category: potential
+      incidents:
+      - uri: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/Bean.java
+        message: condition entries should evaluate out of order
+        codeSnip: " 1  package com.example.apps;\n 2  \n 3  import javax.ejb.SessionBean;\n 4  import javax.ejb.Singleton;\n 5  \n 6  @Singleton\n 7  public abstract class Bean implements SessionBean {\n 8  }\n"
+        lineNumber: 6
+        variables:
+          file: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/Bean.java
+          kind: Class
+          name: Singleton
+      - uri: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/Bean.java
+        message: condition entries should evaluate out of order
+        codeSnip: " 1  package com.example.apps;\n 2  \n 3  import javax.ejb.SessionBean;\n 4  import javax.ejb.Singleton;\n 5  \n 6  @Singleton\n 7  public abstract class Bean implements SessionBean {\n 8  }\n"
+        lineNumber: 7
+        variables:
+          file: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/Bean.java
+          kind: Class
+          name: Bean
+    singleton-sessionbean-00002:
+      description: ""
+      category: potential
+      incidents:
+      - uri: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/Bean.java
+        message: condition entries should evaluate in order
+        codeSnip: " 1  package com.example.apps;\n 2  \n 3  import javax.ejb.SessionBean;\n 4  import javax.ejb.Singleton;\n 5  \n 6  @Singleton\n 7  public abstract class Bean implements SessionBean {\n 8  }\n"
+        lineNumber: 6
+        variables:
+          file: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/Bean.java
+          kind: Class
+          name: Singleton
+      - uri: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/Bean.java
+        message: condition entries should evaluate in order
+        codeSnip: " 1  package com.example.apps;\n 2  \n 3  import javax.ejb.SessionBean;\n 4  import javax.ejb.Singleton;\n 5  \n 6  @Singleton\n 7  public abstract class Bean implements SessionBean {\n 8  }\n"
+        lineNumber: 7
+        variables:
+          file: file:///analyzer-lsp/examples/java/example/src/main/java/com/example/apps/Bean.java
+          kind: Class
+          name: Bean
     tech-tag-001:
       description: ""
       category: potential
@@ -529,47 +628,57 @@
           matchingXML: |-
             <groupId>javax</groupId><artifactId>javaee-api</artifactId><!-- This leads to https://github.com/konveyor/analyzer-lsp/issues/390
                              as the property cannot be resolved here but only in the parent POM --><version>${javaee-api.version}</version><scope>provided</scope>
+      - uri: file:///analyzer-lsp/examples/java/example/pom.xml
+        message: |-
+          POM XML dependencies - '<groupId>javax</groupId><artifactId>javaee-api</artifactId><!-- This leads to https://github.com/konveyor/analyzer-lsp/issues/390
+                           as the property cannot be resolved here but only in the parent POM --><version>${javaee-api.version}</version><scope>provided</scope>'
+        variables:
+          data: dependency
+          innerText: "\n            javax\n            javaee-api\n            \n            ${javaee-api.version}\n            provided\n        "
+          matchingXML: |-
+            <groupId>javax</groupId><artifactId>javaee-api</artifactId><!-- This leads to https://github.com/konveyor/analyzer-lsp/issues/390
+                             as the property cannot be resolved here but only in the parent POM --><version>${javaee-api.version}</version><scope>provided</scope>
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: POM XML dependencies - '<groupId>io.fabric8</groupId><artifactId>kubernetes-client-api</artifactId><version>6.0.0</version>'
         codeSnip: |-
-          30        <version>4.11</version>
-          31        <scope>test</scope>
-          32      </dependency>
-          33      <dependency>
-          34        <groupId>io.fabric8</groupId>
-          35        <artifactId>kubernetes-client</artifactId>
-          36        <version>6.0.0</version>
-          37      </dependency>
-          38      <dependency>
-          39        <groupId>io.fabric8</groupId>
-          40        <artifactId>kubernetes-client-api</artifactId>
-          41        <version>6.0.0</version>
-          42      </dependency>
-          43      <dependency>
-          44        <groupId>javax</groupId>
-          45        <artifactId>javaee-api</artifactId>
-          46        <version>${javaee-api.version}</version>
-          47        <scope>provided</scope>
-          48      </dependency>
-          49      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->
-          50      <dependency>
-        lineNumber: 39
+          31        <version>4.11</version>
+          32        <scope>test</scope>
+          33      </dependency>
+          34      <dependency>
+          35        <groupId>io.fabric8</groupId>
+          36        <artifactId>kubernetes-client</artifactId>
+          37        <version>6.0.0</version>
+          38      </dependency>
+          39      <dependency>
+          40        <groupId>io.fabric8</groupId>
+          41        <artifactId>kubernetes-client-api</artifactId>
+          42        <version>6.0.0</version>
+          43      </dependency>
+          44      <dependency>
+          45        <groupId>javax</groupId>
+          46        <artifactId>javaee-api</artifactId>
+          47        <version>${javaee-api.version}</version>
+          48        <scope>provided</scope>
+          49      </dependency>
+          50      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->
+          51      <dependency>
+        lineNumber: 40
         variables:
           data: dependency
           innerText: "\n      io.fabric8\n      kubernetes-client-api\n      6.0.0\n    "
           matchingXML: <groupId>io.fabric8</groupId><artifactId>kubernetes-client-api</artifactId><version>6.0.0</version>
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: POM XML dependencies - '<groupId>io.fabric8</groupId><artifactId>kubernetes-client</artifactId><version>6.0.0</version>'
-        codeSnip: "25  \n26    <dependencies>\n27      <dependency>\n28        <groupId>junit</groupId>\n29        <artifactId>junit</artifactId>\n30        <version>4.11</version>\n31        <scope>test</scope>\n32      </dependency>\n33      <dependency>\n34        <groupId>io.fabric8</groupId>\n35        <artifactId>kubernetes-client</artifactId>\n36        <version>6.0.0</version>\n37      </dependency>\n38      <dependency>\n39        <groupId>io.fabric8</groupId>\n40        <artifactId>kubernetes-client-api</artifactId>\n41        <version>6.0.0</version>\n42      </dependency>\n43      <dependency>\n44        <groupId>javax</groupId>\n45        <artifactId>javaee-api</artifactId>"
-        lineNumber: 34
+        codeSnip: "26  \n27    <dependencies>\n28      <dependency>\n29        <groupId>junit</groupId>\n30        <artifactId>junit</artifactId>\n31        <version>4.11</version>\n32        <scope>test</scope>\n33      </dependency>\n34      <dependency>\n35        <groupId>io.fabric8</groupId>\n36        <artifactId>kubernetes-client</artifactId>\n37        <version>6.0.0</version>\n38      </dependency>\n39      <dependency>\n40        <groupId>io.fabric8</groupId>\n41        <artifactId>kubernetes-client-api</artifactId>\n42        <version>6.0.0</version>\n43      </dependency>\n44      <dependency>\n45        <groupId>javax</groupId>\n46        <artifactId>javaee-api</artifactId>"
+        lineNumber: 35
         variables:
           data: dependency
           innerText: "\n      io.fabric8\n      kubernetes-client\n      6.0.0\n    "
           matchingXML: <groupId>io.fabric8</groupId><artifactId>kubernetes-client</artifactId><version>6.0.0</version>
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: POM XML dependencies - '<groupId>io.netty</groupId><artifactId>netty-transport-native-epoll</artifactId><version>4.1.76.Final</version><classifier>linux-x86_64</classifier><scope>runtime</scope>'
-        codeSnip: "42      </dependency>\n43      <dependency>\n44        <groupId>javax</groupId>\n45        <artifactId>javaee-api</artifactId>\n46        <version>${javaee-api.version}</version>\n47        <scope>provided</scope>\n48      </dependency>\n49      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->\n50      <dependency>\n51        <groupId>io.netty</groupId>\n52        <artifactId>netty-transport-native-epoll</artifactId>\n53        <version>4.1.76.Final</version>\n54        <classifier>linux-x86_64</classifier>\n55        <scope>runtime</scope>\n56      </dependency>\n57    </dependencies>\n58  \n59    <build>\n60      <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->\n61        <plugins>\n62          <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->"
-        lineNumber: 51
+        codeSnip: "43      </dependency>\n44      <dependency>\n45        <groupId>javax</groupId>\n46        <artifactId>javaee-api</artifactId>\n47        <version>${javaee-api.version}</version>\n48        <scope>provided</scope>\n49      </dependency>\n50      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->\n51      <dependency>\n52        <groupId>io.netty</groupId>\n53        <artifactId>netty-transport-native-epoll</artifactId>\n54        <version>4.1.76.Final</version>\n55        <classifier>linux-x86_64</classifier>\n56        <scope>runtime</scope>\n57      </dependency>\n58    </dependencies>\n59  \n60    <build>\n61      <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->\n62        <plugins>\n63          <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->"
+        lineNumber: 52
         variables:
           data: dependency
           innerText: "\n      io.netty\n      netty-transport-native-epoll\n      4.1.76.Final\n      linux-x86_64\n      runtime\n    "
@@ -577,36 +686,36 @@
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: POM XML dependencies - '<groupId>javax</groupId><artifactId>javaee-api</artifactId><version>${javaee-api.version}</version><scope>provided</scope>'
         codeSnip: |-
-          35        <artifactId>kubernetes-client</artifactId>
-          36        <version>6.0.0</version>
-          37      </dependency>
-          38      <dependency>
-          39        <groupId>io.fabric8</groupId>
-          40        <artifactId>kubernetes-client-api</artifactId>
-          41        <version>6.0.0</version>
-          42      </dependency>
-          43      <dependency>
-          44        <groupId>javax</groupId>
-          45        <artifactId>javaee-api</artifactId>
-          46        <version>${javaee-api.version}</version>
-          47        <scope>provided</scope>
-          48      </dependency>
-          49      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->
-          50      <dependency>
-          51        <groupId>io.netty</groupId>
-          52        <artifactId>netty-transport-native-epoll</artifactId>
-          53        <version>4.1.76.Final</version>
-          54        <classifier>linux-x86_64</classifier>
-          55        <scope>runtime</scope>
-        lineNumber: 44
+          36        <artifactId>kubernetes-client</artifactId>
+          37        <version>6.0.0</version>
+          38      </dependency>
+          39      <dependency>
+          40        <groupId>io.fabric8</groupId>
+          41        <artifactId>kubernetes-client-api</artifactId>
+          42        <version>6.0.0</version>
+          43      </dependency>
+          44      <dependency>
+          45        <groupId>javax</groupId>
+          46        <artifactId>javaee-api</artifactId>
+          47        <version>${javaee-api.version}</version>
+          48        <scope>provided</scope>
+          49      </dependency>
+          50      <!-- This currently leads to https://github.com/konveyor/analyzer-lsp/issues/392 -->
+          51      <dependency>
+          52        <groupId>io.netty</groupId>
+          53        <artifactId>netty-transport-native-epoll</artifactId>
+          54        <version>4.1.76.Final</version>
+          55        <classifier>linux-x86_64</classifier>
+          56        <scope>runtime</scope>
+        lineNumber: 45
         variables:
           data: dependency
           innerText: "\n      javax\n      javaee-api\n      ${javaee-api.version}\n      provided\n    "
           matchingXML: <groupId>javax</groupId><artifactId>javaee-api</artifactId><version>${javaee-api.version}</version><scope>provided</scope>
       - uri: file:///analyzer-lsp/examples/java/pom.xml
         message: POM XML dependencies - '<groupId>junit</groupId><artifactId>junit</artifactId><version>4.11</version><scope>test</scope>'
-        codeSnip: "19    <properties>\n20      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n21      <maven.compiler.source>1.7</maven.compiler.source>\n22      <maven.compiler.target>1.7</maven.compiler.target>\n23      <javaee-api.version>7.0</javaee-api.version>\n24    </properties>\n25  \n26    <dependencies>\n27      <dependency>\n28        <groupId>junit</groupId>\n29        <artifactId>junit</artifactId>\n30        <version>4.11</version>\n31        <scope>test</scope>\n32      </dependency>\n33      <dependency>\n34        <groupId>io.fabric8</groupId>\n35        <artifactId>kubernetes-client</artifactId>\n36        <version>6.0.0</version>\n37      </dependency>\n38      <dependency>\n39        <groupId>io.fabric8</groupId>"
-        lineNumber: 28
+        codeSnip: "20    <properties>\n21      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n22      <maven.compiler.source>1.7</maven.compiler.source>\n23      <maven.compiler.target>1.7</maven.compiler.target>\n24      <javaee-api.version>7.0</javaee-api.version>\n25    </properties>\n26  \n27    <dependencies>\n28      <dependency>\n29        <groupId>junit</groupId>\n30        <artifactId>junit</artifactId>\n31        <version>4.11</version>\n32        <scope>test</scope>\n33      </dependency>\n34      <dependency>\n35        <groupId>io.fabric8</groupId>\n36        <artifactId>kubernetes-client</artifactId>\n37        <version>6.0.0</version>\n38      </dependency>\n39      <dependency>\n40        <groupId>io.fabric8</groupId>"
+        lineNumber: 29
         variables:
           data: dependency
           innerText: "\n      junit\n      junit\n      4.11\n      test\n    "
@@ -618,7 +727,3 @@
   unmatched:
   - file-002
   - lang-ref-002
-  - lang-ref-003
-  - lang-ref-004
-  - singleton-sessionbean-00001
-  - singleton-sessionbean-00002
diff --git a/examples/java/example/pom.xml b/examples/java/example/pom.xml
new file mode 100644
index 00000000..24bb0c3b
--- /dev/null
+++ b/examples/java/example/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.example.apps</groupId>
+        <artifactId>java</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>example</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <!-- This leads to https://github.com/konveyor/analyzer-lsp/issues/390
+                 as the property cannot be resolved here but only in the parent POM -->
+            <version>${javaee-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/examples/java/src/main/java/com/example/apps/App.java b/examples/java/example/src/main/java/com/example/apps/App.java
similarity index 100%
rename from examples/java/src/main/java/com/example/apps/App.java
rename to examples/java/example/src/main/java/com/example/apps/App.java
diff --git a/examples/java/src/main/java/com/example/apps/Bean.java b/examples/java/example/src/main/java/com/example/apps/Bean.java
similarity index 100%
rename from examples/java/src/main/java/com/example/apps/Bean.java
rename to examples/java/example/src/main/java/com/example/apps/Bean.java
diff --git a/examples/java/src/main/java/com/example/apps/GenericClass.java b/examples/java/example/src/main/java/com/example/apps/GenericClass.java
similarity index 100%
rename from examples/java/src/main/java/com/example/apps/GenericClass.java
rename to examples/java/example/src/main/java/com/example/apps/GenericClass.java
diff --git a/examples/java/src/test/java/com/example/apps/AppTest.java b/examples/java/example/src/test/java/com/example/apps/AppTest.java
similarity index 100%
rename from examples/java/src/test/java/com/example/apps/AppTest.java
rename to examples/java/example/src/test/java/com/example/apps/AppTest.java
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index 6d551026..e39d0517 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -14,6 +14,7 @@
   <url>http://www.example.com</url>
   <modules>
     <module>dummy</module>
+    <module>example</module>
   </modules>
 
   <properties>