diff --git a/.drone.yml b/.drone.yml
index 52b55d0..14dc7fd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,4 +7,13 @@ steps:
image: maven:3-jdk-11
commands:
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
- - mvn test -B
\ No newline at end of file
+ - mvn test -B
+- name: docker
+ image: plugins/docker
+ settings:
+ repo: registry.mariuszpacek.pl/home-pump
+ tags: latest
+ insecure: true
+ when:
+ branch:
+ - master
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index fc368f3..64dac6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,10 @@
.settings/
# Intellij
-.idea/
+.idea
*.iml
*.iws
+.vscode
# Mac
.DS_Store
@@ -14,3 +15,8 @@
# Maven
log/
target/
+/.idea/
+/.vscode/
+/.java-version
+/dependency-reduced-pom.xml
+/workspace.code-workspace
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 3dbe087..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
-
-# Build JAVA applications using Apache Maven (http://maven.apache.org)
-# For docker image tags see https://hub.docker.com/_/maven/
-#
-# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
-
-# This template will build and test your projects
-# * Caches downloaded dependencies and plugins between invocation.
-# * Verify but don't deploy merge requests.
-# * Deploy built artifacts from master branch only.
-
-variables:
- # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
- # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
- MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
- # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
- # when running from the command line.
- # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
- MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
-
-# This template uses jdk8 for verifying and deploying images
-image: maven:3.8.4-jdk-11
-
-# Cache downloaded dependencies and plugins between builds.
-# To keep cache across branches add 'key: "$CI_JOB_NAME"'
-cache:
- paths:
- - .m2/repository
-
-# For merge requests do not `deploy` but only run `verify`.
-# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
-.verify: &verify
- stage: test
- script:
- - 'mvn $MAVEN_CLI_OPTS verify'
- artifacts:
- reports:
- junit: target/**/TEST-*.xml
-
-# Verify merge requests using JDK8
-verify:jdk11:
- <<: *verify
-
-# To deploy packages from CI, create a ci_settings.xml file
-# For deploying packages to GitLab's Maven Repository: See https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for more details.
-# Please note: The GitLab Maven Repository is currently only available in GitLab Premium / Ultimate.
-# For `master` branch run `mvn deploy` automatically.
-deploy:jdk11:
- stage: deploy
- script:
- - 'mvn $MAVEN_CLI_OPTS package'
- artifacts:
- paths:
- - target/*.jar
- expire_in: 1 week
- only:
- variables:
- - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 065fadc..f580b5b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,6 +9,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index efde0ce..ad56292 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,4 +11,7 @@
+
+
+
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..7ce1823
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM amazoncorretto:11.0.17
+COPY target/test*.jar app/home-pump.jar
+
+CMD ["java", "-jar", "app/home-pump.jar"]
diff --git a/pom.xml b/pom.xml
index d479321..cdf7e9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,32 @@
maven-surefire-plugin3.0.0-M7
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.3.0
+
+
+
+ true
+ home.automation.Main
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.4.1
+
+
+ package
+
+ shade
+
+
+
+ org.apache.maven.pluginsmaven-compiler-plugin