Merge pull request #69 from 52North/develop

Merge develop branch

.gitignore

@@ -1,147 +1,147 @@
-### https://raw.github.com/github/gitignore/master/Java.gitignore
-
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-
-### https://raw.github.com/github/gitignore/master/Maven.gitignore
-
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-
-
-### https://raw.github.com/github/gitignore/master/Global/NetBeans.gitignore
-
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-nbactions.xml
-nb-configuration.xml
-.nb-gradle/
-
-
-### https://raw.github.com/github/gitignore/master/Global/Eclipse.gitignore
-
-*.pydevproject
-.metadata
-.gradle
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-
-# Eclipse Core
-.project
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-# PDT-specific
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# TeXlipse plugin
-.texlipse
-
-
-### https://raw.github.com/github/gitignore/master/Global/Windows.gitignore
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-
-### https://raw.github.com/github/gitignore/master/Global/Linux.gitignore
-
-*~
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-
-### https://raw.github.com/github/gitignore/master/Global/OSX.gitignore
-
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-webapp/logs/
-
-logs/
-.idea/
-*.iml
-
-webapp/.factorypath
+### https://raw.github.com/github/gitignore/master/Java.gitignore
+
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+
+### https://raw.github.com/github/gitignore/master/Maven.gitignore
+
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+
+
+### https://raw.github.com/github/gitignore/master/Global/NetBeans.gitignore
+
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+.nb-gradle/
+
+
+### https://raw.github.com/github/gitignore/master/Global/Eclipse.gitignore
+
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+
+### https://raw.github.com/github/gitignore/master/Global/Windows.gitignore
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+### https://raw.github.com/github/gitignore/master/Global/Linux.gitignore
+
+*~
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+
+### https://raw.github.com/github/gitignore/master/Global/OSX.gitignore
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+webapp/logs/
+
+logs/
+.idea/
+*.iml
+
+webapp/.factorypath

.travis.yml

@@ -9,4 +9,5 @@ jdk:
 cache:
   directories:
     - $HOME/.m2
-
+after_success:
+  - curl -Ls https://git.io/deploy-maven-snapshot | bash

Dockerfile

@@ -12,14 +12,12 @@ RUN mvn --batch-mode --errors --fail-fast \
 
 FROM jetty:jre8
 
-ARG JAVAPS_VERSION=1.6.0-SNAPSHOT
-ENV JAVAPS_VERSION ${JAVAPS_VERSION}
 ENV JAVAPS_ROOT ${JETTY_BASE}/webapps/ROOT
 ENV JAVAPS_TMP ${JAVAPS_ROOT}/WEB-INF/tmp
 ENV JAVAPS_CONFIG ${JAVAPS_ROOT}/WEB-INF/config
 ENV JAVAPS_LIB ${JAVAPS_ROOT}/WEB-INF/lib
 
-COPY --from=BUILD /usr/src/app/webapp/target/javaPS-webapp-${JAVAPS_VERSION}/ /var/lib/jetty/webapps/ROOT
+COPY --from=BUILD /usr/src/app/webapp/target/javaPS-webapp/ /var/lib/jetty/webapps/ROOT
 COPY etc/docker-log4j2.xml /var/lib/jetty/webapps/ROOT/WEB-INF/config/log4j2.xml
 COPY etc/docker-configuration.json /var/lib/jetty/webapps/ROOT/WEB-INF/config/configuration.json
 
@@ -52,7 +50,6 @@ LABEL maintainer="Benjamin Proß <[email protected]>" \
       org.opencontainers.image.vendor="52°North GmbH" \
       org.opencontainers.image.source="https://github.com/52north/javaPS.git" \
       org.opencontainers.image.documentation="https://github.com/52North/javaPS/blob/develop/README.md" \
-      org.opencontainers.image.version="${JAVAPS_VERSION}" \
       org.opencontainers.image.authors="Benjamin Proß <[email protected]>, Christian Autermann <[email protected]>"
 
 ARG GIT_COMMIT