Skip to content

Commit ed2e7e3

Browse files
committed
travis fixes
1 parent cec95f0 commit ed2e7e3

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dist: trusty
1212
before_install:
1313
# CommandBox Keys
1414
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
15-
- sudo echo "deb http://integration.stg.ortussolutions.com/artifacts/debs/noarch /" | sudo tee -a
15+
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
1616
/etc/apt/sources.list.d/commandbox.list
1717

1818
install:

box.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"slug":"cbvalidation-shell",
55
"private":false,
66
"dependencies":{
7-
"cbi18n":"1.3.0",
8-
"coldbox":"^4.2.0+00002"
7+
"cbi18n":"^1.3.1",
8+
"coldbox":"^4.3.0"
99
},
1010
"devDependencies":{
1111
"testbox":"^2.3.0+00044"

changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ CHANGELOG
22
=========
33

44
## 1.3.0
5+
* Dependency updates
56

67
## 1.2.0
78
* Updated cbi18n dependency to latest

modules/cbvalidation/box.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"Brad Wood <[email protected]>", "Curt Gratz <[email protected]>"
1717
],
1818
"dependencies" :{
19-
"cbi18n" : "1.3.0"
19+
"cbi18n" : "^1.3.1"
2020
},
2121
"ignore":[
2222
"**/.*",

workbench/build.xml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Version: UPDATE ON EACH RELEASE AS NEEDED -->
44
<property name="project.name" value="cbvalidation" />
55
<property name="module.name" value="cbvalidation" />
6-
<property name="project.version" value="1.3.0"/>
6+
<property name="project.version" value="1.3.1"/>
77
<property name="groupID" value="ortussolutions" />
88

99
<condition property="isTravis" else="false">
@@ -41,14 +41,20 @@
4141
<loadproperties srcFile="workbench/build.properties"/>
4242

4343
<!-- Build Number -->
44-
<propertyfile file="workbench/build.number" comment="Build Number for ANT. Edit not!">
45-
<entry key="build.number"
46-
type="int"
47-
operation="+"
48-
pattern="00000"
49-
default="1" />
50-
</propertyfile>
51-
<property file="workbench/build.number"/>
44+
<if>
45+
<not><isset property="build.number" /></not>
46+
<then>
47+
<propertyfile file="workbench/build.number" comment="Build Number for ANT. Edit not!">
48+
<entry key="build.number"
49+
type="int"
50+
operation="+"
51+
pattern="00000"
52+
default="1" />
53+
</propertyfile>
54+
55+
<property file="workbench/build.number"/>
56+
</then>
57+
</if>
5258

5359
<!-- Build Label -->
5460
<property name="build.label" value="${project.name}-${project.version}+${build.number}-${start.DSTAMP}${start.TSTAMP}"/>

0 commit comments

Comments
 (0)