Skip to content
This repository was archived by the owner on Aug 14, 2024. It is now read-only.

Commit

Permalink
move Java sources to separate project (localstack#2084)
Browse files Browse the repository at this point in the history
  • Loading branch information
whummer authored Feb 24, 2020
1 parent e10cff9 commit d3f697c
Show file tree
Hide file tree
Showing 82 changed files with 20 additions and 8,760 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ install:
- # install under python 3
- PIP_CMD=pip3 VENV_OPTS="-p '`which python3`'" make install-basic
- make init
- make prepare-java-tests-if-changed
- nohup docker pull lambci/lambda:20191117-nodejs8.10 > /dev/null &
- nohup docker pull lambci/lambda:20191117-ruby2.5 > /dev/null &
- nohup docker pull lambci/lambda:20191117-python3.6 > /dev/null &
Expand All @@ -53,9 +52,6 @@ script:
- LAMBDA_EXECUTOR=docker-reuse TEST_PATH="tests/integration/test_lambda.py tests/integration/test_integration.py" make test
# build Docker image
- make docker-build
# run Java tests
# TODO: re-enable java tests when fixed!
# - make test-java-if-changed; true
# push Docker image (if on master branch)
- make docker-push-master

Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ ADD localstack/services/install.py localstack/services/
ADD localstack/utils/common.py localstack/utils/bootstrap.py localstack/utils/
ADD localstack/utils/aws/ localstack/utils/aws/
ADD localstack/utils/kinesis/ localstack/utils/kinesis/
ADD localstack/ext/ localstack/ext/

# install dependencies
RUN make install
Expand Down
28 changes: 1 addition & 27 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ IMAGE_NAME ?= localstack/localstack
IMAGE_NAME_BASE ?= localstack/java-maven-node-python
IMAGE_TAG ?= $(shell cat localstack/constants.py | grep '^VERSION =' | sed "s/VERSION = ['\"]\(.*\)['\"].*/\1/")
VENV_DIR ?= .venv
ADDITIONAL_MVN_ARGS ?= -DskipTests -q
PIP_CMD ?= pip
TEST_PATH ?= .

Expand Down Expand Up @@ -36,12 +35,6 @@ publish: ## Publish the library to the central PyPi repository
# build and upload archive
($(VENV_RUN) && ./setup.py sdist upload)

build-maven:
cd localstack/ext/java/; mvn -Pfatjar $(ADDITIONAL_MVN_ARGS) clean javadoc:jar source:jar package $(ADDITIONAL_MVN_TARGETS)

publish-maven: ## Publish artifacts to Maven Central
ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS=" " make build-maven

coveralls: ## Publish coveralls metrics
($(VENV_RUN); coveralls)

Expand Down Expand Up @@ -101,25 +94,6 @@ test: ## Run automated tests
make lint && \
($(VENV_RUN); DEBUG=$(DEBUG) PYTHONPATH=`pwd` nosetests --with-timer --with-coverage --logging-level=WARNING --nocapture --no-skip --exe --cover-erase --cover-tests --cover-inclusive --cover-package=localstack --with-xunit --exclude='$(VENV_DIR).*' --ignore-files='lambda_python3.py' $(TEST_PATH))

test-java: ## Run tests for Java/JUnit compatibility
cd localstack/ext/java; USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,cloudwatch mvn $(MVN_ARGS) -q test

prepare-java-tests-if-changed:
@(! (git log -n 1 --no-merges --raw | grep localstack/ext/java/)) || (\
make build-maven && cp $$(ls localstack/ext/java/target/localstack-utils*fat.jar) localstack/infra/localstack-utils-fat.jar && \
cp $$(ls localstack/ext/java/target/localstack-utils*tests.jar) localstack/infra/localstack-utils-tests.jar && \
(cd localstack/ext/java; mvn -q clean))

prepare-java-tests-infra-jars:
make build-maven && cp $$(ls localstack/ext/java/target/localstack-utils*fat.jar) localstack/infra/localstack-utils-fat.jar && \
cp $$(ls localstack/ext/java/target/localstack-utils*tests.jar) localstack/infra/localstack-utils-tests.jar

test-java-if-changed:
@(! (git log -n 1 --no-merges --raw | grep localstack/ext/java/)) || make test-java

test-java-docker:
ENTRYPOINT="--entrypoint=" CMD="make test-java" make docker-run

test-docker: ## Run automated tests in Docker
ENTRYPOINT="--entrypoint=" CMD="make test" make docker-run

Expand Down Expand Up @@ -147,4 +121,4 @@ clean: ## Clean up (npm dependencies, downloaded infrastructure code
rm -rf $(VENV_DIR)
rm -f localstack/utils/kinesis/java/com/atlassian/*.class

.PHONY: usage compile clean install web install-web infra test
.PHONY: usage compile clean install web install-web infra test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ Support this project by becoming a sponsor. Your logo will show up here with a l

## License

Copyright (c) 2017-2019 LocalStack maintainers and contributors.
Copyright (c) 2017-2020 LocalStack maintainers and contributors.

Copyright (c) 2016 Atlassian and others.

Expand Down
7 changes: 0 additions & 7 deletions localstack/ext/java/.dockerignore

This file was deleted.

7 changes: 0 additions & 7 deletions localstack/ext/java/.gitignore

This file was deleted.

Loading

0 comments on commit d3f697c

Please sign in to comment.