Merge remote-tracking branch 'upstream/master'

nebula-plugins · Aug 8, 2017 · f0a9ae8 · f0a9ae8
2 parents 02ac484 + 14ce513
commit f0a9ae8
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 105 deletions.
diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-1.7
+1.8
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: java
 sudo: false
-jdk:
-- oraclejdk7
+jdk: oraclejdk8
 install: true
 script: "./gradle/buildViaTravis.sh"
 cache:

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Netflix, Inc.
+ * Copyright 2014-2017 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-buildscript {
-    repositories { jcenter() }
-}
-
 plugins {
-    id 'nebula.plugin-plugin' version '5.9.0'
-    id 'com.gradle.plugin-publish' version '0.9.7'
+    id 'nebula.plugin-plugin' version '5.17.1'
 }
 
 description 'Template for NetflixOSS projects'
@@ -29,10 +24,6 @@ contacts {
         moniker 'Rob Spieldenner'
         github 'rspieldenner'
     }
-    'justin@halfempty.org' {
-        moniker 'Justin Ryan'
-        github 'quidryan'
-    }
 }
 
 configurations.all {