From ff9b903433127b4fde7a6b67d30f5358765604f6 Mon Sep 17 00:00:00 2001 From: frankl Date: Thu, 19 Mar 2020 00:50:16 +1100 Subject: [PATCH 01/10] java 11 support --- .travis.yml | 2 +- Makefile | 4 ++-- pom.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a68bba4..0f89111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ branches: install: - set -e - nohup docker pull localstack/localstack > /dev/null & - - nohup docker pull lambci/lambda:java8 > /dev/null & + - nohup docker pull lambci/lambda:java11 > /dev/null & script: - set -e diff --git a/Makefile b/Makefile index cce0984..4402cd3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ADDITIONAL_MVN_ARGS ?= -DskipTests -q +ADDITIONAL_MVN_ARGS ?= -DskipTests -q -X usage: ## Show this help @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' @@ -10,6 +10,6 @@ publish-maven: ## Publish artifacts to Maven Central ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS=" " make build test: ## Run tests for Java/JUnit compatibility - USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) test + USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) -Dmaven.surefire.debug="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -Xnoagent -Djava.compiler=NONE" test .PHONY: usage clean install test diff --git a/pom.xml b/pom.xml index 0522c72..d486565 100644 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,9 @@ UTF-8 UTF-8 - 1.8 - 1.8 - 1.11.642 + 11 + 11 + 1.11.744 @@ -157,7 +157,7 @@ com.amazonaws aws-java-sdk - 1.11.505 + 1.11.744 From e0db5fdd16a26a7a657c268ce582433d84e9d0f8 Mon Sep 17 00:00:00 2001 From: frankl Date: Thu, 19 Mar 2020 07:26:00 +1100 Subject: [PATCH 02/10] java 11 support --- Makefile | 4 ++-- pom.xml | 2 +- src/main/java/cloud/localstack/Localstack.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4402cd3..cce0984 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ADDITIONAL_MVN_ARGS ?= -DskipTests -q -X +ADDITIONAL_MVN_ARGS ?= -DskipTests -q usage: ## Show this help @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' @@ -10,6 +10,6 @@ publish-maven: ## Publish artifacts to Maven Central ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS=" " make build test: ## Run tests for Java/JUnit compatibility - USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) -Dmaven.surefire.debug="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -Xnoagent -Djava.compiler=NONE" test + USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) test .PHONY: usage clean install test diff --git a/pom.xml b/pom.xml index d486565..a290f37 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + 3.2.2 package diff --git a/src/main/java/cloud/localstack/Localstack.java b/src/main/java/cloud/localstack/Localstack.java index 3e5b575..384ca58 100644 --- a/src/main/java/cloud/localstack/Localstack.java +++ b/src/main/java/cloud/localstack/Localstack.java @@ -115,7 +115,7 @@ public String getEndpointS3() { * which by default would result in .localhost, but that name cannot be resolved * (unless hardcoded in /etc/hosts) */ - s3Endpoint = s3Endpoint.replace("localhost", "test.localhost.atlassian.io"); + s3Endpoint = s3Endpoint.replace("localhost", "localhost.localstack.cloud"); return s3Endpoint; } From cdf8adb2c83cd79291d8c8dbd06555373b248a70 Mon Sep 17 00:00:00 2001 From: frankl Date: Thu, 19 Mar 2020 00:50:16 +1100 Subject: [PATCH 03/10] java 11 support --- .travis.yml | 2 +- pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a68bba4..0f89111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ branches: install: - set -e - nohup docker pull localstack/localstack > /dev/null & - - nohup docker pull lambci/lambda:java8 > /dev/null & + - nohup docker pull lambci/lambda:java11 > /dev/null & script: - set -e diff --git a/pom.xml b/pom.xml index 0522c72..a290f37 100644 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,9 @@ UTF-8 UTF-8 - 1.8 - 1.8 - 1.11.642 + 11 + 11 + 1.11.744 @@ -157,7 +157,7 @@ com.amazonaws aws-java-sdk - 1.11.505 + 1.11.744 @@ -181,7 +181,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + 3.2.2 package From 478277b15b28400099845bbc84e37a3b2f28c02b Mon Sep 17 00:00:00 2001 From: frankl Date: Thu, 19 Mar 2020 10:02:17 +1100 Subject: [PATCH 04/10] revert back the s3 endpoint --- src/main/java/cloud/localstack/Localstack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cloud/localstack/Localstack.java b/src/main/java/cloud/localstack/Localstack.java index 384ca58..3e5b575 100644 --- a/src/main/java/cloud/localstack/Localstack.java +++ b/src/main/java/cloud/localstack/Localstack.java @@ -115,7 +115,7 @@ public String getEndpointS3() { * which by default would result in .localhost, but that name cannot be resolved * (unless hardcoded in /etc/hosts) */ - s3Endpoint = s3Endpoint.replace("localhost", "localhost.localstack.cloud"); + s3Endpoint = s3Endpoint.replace("localhost", "test.localhost.atlassian.io"); return s3Endpoint; } From fef8bad546a6315b05eba62cf7ce51acc39aeb0f Mon Sep 17 00:00:00 2001 From: frankl Date: Thu, 19 Mar 2020 10:42:48 +1100 Subject: [PATCH 05/10] test without using ssl --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cce0984..7611981 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,6 @@ publish-maven: ## Publish artifacts to Maven Central ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS=" " make build test: ## Run tests for Java/JUnit compatibility - USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) test + USE_SSL=0 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) test .PHONY: usage clean install test From 32cbb288e1fc6224e584e44c3e4a8bf66b9d489d Mon Sep 17 00:00:00 2001 From: frankl Date: Thu, 19 Mar 2020 00:50:16 +1100 Subject: [PATCH 06/10] java 11 support --- .travis.yml | 2 +- Makefile | 2 +- pom.xml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a68bba4..0f89111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ branches: install: - set -e - nohup docker pull localstack/localstack > /dev/null & - - nohup docker pull lambci/lambda:java8 > /dev/null & + - nohup docker pull lambci/lambda:java11 > /dev/null & script: - set -e diff --git a/Makefile b/Makefile index a01f1cd..e6e780f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ADDITIONAL_MVN_ARGS ?= -DskipTests -q +ADDITIONAL_MVN_ARGS ?= -DskipTests -q -X usage: ## Show this help @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' diff --git a/pom.xml b/pom.xml index 0522c72..d486565 100644 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,9 @@ UTF-8 UTF-8 - 1.8 - 1.8 - 1.11.642 + 11 + 11 + 1.11.744 @@ -157,7 +157,7 @@ com.amazonaws aws-java-sdk - 1.11.505 + 1.11.744 From 85f706774db50d6f8ca351cf13ab9aedf5d65267 Mon Sep 17 00:00:00 2001 From: frankl Date: Thu, 19 Mar 2020 07:26:00 +1100 Subject: [PATCH 07/10] java 11 support --- Makefile | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e6e780f..a01f1cd 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ADDITIONAL_MVN_ARGS ?= -DskipTests -q -X +ADDITIONAL_MVN_ARGS ?= -DskipTests -q usage: ## Show this help @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' diff --git a/pom.xml b/pom.xml index d486565..a290f37 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + 3.2.2 package From 8398041cd35acc2f94adb5ad466ef15ddff1219b Mon Sep 17 00:00:00 2001 From: frankl Date: Fri, 8 May 2020 20:35:26 +1000 Subject: [PATCH 08/10] Merge branch 'master' of https://github.com/pkiller520/localstack-java-utils # Conflicts: # Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7611981..a01f1cd 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,6 @@ publish-maven: ## Publish artifacts to Maven Central ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS=" " make build test: ## Run tests for Java/JUnit compatibility - USE_SSL=0 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) test + USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,iam,cloudwatch mvn $(MVN_ARGS) test .PHONY: usage clean install test From 6feba3996d8618c24ead8e8e5d400f02b73fbd3c Mon Sep 17 00:00:00 2001 From: frankl Date: Sat, 9 May 2020 08:52:17 +1000 Subject: [PATCH 09/10] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef87294..6aaa466 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Java utilities and JUnit integration for [LocalStack](https://github.com/localst ## Prerequisites -* Java +* Java 11 * Maven * Docker * LocalStack From 3f8663982426ce18aeca44e375c93de3797a5afe Mon Sep 17 00:00:00 2001 From: frankl Date: Sun, 10 May 2020 23:04:13 +1000 Subject: [PATCH 10/10] Update README --- .travis.yml | 2 +- README.md | 2 +- pom.xml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f89111..a68bba4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ branches: install: - set -e - nohup docker pull localstack/localstack > /dev/null & - - nohup docker pull lambci/lambda:java11 > /dev/null & + - nohup docker pull lambci/lambda:java8 > /dev/null & script: - set -e diff --git a/README.md b/README.md index 6aaa466..ef87294 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Java utilities and JUnit integration for [LocalStack](https://github.com/localst ## Prerequisites -* Java 11 +* Java * Maven * Docker * LocalStack diff --git a/pom.xml b/pom.xml index a290f37..0522c72 100644 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,9 @@ UTF-8 UTF-8 - 11 - 11 - 1.11.744 + 1.8 + 1.8 + 1.11.642 @@ -157,7 +157,7 @@ com.amazonaws aws-java-sdk - 1.11.744 + 1.11.505 @@ -181,7 +181,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.2 + 3.1.1 package