Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CoshUS merged 5 commits into from
May 3, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd65af6
Added maven dependency flag to include groupIds when copying dependen…
lausdahl Sep 3, 2020
c864603
updated java maven dependency test expected results
lausdahl Sep 3, 2020
f8b6ff1
update java maven unit test
lausdahl Sep 3, 2020
f852df2
Merge branch 'develop' into develop
CoshUS Mar 16, 2021
1af8189
Merge branch 'develop' into develop
lausdahl May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws_lambda_builders/workflows/java_maven/maven.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/workflows/java_maven/test_java_maven.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/workflows/java_maven/test_maven.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down