Added maven dependency flag to include groupIds when copying dependen… (#195)

* Added maven dependency flag to include groupIds when copying dependencies

* updated java maven dependency test expected results

* update java maven unit test

Co-authored-by: Cosh_ <[email protected]>

Author: lausdahl

aws_lambda_builders/workflows/java_maven/maven.py

@@ -34,7 +34,7 @@ def build(self, scratch_dir):
             raise MavenExecutionError(message=stdout.decode("utf8").strip())
 
     def copy_dependency(self, scratch_dir):
-        args = ["dependency:copy-dependencies", "-DincludeScope=compile"]
+        args = ["dependency:copy-dependencies", "-DincludeScope=compile", "-Dmdep.prependGroupId=true"]
         ret_code, stdout, _ = self._run(args, scratch_dir)
 
         if ret_code != 0:

tests/integration/workflows/java_maven/test_java_maven.py

@@ -28,7 +28,7 @@ def test_build_single_build_with_deps_resources_exclude_test_jars(self):
         expected_files = [
             p("aws", "lambdabuilders", "Main.class"),
             p("some_data.txt"),
-            p("lib", "annotations-2.1.0.jar"),
+            p("lib", "software.amazon.awssdk.annotations-2.1.0.jar"),
         ]
         self.assert_artifact_contains_files(expected_files)
         self.assert_artifact_not_contains_file(p("lib", "junit-4.12.jar"))

tests/unit/workflows/java_maven/test_maven.py

@@ -61,7 +61,7 @@ def test_copy_dependency(self):
         maven = SubprocessMaven(maven_binary=self.maven_binary, os_utils=self.os_utils)
         maven.copy_dependency(self.source_dir)
         self.os_utils.popen.assert_called_with(
-            [self.maven_path, "dependency:copy-dependencies", "-DincludeScope=compile"],
+            [self.maven_path, "dependency:copy-dependencies", "-DincludeScope=compile", "-Dmdep.prependGroupId=true"],
             cwd=self.source_dir,
             stderr=subprocess.PIPE,
             stdout=subprocess.PIPE,