Merge branch 'dcaoyuan_pr4'

dcaoyuan · Nov 10, 2016 · f2f0e02 · f2f0e02
2 parents 05eefd0 + 14e7948
commit f2f0e02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,6 @@
 language: java
+jdk:
+  - oraclejdk8
 script: 
   - mvn clean install nbm:autoupdate
   - cd target/netbeans_site && zip -r nbscala-plugins.zip *.nbm

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ Cause of the small group of people involved in the project we only supply update
 * NetBeans 8.1+
 
 ### Requirement - Building:
-* Java 1.7 (for master branch)
+* Java 1.8 (for master branch)
 * Java 1.6 (for 2.9.x branch)
 * Maven 2.x/3.x 
 * NetBeans 8.1+