github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-19 07:44:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1101 from freedumbytes/windows

Browse Source 
Thanks for the PR!   Fix groovy script failure because of unescaped Windows File.separator.
This commit is contained in:
Jeremy Long
2018-02-11 07:38:55 -05:00
committed by GitHub
parent 3b294282f3 8eaf6a9cf0
commit 4baf1687b5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@@ -351,9 +351,9 @@ Copyright (c) 2012 - Jeremy Long
<scripts> <scripts>
<script><![CDATA[ <script><![CDATA[
if ("dependency-check-parent".equals("${project.artifactId}")) { if ("dependency-check-parent".equals("${project.artifactId}")) {
config = "file:///${project.basedir}/src/main/config" config = "file:///"+project.basedir.absolutePath.replace('\\','\\\\')+"/src/main/config"
} else { } else {
config = "file:///${project.basedir}/../src/main/config" config = "file:///"+project.basedir.absolutePath.replace('\\','\\\\')+"/../src/main/config"
} }
project.properties['odc.config']= config project.properties['odc.config']= config
]]></script> ]]></script>
@@ -370,9 +370,9 @@ Copyright (c) 2012 - Jeremy Long
<scripts> <scripts>
<script><![CDATA[ <script><![CDATA[
if ("dependency-check-parent".equals("${project.artifactId}")) { if ("dependency-check-parent".equals("${project.artifactId}")) {
config = "file:///${project.basedir}/src/main/config" config = "file:///"+project.basedir.absolutePath.replace('\\','\\\\')+"/src/main/config"
} else { } else {
config = "file:///${project.basedir}/../src/main/config" config = "file:///"+project.basedir.absolutePath.replace('\\','\\\\')+"/../src/main/config"
} }
project.properties['odc.config']= config project.properties['odc.config']= config
]]></script> ]]></script>
@@ -390,9 +390,9 @@ Copyright (c) 2012 - Jeremy Long
<scripts> <scripts>
<script><![CDATA[ <script><![CDATA[
if ("dependency-check-parent".equals("${project.artifactId}")) { if ("dependency-check-parent".equals("${project.artifactId}")) {
config = "file:///${project.basedir}/src/main/config" config = "file:///"+project.basedir.absolutePath.replace('\\','\\\\')+"/src/main/config"
} else { } else {
config = "file:///${project.basedir}/../src/main/config" config = "file:///"+project.basedir.absolutePath.replace('\\','\\\\')+"/../src/main/config"
} }
project.properties['odc.config']= config project.properties['odc.config']= config
]]></script> ]]></script>