Merge remote-tracking branch 'cww/master'
This commit is contained in:
commit
618b41428b
@ -18,7 +18,7 @@ if has('reltime')
|
||||
let g:syntastic_start = reltime()
|
||||
endif
|
||||
|
||||
let g:syntastic_version = '3.4.0-36'
|
||||
let g:syntastic_version = '3.4.0-37'
|
||||
|
||||
" Sanity checks {{{1
|
||||
|
||||
|
@ -31,6 +31,10 @@ if !exists('g:syntastic_java_javac_options')
|
||||
let g:syntastic_java_javac_options = '-Xlint'
|
||||
endif
|
||||
|
||||
if !exists('g:syntastic_java_maven_options')
|
||||
let g:syntastic_java_maven_options = ''
|
||||
endif
|
||||
|
||||
if !exists('g:syntastic_java_javac_classpath')
|
||||
let g:syntastic_java_javac_classpath = ''
|
||||
endif
|
||||
@ -217,7 +221,9 @@ function! s:GetMavenProperties()
|
||||
let pom = findfile('pom.xml', '.;')
|
||||
if s:has_maven && filereadable(pom)
|
||||
if !has_key(g:syntastic_java_javac_maven_pom_properties, pom)
|
||||
let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) . ' -f ' . syntastic#util#shescape(pom)
|
||||
let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) .
|
||||
\ ' -f ' . syntastic#util#shescape(pom) .
|
||||
\ ' ' . g:syntastic_java_maven_options
|
||||
let mvn_is_managed_tag = 1
|
||||
let mvn_settings_output = split(system(mvn_cmd . ' help:effective-pom'), "\n")
|
||||
let current_path = 'project'
|
||||
@ -256,7 +262,9 @@ function! s:GetMavenClasspath()
|
||||
let pom = findfile('pom.xml', '.;')
|
||||
if s:has_maven && filereadable(pom)
|
||||
if !has_key(g:syntastic_java_javac_maven_pom_ftime, pom) || g:syntastic_java_javac_maven_pom_ftime[pom] != getftime(pom)
|
||||
let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) . ' -f ' . syntastic#util#shescape(pom)
|
||||
let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) .
|
||||
\ ' -f ' . syntastic#util#shescape(pom) .
|
||||
\ ' ' . g:syntastic_java_maven_options
|
||||
let mvn_classpath_output = split(system(mvn_cmd . ' dependency:build-classpath'), "\n")
|
||||
let mvn_classpath = ''
|
||||
let class_path_next = 0
|
||||
|
Loading…
Reference in New Issue
Block a user