Skip to content

Commit a212845

Browse files
authored
Merge pull request #4 from UrbanCode/PLUGINS-4769
groovy upgrade
2 parents 9ad92c2 + 2afceab commit a212845

5 files changed

Lines changed: 38 additions & 19 deletions

File tree

ivy.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<!-- http://search.maven.org/#artifactdetails%7Corg.hamcrest%7Chamcrest-core%7C1.3%7Cjar -->
2121
<dependency org="org.hamcrest" name="hamcrest-core" rev="1.3" transitive="false" conf="test->default"/>
2222
<!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all -->
23-
<dependency org="org.codehaus.groovy" name="groovy-all" rev="1.8.8" transitive="false" conf="build->default"/>
23+
<dependency org="org.codehaus.groovy" name="groovy-all" rev="3.0.9" transitive="false" conf="build->default"/>
24+
<dependency org="org.codehaus.groovy" name="groovy-ant" rev="3.0.9" transitive="false" conf="build->default"/>
25+
<dependency org="org.codehaus.groovy" name="groovy" rev="3.0.9" transitive="false" conf="build->default"/>
2426
</dependencies>
2527
</ivy-module>

ivysettings.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<ivysettings>
2+
3+
<include url="${ivy.default.settings.dir}/ivysettings.xml"/>
4+
5+
<resolvers>
6+
7+
<ibiblio name="central" m2compatible="true" root="https://repo.maven.apache.org/maven2/"/>
8+
9+
<chain name="external" returnFirst="true">
10+
<resolver ref="default"/>
11+
<resolver ref="central"/>
12+
</chain>
13+
</resolvers>
14+
15+
<settings defaultResolver="external"/>
16+
17+
</ivysettings>

src/main/scripts/configure-node.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ def isEmpty(value) {
1313
}
1414

1515
//////////////////////MAIN////////////////////////
16-
final def isWindows = (System.getProperty('os.name') =~ /(?i)windows/).find()
17-
final def workDir = new File('.').absolutePath
18-
final def compName = new File(".").getCanonicalFile().name //this gets resolved to component name
19-
final def props = new Properties()
20-
final def inputPropsFile = new File(args[0])
21-
final def inputPropsStream = null
16+
def isWindows = (System.getProperty('os.name') =~ /(?i)windows/).find()
17+
def workDir = new File('.').absolutePath
18+
def compName = new File(".").getCanonicalFile().name //this gets resolved to component name
19+
def props = new Properties()
20+
def inputPropsFile = new File(args[0])
21+
def inputPropsStream = null
2222
try {
2323
inputPropsStream = new FileInputStream(inputPropsFile)
2424
props.load(inputPropsStream)

src/main/scripts/install.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ def isEmpty(value) {
1313
}
1414

1515
//////////////////////MAIN////////////////////////
16-
final def isWindows = (System.getProperty('os.name') =~ /(?i)windows/).find()
17-
final def workDir = new File('.').absolutePath
18-
final def compName = new File(".").getCanonicalFile().name //this gets resolved to component name
19-
final def props = new Properties()
20-
final def inputPropsFile = new File(args[0])
21-
final def inputPropsStream = null
16+
def isWindows = (System.getProperty('os.name') =~ /(?i)windows/).find()
17+
def workDir = new File('.').absolutePath
18+
def compName = new File(".").getCanonicalFile().name //this gets resolved to component name
19+
def props = new Properties()
20+
def inputPropsFile = new File(args[0])
21+
def inputPropsStream = null
2222
try {
2323
inputPropsStream = new FileInputStream(inputPropsFile)
2424
props.load(inputPropsStream)

src/main/scripts/install_module.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ def isEmpty(value) {
1313
}
1414

1515
//////////////////////MAIN////////////////////////
16-
final def isWindows = (System.getProperty('os.name') =~ /(?i)windows/).find()
17-
final def workDir = new File('.').absolutePath
18-
final def compName = new File(".").getCanonicalFile().name //this gets resolved to component name
19-
final def props = new Properties()
20-
final def inputPropsFile = new File(args[0])
21-
final def inputPropsStream = null
16+
def isWindows = (System.getProperty('os.name') =~ /(?i)windows/).find()
17+
def workDir = new File('.').absolutePath
18+
def compName = new File(".").getCanonicalFile().name //this gets resolved to component name
19+
def props = new Properties()
20+
def inputPropsFile = new File(args[0])
21+
def inputPropsStream = null
2222
try {
2323
inputPropsStream = new FileInputStream(inputPropsFile)
2424
props.load(inputPropsStream)

0 commit comments

Comments
 (0)