diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40145a4ce..686b86669 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,7 +184,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'corretto' - java-version: '11' + java-version: '17' - run: make init - run: pytest -vv tests/integration/workflows/java_maven @@ -213,7 +213,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - run: make init - run: pytest -vv tests/integration/workflows/java_gradle diff --git a/aws_lambda_builders/validator.py b/aws_lambda_builders/validator.py index 7c353f221..de9d44a8c 100644 --- a/aws_lambda_builders/validator.py +++ b/aws_lambda_builders/validator.py @@ -21,6 +21,7 @@ "ruby2.7": [ARM64, X86_64], "java8": [ARM64, X86_64], "java11": [ARM64, X86_64], + "java17": [ARM64, X86_64], "go1.x": [ARM64, X86_64], "dotnetcore3.1": [ARM64, X86_64], "dotnet6": [ARM64, X86_64], diff --git a/tests/integration/workflows/java_gradle/test_java_gradle.py b/tests/integration/workflows/java_gradle/test_java_gradle.py index ddbb0b23a..bddb08bac 100644 --- a/tests/integration/workflows/java_gradle/test_java_gradle.py +++ b/tests/integration/workflows/java_gradle/test_java_gradle.py @@ -6,6 +6,8 @@ from pathlib import Path from os.path import join +from parameterized import parameterized_class + from aws_lambda_builders.builder import LambdaBuilder from aws_lambda_builders.exceptions import WorkflowFailedError @@ -16,6 +18,14 @@ ) +@parameterized_class( + ("runtime",), + [ + ["java8"], + ["java11"], + ["java17"], + ], +) class TestJavaGradle(TestCase): # Have to use str(Path(__file__).resolve()) here to workaround a Windows VSCode issue # __file__ will return lower case drive letters. Ex: c:\folder\test.py instead of C:\folder\test.py @@ -28,7 +38,6 @@ def setUp(self): self.scratch_dir = tempfile.mkdtemp() self.dependencies_dir = tempfile.mkdtemp() self.builder = LambdaBuilder(language="java", dependency_manager="gradle", application_framework=None) - self.runtime = "java11" def tearDown(self): shutil.rmtree(self.artifacts_dir) @@ -36,15 +45,15 @@ def tearDown(self): shutil.rmtree(self.dependencies_dir) def test_build_single_build_with_deps(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-deps") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-deps") manifest_path = join(source_dir, "build.gradle") self.builder.build(source_dir, self.artifacts_dir, self.scratch_dir, manifest_path, runtime=self.runtime) - expected_files = [join("aws", "lambdabuilders", "Main.class"), join("lib", "annotations-2.1.0.jar")] + expected_files = [join("aws", "lambdabuilders", "Main.class"), join("lib", "annotations-2.1.0.jar")] self.assertTrue(does_folder_contain_all_files(self.artifacts_dir, expected_files)) def test_build_single_build_with_resources(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-resources") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-resources") manifest_path = join(source_dir, "build.gradle") self.builder.build(source_dir, self.artifacts_dir, self.scratch_dir, manifest_path, runtime=self.runtime) expected_files = [ @@ -56,7 +65,7 @@ def test_build_single_build_with_resources(self): self.assertTrue(does_folder_contain_all_files(self.artifacts_dir, expected_files)) def test_build_single_build_with_test_deps_test_jars_not_included(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-test-deps") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-test-deps") manifest_path = join(source_dir, "build.gradle") self.builder.build(source_dir, self.artifacts_dir, self.scratch_dir, manifest_path, runtime=self.runtime) expected_files = [join("aws", "lambdabuilders", "Main.class"), join("lib", "annotations-2.1.0.jar")] @@ -65,7 +74,7 @@ def test_build_single_build_with_test_deps_test_jars_not_included(self): self.assertFalse(does_folder_contain_file(self.artifacts_dir, join("lib", "s3-2.1.0.jar"))) def test_build_single_build_with_deps_gradlew(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-deps-gradlew") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-deps") manifest_path = join(source_dir, "build.gradle") self.builder.build( source_dir, @@ -80,10 +89,11 @@ def test_build_single_build_with_deps_gradlew(self): self.assertTrue(does_folder_contain_all_files(self.artifacts_dir, expected_files)) def test_build_multi_build_with_deps_lambda1(self): - parent_dir = join(self.MULTI_BUILD_TEST_DATA_DIR, "with-deps") + parent_dir = join(self.MULTI_BUILD_TEST_DATA_DIR, self.runtime, "with-deps") manifest_path = join(parent_dir, "lambda1", "build.gradle") lambda1_source = join(parent_dir, "lambda1") + self.builder.build(lambda1_source, self.artifacts_dir, self.scratch_dir, manifest_path, runtime=self.runtime) lambda1_expected_files = [ @@ -93,7 +103,7 @@ def test_build_multi_build_with_deps_lambda1(self): self.assertTrue(does_folder_contain_all_files(self.artifacts_dir, lambda1_expected_files)) def test_build_multi_build_with_deps_lambda2(self): - parent_dir = join(self.MULTI_BUILD_TEST_DATA_DIR, "with-deps") + parent_dir = join(self.MULTI_BUILD_TEST_DATA_DIR, self.runtime, "with-deps") manifest_path = join(parent_dir, "lambda2", "build.gradle") lambda2_source = join(parent_dir, "lambda2") @@ -106,10 +116,11 @@ def test_build_multi_build_with_deps_lambda2(self): self.assertTrue(does_folder_contain_all_files(self.artifacts_dir, lambda2_expected_files)) def test_build_multi_build_with_deps_inter_module(self): - parent_dir = join(self.MULTI_BUILD_TEST_DATA_DIR, "with-deps-inter-module") + parent_dir = join(self.MULTI_BUILD_TEST_DATA_DIR, self.runtime, "with-deps-inter-module") manifest_path = join(parent_dir, "lambda1", "build.gradle") lambda1_source = join(parent_dir, "lambda1") + self.builder.build(lambda1_source, self.artifacts_dir, self.scratch_dir, manifest_path, runtime=self.runtime) lambda1_expected_files = [ @@ -120,14 +131,14 @@ def test_build_multi_build_with_deps_inter_module(self): self.assertTrue(does_folder_contain_all_files(self.artifacts_dir, lambda1_expected_files)) def test_build_single_build_with_deps_broken(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-deps-broken") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-deps-broken") manifest_path = join(source_dir, "build.gradle") with self.assertRaises(WorkflowFailedError) as raised: self.builder.build(source_dir, self.artifacts_dir, self.scratch_dir, manifest_path, runtime=self.runtime) self.assertTrue(raised.exception.args[0].startswith("JavaGradleWorkflow:GradleBuild - Gradle Failed")) def test_build_single_build_with_deps_dir(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-deps") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-deps") manifest_path = join(source_dir, "build.gradle") self.builder.build( source_dir, @@ -137,16 +148,18 @@ def test_build_single_build_with_deps_dir(self): runtime=self.runtime, dependencies_dir=self.dependencies_dir, ) - artifact_expected_files = [join("aws", "lambdabuilders", "Main.class"), join("lib", "annotations-2.1.0.jar")] + artifact_expected_files = [ + join("aws", "lambdabuilders", "Main.class"), + join("lib", "annotations-2.1.0.jar"), + ] dependencies_expected_files = [join("lib", "annotations-2.1.0.jar")] self.assertTrue(does_folder_contain_all_files(self.artifacts_dir, artifact_expected_files)) self.assertTrue(does_folder_contain_all_files(self.dependencies_dir, dependencies_expected_files)) def test_build_multi_build_with_deps_dir_inter_module(self): - parent_dir = join(self.MULTI_BUILD_TEST_DATA_DIR, "with-deps-inter-module") + parent_dir = join(self.MULTI_BUILD_TEST_DATA_DIR, self.runtime, "with-deps-inter-module") manifest_path = join(parent_dir, "lambda1", "build.gradle") - lambda1_source = join(parent_dir, "lambda1") self.builder.build( lambda1_source, @@ -170,7 +183,7 @@ def test_build_multi_build_with_deps_dir_inter_module(self): self.assertTrue(does_folder_contain_all_files(self.dependencies_dir, dependencies_expected_files)) def test_build_single_build_with_deps_dir_wtihout_combine_dependencies(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-deps") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-deps") manifest_path = join(source_dir, "build.gradle") self.builder.build( source_dir, @@ -194,7 +207,7 @@ def test_build_with_layers_and_scope(self): self.validate_function_build() def validate_layer_build(self): - layer_source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "layer") + layer_source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "layer") layer_manifest_path = join(layer_source_dir, "build.gradle") self.builder.build( layer_source_dir, @@ -212,7 +225,7 @@ def validate_layer_build(self): def validate_function_build(self): self.setUp() # re-initialize folders - function_source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-layer-deps") + function_source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-layer-deps") function_manifest_path = join(function_source_dir, "build.gradle") self.builder.build( function_source_dir, diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/build.gradle similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/build.gradle rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/build.gradle diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda2/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/common/build.gradle similarity index 58% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda2/build.gradle rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/common/build.gradle index e4af9df15..756799272 100644 --- a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda2/build.gradle +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/common/build.gradle @@ -9,3 +9,6 @@ repositories { dependencies { implementation 'software.amazon.awssdk:annotations:2.1.0' } + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda1/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda1/build.gradle similarity index 64% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda1/build.gradle rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda1/build.gradle index f3648f8cc..6cd2d2ade 100644 --- a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda1/build.gradle +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda1/build.gradle @@ -10,3 +10,6 @@ dependencies { implementation 'software.amazon.awssdk:annotations:2.1.0' implementation project(':common') } + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda2/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda2/build.gradle new file mode 100644 index 000000000..6cd2d2ade --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda2/build.gradle @@ -0,0 +1,15 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' + implementation project(':common') +} + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/settings.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/settings.gradle similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/settings.gradle rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps-inter-module/settings.gradle diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/build.gradle similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/build.gradle rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/build.gradle diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda1/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda1/build.gradle similarity index 58% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda1/build.gradle rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda1/build.gradle index e4af9df15..756799272 100644 --- a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda1/build.gradle +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda1/build.gradle @@ -9,3 +9,6 @@ repositories { dependencies { implementation 'software.amazon.awssdk:annotations:2.1.0' } + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda2/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda2/build.gradle similarity index 58% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda2/build.gradle rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda2/build.gradle index e4af9df15..756799272 100644 --- a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda2/build.gradle +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda2/build.gradle @@ -9,3 +9,6 @@ repositories { dependencies { implementation 'software.amazon.awssdk:annotations:2.1.0' } + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/settings.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/settings.gradle similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps/settings.gradle rename to tests/integration/workflows/java_gradle/testdata/multi-build/java11/with-deps/settings.gradle diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/build.gradle new file mode 100644 index 000000000..5c41c8421 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/build.gradle @@ -0,0 +1,5 @@ +allprojects { + repositories { + mavenCentral() + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/common/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/common/build.gradle new file mode 100644 index 000000000..b836b8f80 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/common/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java new file mode 100644 index 000000000..542be0095 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Foo { + public void sayHello() { + System.out.println("Hello world!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda1/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda1/build.gradle new file mode 100644 index 000000000..68e7d6192 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda1/build.gradle @@ -0,0 +1,15 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' + implementation project(':common') +} + +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java new file mode 100644 index 000000000..fca189e70 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Lambda1_Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda2/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda2/build.gradle new file mode 100644 index 000000000..b836b8f80 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda2/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java new file mode 100644 index 000000000..5f7fa59ef --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Lambda2_Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/settings.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/settings.gradle new file mode 100644 index 000000000..965186cb4 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps-inter-module/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'multi-build' +include 'lambda1', 'lambda2', 'common' diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/build.gradle new file mode 100644 index 000000000..5c41c8421 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/build.gradle @@ -0,0 +1,5 @@ +allprojects { + repositories { + mavenCentral() + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda1/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda1/build.gradle new file mode 100644 index 000000000..b836b8f80 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda1/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java new file mode 100644 index 000000000..fca189e70 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Lambda1_Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda2/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda2/build.gradle new file mode 100644 index 000000000..b836b8f80 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda2/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java new file mode 100644 index 000000000..5f7fa59ef --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Lambda2_Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/settings.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/settings.gradle new file mode 100644 index 000000000..6c882858a --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java17/with-deps/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'multi-build' +include 'lambda1', 'lambda2' diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/build.gradle new file mode 100644 index 000000000..5c41c8421 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/build.gradle @@ -0,0 +1,5 @@ +allprojects { + repositories { + mavenCentral() + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/common/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/common/build.gradle new file mode 100644 index 000000000..64d1e4576 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/common/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java new file mode 100644 index 000000000..542be0095 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/common/src/main/java/aws/lambdabuilders/Foo.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Foo { + public void sayHello() { + System.out.println("Hello world!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda1/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda1/build.gradle new file mode 100644 index 000000000..4af274eec --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda1/build.gradle @@ -0,0 +1,15 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' + implementation project(':common') +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java new file mode 100644 index 000000000..fca189e70 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Lambda1_Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda2/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda2/build.gradle new file mode 100644 index 000000000..64d1e4576 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda2/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java new file mode 100644 index 000000000..5f7fa59ef --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Lambda2_Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/settings.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/settings.gradle new file mode 100644 index 000000000..965186cb4 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps-inter-module/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'multi-build' +include 'lambda1', 'lambda2', 'common' diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/build.gradle new file mode 100644 index 000000000..5c41c8421 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/build.gradle @@ -0,0 +1,5 @@ +allprojects { + repositories { + mavenCentral() + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda1/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda1/build.gradle new file mode 100644 index 000000000..64d1e4576 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda1/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java new file mode 100644 index 000000000..fca189e70 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda1/src/main/java/aws/lambdabuilders/Lambda1_Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Lambda1_Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda2/build.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda2/build.gradle new file mode 100644 index 000000000..64d1e4576 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda2/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java new file mode 100644 index 000000000..5f7fa59ef --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/lambda2/src/main/java/aws/lambdabuilders/Lambda2_Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Lambda2_Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/settings.gradle b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/settings.gradle new file mode 100644 index 000000000..6c882858a --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/multi-build/java8/with-deps/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'multi-build' +include 'lambda1', 'lambda2' diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java11/layer/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java11/layer/build.gradle new file mode 100644 index 000000000..7814fef72 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/layer/build.gradle @@ -0,0 +1,32 @@ +plugins { + id 'java' + id 'java-library' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + api 'com.amazonaws:aws-lambda-java-core:1.2.0' +} + +group = 'aws.lambdabuilders' +version = '1.0' +description = 'common-layer-gradle' +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 + +build.finalizedBy publishToMavenLocal + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/layer/settings.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java11/layer/settings.gradle similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/layer/settings.gradle rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/layer/settings.gradle diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/layer/src/main/java/aws/lambdabuilders/CommonCode.java b/tests/integration/workflows/java_gradle/testdata/single-build/java11/layer/src/main/java/aws/lambdabuilders/CommonCode.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/layer/src/main/java/aws/lambdabuilders/CommonCode.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/layer/src/main/java/aws/lambdabuilders/CommonCode.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-broken/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-broken/build.gradle similarity index 59% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-deps-broken/build.gradle rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-broken/build.gradle index 71d034524..260090058 100644 --- a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-broken/build.gradle +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-broken/build.gradle @@ -9,3 +9,6 @@ repositories { dependencies { implementation 'software.amazon.awssdk:does-not-exist:1.2.3' } + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/build.gradle new file mode 100644 index 000000000..756799272 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..41d9927a4 Binary files /dev/null and b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar differ diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..41dfb8790 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradlew b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradlew new file mode 100755 index 000000000..1b6c78733 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradlew.bat b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps/build.gradle new file mode 100644 index 000000000..756799272 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-deps/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/with-deps/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-layer-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-layer-deps/build.gradle new file mode 100644 index 000000000..59a8fb2ea --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-layer-deps/build.gradle @@ -0,0 +1,29 @@ +plugins { + id 'java' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + compileOnly 'aws.lambdabuilders:common-layer-gradle:1.0' +} + +group = 'helloworld' +version = '1.0' +description = 'A sample Hello World created for SAM CLI.' +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-resources/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-resources/build.gradle new file mode 100644 index 000000000..756799272 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-resources/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-resources/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-resources/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-resources/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/with-resources/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-resources/src/main/resources/some_data.txt b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-resources/src/main/resources/some_data.txt similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-resources/src/main/resources/some_data.txt rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/with-resources/src/main/resources/some_data.txt diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-test-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-test-deps/build.gradle similarity index 66% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-test-deps/build.gradle rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/with-test-deps/build.gradle index a413ecf82..cb90eb0bf 100644 --- a/tests/integration/workflows/java_gradle/testdata/single-build/with-test-deps/build.gradle +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-test-deps/build.gradle @@ -10,3 +10,6 @@ dependencies { implementation 'software.amazon.awssdk:annotations:2.1.0' testImplementation 'software.amazon.awssdk:s3:2.1.0' } + +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-test-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java11/with-test-deps/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-test-deps/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java11/with-test-deps/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/build.gradle new file mode 100644 index 000000000..7814fef72 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/build.gradle @@ -0,0 +1,32 @@ +plugins { + id 'java' + id 'java-library' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + api 'com.amazonaws:aws-lambda-java-core:1.2.0' +} + +group = 'aws.lambdabuilders' +version = '1.0' +description = 'common-layer-gradle' +java.sourceCompatibility = JavaVersion.VERSION_11 +java.targetCompatibility = JavaVersion.VERSION_11 + +build.finalizedBy publishToMavenLocal + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/settings.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/settings.gradle new file mode 100644 index 000000000..c7a980f9f --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'common-layer-gradle' \ No newline at end of file diff --git a/tests/integration/workflows/java_maven/testdata/single-build/layer/src/main/java/aws/lambdabuilders/CommonCode.java b/tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/src/main/java/aws/lambdabuilders/CommonCode.java similarity index 100% rename from tests/integration/workflows/java_maven/testdata/single-build/layer/src/main/java/aws/lambdabuilders/CommonCode.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java17/layer/src/main/java/aws/lambdabuilders/CommonCode.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-broken/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-broken/build.gradle new file mode 100644 index 000000000..425f88a1b --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-broken/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:does-not-exist:1.2.3' +} + +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 \ No newline at end of file diff --git a/tests/integration/workflows/java_maven/testdata/single-build/no-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_maven/testdata/single-build/no-deps/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/build.gradle new file mode 100644 index 000000000..b836b8f80 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..41d9927a4 Binary files /dev/null and b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar differ diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..41dfb8790 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradlew b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradlew new file mode 100755 index 000000000..1b6c78733 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradlew.bat b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/tests/integration/workflows/java_maven/testdata/single-build/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_maven/testdata/single-build/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/common/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps/build.gradle similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/multi-build/with-deps-inter-module/common/build.gradle rename to tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps/build.gradle diff --git a/tests/integration/workflows/java_maven/testdata/single-build/with-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_maven/testdata/single-build/with-deps/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java17/with-deps/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-layer-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-layer-deps/build.gradle new file mode 100644 index 000000000..7d2510f43 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-layer-deps/build.gradle @@ -0,0 +1,29 @@ +plugins { + id 'java' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + compileOnly 'aws.lambdabuilders:common-layer-gradle:1.0' +} + +group = 'helloworld' +version = '1.0' +description = 'A sample Hello World created for SAM CLI.' +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java similarity index 100% rename from tests/integration/workflows/java_maven/testdata/single-build/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java rename to tests/integration/workflows/java_gradle/testdata/single-build/java17/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-resources/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-resources/build.gradle new file mode 100644 index 000000000..b836b8f80 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-resources/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-resources/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-resources/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-resources/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-resources/src/main/resources/some_data.txt b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-resources/src/main/resources/some_data.txt new file mode 100644 index 000000000..e69de29bb diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-test-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-test-deps/build.gradle new file mode 100644 index 000000000..68c532f30 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-test-deps/build.gradle @@ -0,0 +1,15 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' + testImplementation 'software.amazon.awssdk:s3:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-test-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-test-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java17/with-test-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/layer/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java8/layer/build.gradle similarity index 91% rename from tests/integration/workflows/java_gradle/testdata/single-build/layer/build.gradle rename to tests/integration/workflows/java_gradle/testdata/single-build/java8/layer/build.gradle index 004530e2e..aecdb309b 100644 --- a/tests/integration/workflows/java_gradle/testdata/single-build/layer/build.gradle +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/layer/build.gradle @@ -19,6 +19,7 @@ group = 'aws.lambdabuilders' version = '1.0' description = 'common-layer-gradle' java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 build.finalizedBy publishToMavenLocal diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/layer/settings.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java8/layer/settings.gradle new file mode 100644 index 000000000..c7a980f9f --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/layer/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'common-layer-gradle' \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/layer/src/main/java/aws/lambdabuilders/CommonCode.java b/tests/integration/workflows/java_gradle/testdata/single-build/java8/layer/src/main/java/aws/lambdabuilders/CommonCode.java new file mode 100644 index 000000000..64466d0e9 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/layer/src/main/java/aws/lambdabuilders/CommonCode.java @@ -0,0 +1,10 @@ +package aws.lambdabuilders; + +import com.amazonaws.services.lambda.runtime.LambdaLogger; + +public class CommonCode { + + public static void doSomethingOnLayer(final LambdaLogger logger, final String s) { + logger.log("Doing something on layer" + s); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-broken/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-broken/build.gradle new file mode 100644 index 000000000..f9e9514ff --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-broken/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:does-not-exist:1.2.3' +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/build.gradle new file mode 100644 index 000000000..64d1e4576 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar rename to tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties rename to tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/gradlew b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/gradlew similarity index 100% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/gradlew rename to tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/gradlew diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/gradlew.bat b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/gradlew.bat similarity index 96% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/gradlew.bat rename to tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/gradlew.bat index 0f8d5937c..6d57edc70 100644 --- a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/gradlew.bat +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/gradlew.bat @@ -1,84 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps-gradlew/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps/build.gradle new file mode 100644 index 000000000..64d1e4576 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-layer-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-layer-deps/build.gradle similarity index 90% rename from tests/integration/workflows/java_gradle/testdata/single-build/with-layer-deps/build.gradle rename to tests/integration/workflows/java_gradle/testdata/single-build/java8/with-layer-deps/build.gradle index 2e1f347a3..9aa31a660 100644 --- a/tests/integration/workflows/java_gradle/testdata/single-build/with-layer-deps/build.gradle +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-layer-deps/build.gradle @@ -18,6 +18,7 @@ group = 'helloworld' version = '1.0' description = 'A sample Hello World created for SAM CLI.' java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 publishing { publications { diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..d68611b84 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,16 @@ +package aws.lambdabuilders; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.LambdaLogger; +import com.amazonaws.services.lambda.runtime.RequestHandler; + +import aws.lambdabuilders.CommonCode; + +public class Main implements RequestHandler { + public Object handleRequest(final Object input, final Context context) { + final LambdaLogger logger = context.getLogger(); + CommonCode.doSomethingOnLayer(logger, "fromLambdaFunction"); + System.out.println("Hello AWS Lambda Builders!"); + return "Done"; + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-resources/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-resources/build.gradle new file mode 100644 index 000000000..64d1e4576 --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-resources/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-resources/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-resources/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-resources/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-resources/src/main/resources/some_data.txt b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-resources/src/main/resources/some_data.txt new file mode 100644 index 000000000..e69de29bb diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-test-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-test-deps/build.gradle new file mode 100644 index 000000000..87e62bc3f --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-test-deps/build.gradle @@ -0,0 +1,15 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'software.amazon.awssdk:annotations:2.1.0' + testImplementation 'software.amazon.awssdk:s3:2.1.0' +} + +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 \ No newline at end of file diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-test-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-test-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_gradle/testdata/single-build/java8/with-test-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/build.gradle deleted file mode 100644 index e4af9df15..000000000 --- a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps-gradlew/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id 'java' -} - -repositories { - mavenCentral() -} - -dependencies { - implementation 'software.amazon.awssdk:annotations:2.1.0' -} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/with-deps/build.gradle deleted file mode 100644 index e4af9df15..000000000 --- a/tests/integration/workflows/java_gradle/testdata/single-build/with-deps/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id 'java' -} - -repositories { - mavenCentral() -} - -dependencies { - implementation 'software.amazon.awssdk:annotations:2.1.0' -} diff --git a/tests/integration/workflows/java_gradle/testdata/single-build/with-resources/build.gradle b/tests/integration/workflows/java_gradle/testdata/single-build/with-resources/build.gradle deleted file mode 100644 index e4af9df15..000000000 --- a/tests/integration/workflows/java_gradle/testdata/single-build/with-resources/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id 'java' -} - -repositories { - mavenCentral() -} - -dependencies { - implementation 'software.amazon.awssdk:annotations:2.1.0' -} diff --git a/tests/integration/workflows/java_maven/test_java_maven.py b/tests/integration/workflows/java_maven/test_java_maven.py index ab01f7fc4..8f252991d 100644 --- a/tests/integration/workflows/java_maven/test_java_maven.py +++ b/tests/integration/workflows/java_maven/test_java_maven.py @@ -6,6 +6,8 @@ from unittest import TestCase from os.path import join +from parameterized import parameterized_class + from aws_lambda_builders.builder import LambdaBuilder from aws_lambda_builders.exceptions import WorkflowFailedError from tests.integration.workflows.common_test_utils import ( @@ -15,6 +17,14 @@ ) +@parameterized_class( + ("runtime",), + [ + ["java8"], + ["java11"], + ["java17"], + ], +) class TestJavaMaven(TestCase): # Have to use str(Path(__file__).resolve()) here to workaround a Windows VSCode issue # __file__ will return lower case drive letters. Ex: c:\folder\test.py instead of C:\folder\test.py @@ -26,7 +36,6 @@ def setUp(self): self.scratch_dir = tempfile.mkdtemp() self.dependencies_dir = tempfile.mkdtemp() self.builder = LambdaBuilder(language="java", dependency_manager="maven", application_framework=None) - self.runtime = "java8" def tearDown(self): shutil.rmtree(self.artifacts_dir) @@ -34,7 +43,7 @@ def tearDown(self): shutil.rmtree(self.dependencies_dir) def test_build_single_build_with_deps_resources_exclude_test_jars(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-deps") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-deps") manifest_path = join(source_dir, "pom.xml") self.builder.build(source_dir, self.artifacts_dir, self.scratch_dir, manifest_path, runtime=self.runtime) expected_files = [ @@ -47,7 +56,7 @@ def test_build_single_build_with_deps_resources_exclude_test_jars(self): self.assert_src_dir_not_touched(source_dir) def test_build_single_build_no_deps(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "no-deps") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "no-deps") manifest_path = join(source_dir, "pom.xml") self.builder.build(source_dir, self.artifacts_dir, self.scratch_dir, manifest_path, runtime=self.runtime) expected_files = [join("aws", "lambdabuilders", "Main.class"), join("some_data.txt")] @@ -56,7 +65,7 @@ def test_build_single_build_no_deps(self): self.assert_src_dir_not_touched(source_dir) def test_build_single_build_with_deps_broken(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-deps-broken") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-deps-broken") manifest_path = join(source_dir, "pom.xml") with self.assertRaises(WorkflowFailedError) as raised: self.builder.build(source_dir, self.artifacts_dir, self.scratch_dir, manifest_path, runtime=self.runtime) @@ -64,7 +73,7 @@ def test_build_single_build_with_deps_broken(self): self.assert_src_dir_not_touched(source_dir) def test_build_single_build_with_deps_resources_exclude_test_jars_deps_dir(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-deps") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-deps") manifest_path = join(source_dir, "pom.xml") self.builder.build( source_dir, @@ -92,7 +101,7 @@ def assert_src_dir_not_touched(self, source_dir): self.assertFalse(os.path.exists(join(source_dir, "target"))) def test_build_single_build_with_deps_resources_exclude_test_jars_deps_dir_without_combine_dependencies(self): - source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-deps") + source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-deps") manifest_path = join(source_dir, "pom.xml") self.builder.build( source_dir, @@ -124,7 +133,7 @@ def test_build_with_layers_and_scope(self): self.validate_function_build() def validate_layer_build(self): - layer_source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "layer") + layer_source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "layer") layer_manifest_path = join(layer_source_dir, "pom.xml") self.builder.build( layer_source_dir, @@ -143,7 +152,7 @@ def validate_layer_build(self): def validate_function_build(self): self.setUp() # re-initialize folders - function_source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, "with-layer-deps") + function_source_dir = join(self.SINGLE_BUILD_TEST_DATA_DIR, self.runtime, "with-layer-deps") function_manifest_path = join(function_source_dir, "pom.xml") self.builder.build( function_source_dir, diff --git a/tests/integration/workflows/java_maven/testdata/single-build/layer/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java11/layer/pom.xml similarity index 85% rename from tests/integration/workflows/java_maven/testdata/single-build/layer/pom.xml rename to tests/integration/workflows/java_maven/testdata/single-build/java11/layer/pom.xml index 7252c868e..ca01e3044 100644 --- a/tests/integration/workflows/java_maven/testdata/single-build/layer/pom.xml +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/layer/pom.xml @@ -10,8 +10,8 @@ jar - 1.8 - 1.8 + 11 + 11 diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java11/layer/src/main/java/aws/lambdabuilders/CommonCode.java b/tests/integration/workflows/java_maven/testdata/single-build/java11/layer/src/main/java/aws/lambdabuilders/CommonCode.java new file mode 100644 index 000000000..64466d0e9 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/layer/src/main/java/aws/lambdabuilders/CommonCode.java @@ -0,0 +1,10 @@ +package aws.lambdabuilders; + +import com.amazonaws.services.lambda.runtime.LambdaLogger; + +public class CommonCode { + + public static void doSomethingOnLayer(final LambdaLogger logger, final String s) { + logger.log("Doing something on layer" + s); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/no-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java11/no-deps/pom.xml similarity index 80% rename from tests/integration/workflows/java_maven/testdata/single-build/no-deps/pom.xml rename to tests/integration/workflows/java_maven/testdata/single-build/java11/no-deps/pom.xml index 2e01666d3..6ae95da92 100644 --- a/tests/integration/workflows/java_maven/testdata/single-build/no-deps/pom.xml +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/no-deps/pom.xml @@ -7,7 +7,7 @@ jar A sample Hello World created for SAM CLI. - 1.8 - 1.8 + 11 + 11 diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java11/no-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java11/no-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/no-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/no-deps/src/main/resources/some_data.txt b/tests/integration/workflows/java_maven/testdata/single-build/java11/no-deps/src/main/resources/some_data.txt similarity index 100% rename from tests/integration/workflows/java_maven/testdata/single-build/no-deps/src/main/resources/some_data.txt rename to tests/integration/workflows/java_maven/testdata/single-build/java11/no-deps/src/main/resources/some_data.txt diff --git a/tests/integration/workflows/java_maven/testdata/single-build/with-deps-broken/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps-broken/pom.xml similarity index 88% rename from tests/integration/workflows/java_maven/testdata/single-build/with-deps-broken/pom.xml rename to tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps-broken/pom.xml index 65ee7444e..f21b1ab25 100644 --- a/tests/integration/workflows/java_maven/testdata/single-build/with-deps-broken/pom.xml +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps-broken/pom.xml @@ -7,8 +7,8 @@ jar A sample Hello World created for SAM CLI. - 1.8 - 1.8 + 11 + 11 diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/with-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps/pom.xml similarity index 88% rename from tests/integration/workflows/java_maven/testdata/single-build/with-deps/pom.xml rename to tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps/pom.xml index 5540e0675..f0a7faf63 100644 --- a/tests/integration/workflows/java_maven/testdata/single-build/with-deps/pom.xml +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps/pom.xml @@ -7,8 +7,8 @@ jar A sample Hello World created for SAM CLI. - 1.8 - 1.8 + 11 + 11 diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/with-deps/src/main/resources/some_data.txt b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps/src/main/resources/some_data.txt similarity index 100% rename from tests/integration/workflows/java_maven/testdata/single-build/with-deps/src/main/resources/some_data.txt rename to tests/integration/workflows/java_maven/testdata/single-build/java11/with-deps/src/main/resources/some_data.txt diff --git a/tests/integration/workflows/java_maven/testdata/single-build/with-layer-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-layer-deps/pom.xml similarity index 86% rename from tests/integration/workflows/java_maven/testdata/single-build/with-layer-deps/pom.xml rename to tests/integration/workflows/java_maven/testdata/single-build/java11/with-layer-deps/pom.xml index a932b0253..ee7f772c4 100644 --- a/tests/integration/workflows/java_maven/testdata/single-build/with-layer-deps/pom.xml +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-layer-deps/pom.xml @@ -7,8 +7,8 @@ jar A sample Hello World created for SAM CLI. - 1.8 - 1.8 + 11 + 11 diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java11/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..d68611b84 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java11/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,16 @@ +package aws.lambdabuilders; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.LambdaLogger; +import com.amazonaws.services.lambda.runtime.RequestHandler; + +import aws.lambdabuilders.CommonCode; + +public class Main implements RequestHandler { + public Object handleRequest(final Object input, final Context context) { + final LambdaLogger logger = context.getLogger(); + CommonCode.doSomethingOnLayer(logger, "fromLambdaFunction"); + System.out.println("Hello AWS Lambda Builders!"); + return "Done"; + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/layer/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java17/layer/pom.xml new file mode 100644 index 000000000..cdc8aa605 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/layer/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + aws.lambdabuilders + common-layer + 1.0 + jar + + + 17 + 17 + + + + + + com.amazonaws + aws-lambda-java-core + 1.2.0 + + + + \ No newline at end of file diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/layer/src/main/java/aws/lambdabuilders/CommonCode.java b/tests/integration/workflows/java_maven/testdata/single-build/java17/layer/src/main/java/aws/lambdabuilders/CommonCode.java new file mode 100644 index 000000000..64466d0e9 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/layer/src/main/java/aws/lambdabuilders/CommonCode.java @@ -0,0 +1,10 @@ +package aws.lambdabuilders; + +import com.amazonaws.services.lambda.runtime.LambdaLogger; + +public class CommonCode { + + public static void doSomethingOnLayer(final LambdaLogger logger, final String s) { + logger.log("Doing something on layer" + s); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/no-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java17/no-deps/pom.xml new file mode 100644 index 000000000..fa6c8f970 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/no-deps/pom.xml @@ -0,0 +1,13 @@ + + 4.0.0 + helloworld + HelloWorld + 1.0 + jar + A sample Hello World created for SAM CLI. + + 17 + 17 + + diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/no-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java17/no-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/no-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/no-deps/src/main/resources/some_data.txt b/tests/integration/workflows/java_maven/testdata/single-build/java17/no-deps/src/main/resources/some_data.txt new file mode 100644 index 000000000..95d09f2b1 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/no-deps/src/main/resources/some_data.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps-broken/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps-broken/pom.xml new file mode 100644 index 000000000..595a7ee04 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps-broken/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + helloworld + HelloWorld + 1.0 + jar + A sample Hello World created for SAM CLI. + + 17 + 17 + + + + + software.amazon.awssdk + annotations + 2.1.0-helloworld + + + junit + junit + 4.12 + test + + + diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps/pom.xml new file mode 100644 index 000000000..7f5578127 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + helloworld + HelloWorld + 1.0 + jar + A sample Hello World created for SAM CLI. + + 17 + 17 + + + + + software.amazon.awssdk + annotations + 2.1.0 + + + junit + junit + 4.12 + test + + + diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps/src/main/resources/some_data.txt b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps/src/main/resources/some_data.txt new file mode 100644 index 000000000..95d09f2b1 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-deps/src/main/resources/some_data.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/with-layer-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-layer-deps/pom.xml new file mode 100644 index 000000000..29b1d8b2e --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-layer-deps/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + helloworld + HelloWorld + 1.0 + jar + A sample Hello World created for SAM CLI. + + 17 + 17 + + + + + aws.lambdabuilders + common-layer + 1.0 + provided + + + diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java17/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..d68611b84 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java17/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,16 @@ +package aws.lambdabuilders; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.LambdaLogger; +import com.amazonaws.services.lambda.runtime.RequestHandler; + +import aws.lambdabuilders.CommonCode; + +public class Main implements RequestHandler { + public Object handleRequest(final Object input, final Context context) { + final LambdaLogger logger = context.getLogger(); + CommonCode.doSomethingOnLayer(logger, "fromLambdaFunction"); + System.out.println("Hello AWS Lambda Builders!"); + return "Done"; + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/layer/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java8/layer/pom.xml new file mode 100644 index 000000000..90b4bbaff --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/layer/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + aws.lambdabuilders + common-layer + 1.0 + jar + + + 8 + 8 + + + + + + com.amazonaws + aws-lambda-java-core + 1.2.0 + + + + \ No newline at end of file diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/layer/src/main/java/aws/lambdabuilders/CommonCode.java b/tests/integration/workflows/java_maven/testdata/single-build/java8/layer/src/main/java/aws/lambdabuilders/CommonCode.java new file mode 100644 index 000000000..64466d0e9 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/layer/src/main/java/aws/lambdabuilders/CommonCode.java @@ -0,0 +1,10 @@ +package aws.lambdabuilders; + +import com.amazonaws.services.lambda.runtime.LambdaLogger; + +public class CommonCode { + + public static void doSomethingOnLayer(final LambdaLogger logger, final String s) { + logger.log("Doing something on layer" + s); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/no-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java8/no-deps/pom.xml new file mode 100644 index 000000000..bed540c50 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/no-deps/pom.xml @@ -0,0 +1,13 @@ + + 4.0.0 + helloworld + HelloWorld + 1.0 + jar + A sample Hello World created for SAM CLI. + + 8 + 8 + + diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/no-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java8/no-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/no-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/no-deps/src/main/resources/some_data.txt b/tests/integration/workflows/java_maven/testdata/single-build/java8/no-deps/src/main/resources/some_data.txt new file mode 100644 index 000000000..95d09f2b1 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/no-deps/src/main/resources/some_data.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps-broken/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps-broken/pom.xml new file mode 100644 index 000000000..36e887fbb --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps-broken/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + helloworld + HelloWorld + 1.0 + jar + A sample Hello World created for SAM CLI. + + 8 + 8 + + + + + software.amazon.awssdk + annotations + 2.1.0-helloworld + + + junit + junit + 4.12 + test + + + diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps-broken/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps/pom.xml new file mode 100644 index 000000000..4be7674f7 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + helloworld + HelloWorld + 1.0 + jar + A sample Hello World created for SAM CLI. + + 8 + 8 + + + + + software.amazon.awssdk + annotations + 2.1.0 + + + junit + junit + 4.12 + test + + + diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..22c7a289d --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,7 @@ +package aws.lambdabuilders; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello AWS Lambda Builders!"); + } +} diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps/src/main/resources/some_data.txt b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps/src/main/resources/some_data.txt new file mode 100644 index 000000000..95d09f2b1 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-deps/src/main/resources/some_data.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/with-layer-deps/pom.xml b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-layer-deps/pom.xml new file mode 100644 index 000000000..13c0ee4b0 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-layer-deps/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + helloworld + HelloWorld + 1.0 + jar + A sample Hello World created for SAM CLI. + + 8 + 8 + + + + + aws.lambdabuilders + common-layer + 1.0 + provided + + + diff --git a/tests/integration/workflows/java_maven/testdata/single-build/java8/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java new file mode 100644 index 000000000..d68611b84 --- /dev/null +++ b/tests/integration/workflows/java_maven/testdata/single-build/java8/with-layer-deps/src/main/java/aws/lambdabuilders/Main.java @@ -0,0 +1,16 @@ +package aws.lambdabuilders; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.LambdaLogger; +import com.amazonaws.services.lambda.runtime.RequestHandler; + +import aws.lambdabuilders.CommonCode; + +public class Main implements RequestHandler { + public Object handleRequest(final Object input, final Context context) { + final LambdaLogger logger = context.getLogger(); + CommonCode.doSomethingOnLayer(logger, "fromLambdaFunction"); + System.out.println("Hello AWS Lambda Builders!"); + return "Done"; + } +} diff --git a/tests/unit/workflows/java_gradle/test_gradle_validator.py b/tests/unit/workflows/java_gradle/test_gradle_validator.py index a3100c58d..fc0bd3b84 100644 --- a/tests/unit/workflows/java_gradle/test_gradle_validator.py +++ b/tests/unit/workflows/java_gradle/test_gradle_validator.py @@ -87,6 +87,15 @@ def test_no_warning_when_jvm_mv_11_and_java11_runtime(self): self.assertTrue(validator.validate(runtime_path=self.runtime_path)) self.assertEqual(validator.validated_binary_path, self.runtime_path) + def test_no_warning_when_jvm_mv_17_and_java17_runtime(self): + version_string = "JVM: 17.0.0".encode() + self.mock_os_utils.popen.side_effect = [FakePopen(stdout=version_string)] + validator = GradleValidator( + runtime="java17", architecture=self.architecture, os_utils=self.mock_os_utils, log=self.mock_log + ) + self.assertTrue(validator.validate(runtime_path=self.runtime_path)) + self.assertEqual(validator.validated_binary_path, self.runtime_path) + def test_runtime_validate_unsupported_language_fail_open(self): validator = GradleValidator(runtime="java2.0", architecture="arm64") with self.assertRaises(UnsupportedRuntimeError):