diff --git a/.gitignore b/.gitignore index 40d0328..615f907 100644 --- a/.gitignore +++ b/.gitignore @@ -14,26 +14,7 @@ buildNumber.properties # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml -.idea/dictionaries -.idea/vcs.xml -.idea/jsLibraryMappings.xml - -# Sensitive or high-churn files: -.idea/dataSources.ids -.idea/dataSources.xml -.idea/dataSources.local.xml -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml - -# Gradle: -.idea/gradle.xml -.idea/libraries - -# Mongo Explorer plugin: -.idea/mongoSettings.xml +.idea ## File-based project format: *.iws @@ -68,5 +49,4 @@ fabric.properties # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -*.iml -.i€dea \ No newline at end of file +*.iml \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index ae93fb3..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 233a7f0..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 0227245..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3155b39..529b940 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: java jdk: - oraclejdk7 + - oraclejdk8 before_install: - chmod +x ./.travis/maven-build.sh @@ -15,7 +16,7 @@ after_deploy: "./.travis/call-creation.sh" notifications: email: false slack: - secure: ciAOsdv9lf/IbAwyzeR/z2nlBSevmBHBqca6tf0Yh2DIyAx/uUo1ojon0W7Kv6tCECGhSTdfQAnZ+nFjjqaRs+Jq4svd9WKYrFuZyOWmT31iSJ/nvPymRvevSsgwpSKr0nJS9dxePKto/T3ozW29kx88eaJQH17zOaX2rfuIje4= + secure: B3FrxPmZ/h3dj+39aRMLJas6d62tazECB6OYsI0fTnOO9VpFOrsH67JpcaQM928zv9AItFpkYHxapqCdIZw8mYJnKOlqSqHKZE9Wu/O09ZTknxIsPnkjNknQW+6B+tHvBni3fkC29OocEePf89ZesQ6vSO/10J3OmdVlGDLyr0ShUHXgQOimWXtkjb5YVDNIrOcQ5Jx0U6h26NMx67cmYtEyR88DnLO0dBmpGjbf/o6Y+99HcBQJdotLl40h6yKufwwNiv0bVZRKfi8emMA1jvUPRqLt1CWatn2wzp1MCqpgSGBM3DnK9X5arTu6iURea2EIP3vXs9c17BLRqwVEM9YA+DCqAtze6sQstNtNiwzibWDwU/Ft8xWivdk3yqNlPE+8tx3BdBCi1gAplph2x4+7xY+icbL46tKt/UKqJdZeEIiWP8jzqWuhYDlRSFvUhvRh0DHJSO6IiY049eBQF7pwzTtofA5HXTplKByGHrqraWgxM5rUCWoKoWm9xOOwZ0lJhmjUsB1yp2ZQY1abEVmEo0uHIzeSulufUnTjqlAMzok1ZRn9YqJgUELgcCN4JSjCHQhGT/WRbOD1BSLl7XC9zdKalgVvGYyAVTIJRDF581E7VIYe6Dt9c6M+T/M3FPq86IUL0/iLxsgsvNY0+16k95D+jbVWYv8OYzZRtt4= webhooks: on_success: always on_failure: always @@ -47,4 +48,7 @@ deploy: acl: public_read on: repo: Parabot/Randoms - all_branches: true \ No newline at end of file + branch: + - master + - development + jdk: 'oraclejdk7' \ No newline at end of file