diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-04-03 09:43:16 +0300 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-04-03 10:28:02 +0300 |
| commit | 563b0ca0d8b7c085aa5a69a7afd352811979612b (patch) | |
| tree | 5b2163519be204a879a7408b97ce33fd999f333f | |
| parent | bff6f60d6522a2f3b9730aec5d30c1f50c2e9fbb (diff) | |
| download | vaadin-framework-563b0ca0d8b7c085aa5a69a7afd352811979612b.tar.gz vaadin-framework-563b0ca0d8b7c085aa5a69a7afd352811979612b.zip | |
Update commons-io to the same version in all modules (#13531)
Adds a commons-io.version property to the build.properties file
Change-Id: I57a72f8841846d77ba73d567bd9bc3c8415b243c
| -rw-r--r-- | build.properties | 1 | ||||
| -rw-r--r-- | buildhelpers/ivy.xml | 3 | ||||
| -rw-r--r-- | client-compiler/ivy.xml | 2 | ||||
| -rw-r--r-- | server/ivy.xml | 2 | ||||
| -rw-r--r-- | uitest/ivy.xml | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/build.properties b/build.properties index 83e256cd69..21cb173561 100644 --- a/build.properties +++ b/build.properties @@ -6,3 +6,4 @@ vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build vaadin.sass.version=0.9.0 +commons-io.version=2.4
\ No newline at end of file diff --git a/buildhelpers/ivy.xml b/buildhelpers/ivy.xml index df25cc84e5..9117721444 100644 --- a/buildhelpers/ivy.xml +++ b/buildhelpers/ivy.xml @@ -28,7 +28,8 @@ </publications> <dependencies> - <dependency org="commons-io" name="commons-io" rev="2.2" /> + <!-- client-compiler, server and uitest also use commons-io --> + <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" /> <dependency org="commons-cli" name="commons-cli" rev="1.2" /> <dependency org="com.vaadin" name="vaadin-sass-compiler" rev="${vaadin.sass.version}" /> diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml index 09dce744f1..bc50e2a93e 100644 --- a/client-compiler/ivy.xml +++ b/client-compiler/ivy.xml @@ -53,7 +53,7 @@ rev="1.1" conf="build,ide -> default" /> <dependency org="commons-codec" name="commons-codec" rev="1.8" conf="build,ide -> default" /> - <dependency org="commons-io" name="commons-io" rev="2.4" + <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" conf="build,ide -> default" /> <dependency org="org.apache.commons" name="commons-lang3" rev="3.1" conf="build,ide -> default" /> diff --git a/server/ivy.xml b/server/ivy.xml index abbdced15f..1b1b49d78c 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -74,7 +74,7 @@ conf="test,ide-> default" transitive="true" /> <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="test,ide -> default" /> - <dependency org="commons-io" name="commons-io" rev="2.2" + <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" conf="test->default" /> <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="test,ide->default" /> diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 0bd3d26efb..170ffd21cf 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -85,7 +85,7 @@ conf="ide, build->default" /> <dependency org="commons-codec" name="commons-codec" rev="1.5" conf="build,ide->default" /> - <dependency org="commons-io" name="commons-io" rev="2.2" + <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" conf="build,ide->default" /> <!-- Mainly for SQLContainer tests --> <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" |