Changed test project for build with subpackage test case

com.salesforce.b2eclipse.tests/projects/build-with-subpackage/WORKSPACE

@@ -1,30 +0,0 @@
-workspace(name = "bazel_ls_demo_project")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-# bazel-skylib 0.8.0 released 2019.03.20 (https://github.com/bazelbuild/bazel-skylib/releases/tag/0.8.0)
-skylib_version = "0.8.0"
-http_archive(
-    name = "bazel_skylib",
-   type = "tar.gz",
-   url = "https://github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib.{}.tar.gz".format (skylib_version, skylib_version),
-    sha256 = "2ef429f5d7ce7111263289644d233707dba35e39696377ebab8b0bc701f7818e",
-)
-
-# check minimum Bazel version
-load("@bazel_skylib//lib:versions.bzl", "versions")
-versions.check(minimum_bazel_version= "2.0.0")
-
-http_archive(
-    name = "salesforce_rules_mybuilder",
-    url = "https://github.com/salesforce/bazel-java-builder-template/archive/ea683699c346a0b75960dd3bb02aa21fc910fdb4.zip",
-    strip_prefix = "bazel-java-builder-template-ea683699c346a0b75960dd3bb02aa21fc910fdb4"
-)
-load("@salesforce_rules_mybuilder//mybuilder:repositories.bzl", "rules_mybuilder_dependencies", "rules_mybuilder_toolchains")
-rules_mybuilder_dependencies()
-rules_mybuilder_toolchains()
-
-# Maven dependencies
-load("//third_party/maven:dependencies.bzl", "maven_dependencies")
-maven_dependencies()
-

com.salesforce.b2eclipse.tests/projects/build-with-subpackage/module1/BUILD

@@ -1,25 +1,8 @@
 load("@rules_java//java:defs.bzl", "java_binary")
-load("@salesforce_rules_mybuilder//mybuilder:defs.bzl", "mybuilder_gen")
-
-mybuilder_gen(
-    name = "mybuilder_sample_generation",
-    srcs = glob(
-        ["java/resources/**/*.txt"],
-    ),
-    srcjar = "mybuilder_generated.srcjar",
-    gendir = "mybuilder_generated",
-)
 
 java_binary(
-    name = "module1",
-    srcs = glob(["java/src/**/*.java"]) + [":mybuilder_sample_generation"],
-    resources = glob(
-        ["java/resources/**/*.txt"],
-    ),
-    deps = [
-      "//module2",
-      "//module3",
-      "@com_google_guava//jar",
-    ],
-    main_class = "hello.Hello",
+    name = "ProjectRunner",
+    srcs = glob(["java/src/example/ProjectRunner.java"]),
+    main_class = "example.ProjectRunner",
+    deps = ["//module1/module2:greeter"],
 )

com.salesforce.b2eclipse.tests/projects/build-with-subpackage/module1/java/src/example/ProjectRunner.java

@@ -0,0 +1,9 @@
+package example;
+
+import greeting.SayHi;
+
+public class ProjectRunner {
+    public static void main(String args[]) {
+        SayHi.sayHi();
+    }
+}

com.salesforce.b2eclipse.tests/projects/build-with-subpackage/module3/BUILD → com.salesforce.b2eclipse.tests/projects/build-with-subpackage/module1/module2/BUILD

@@ -1,7 +1,7 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
-java_library (
-    name = "module3",
-    srcs = glob(["java/src/**/*.java"]),
+java_library(
+    name = "greeter",
+    srcs = glob(["java/src/greeting/SayHi.java"]),
     visibility = ["//visibility:public"],
 )

com.salesforce.b2eclipse.tests/projects/build-with-subpackage/module1/module4/java/src/sayhi/SayHi.java → com.salesforce.b2eclipse.tests/projects/build-with-subpackage/module1/module2/java/src/greeting/SayHi.java

@@ -1,12 +1,7 @@
-package sayhi;
-
-import log.Logger;
+package greeting;
 
 public class SayHi {
-
     public static void sayHi() {
-        Logger.logDebug("SayHi.sayHi");
         System.out.println("Hi!");
     }
-
-}
+}