Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

GRAILS-6784 and GRAILS-5978 - updated commons-codec, commons-pool, an…

…d common-dbcp to the latest versions
  • Loading branch information...
commit 0e5f091943a99fa1610e533680e79e473d2470b6 1 parent 6323e14
Burt Beckwith burtbeckwith authored
6 .classpath
@@ -15,13 +15,13 @@
15 15 <classpathentry kind="lib" path="lib/commons-beanutils-1.8.0.jar"/>
16 16 <classpathentry kind="lib" path="lib/commons-cli-1.0.jar"/>
17 17 <classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
18   - <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
19   - <classpathentry kind="lib" path="lib/commons-dbcp-1.2.2.jar"/>
  18 + <classpathentry kind="lib" path="lib/commons-codec-1.4.jar"/>
  19 + <classpathentry kind="lib" path="lib/commons-dbcp-1.3.jar"/>
20 20 <classpathentry kind="lib" path="lib/commons-el-1.0.jar"/>
21 21 <classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
22 22 <classpathentry kind="lib" path="lib/commons-io-1.4.jar"/>
23 23 <classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>
24   - <classpathentry kind="lib" path="lib/commons-pool-1.5.3.jar"/>
  24 + <classpathentry kind="lib" path="lib/commons-pool-1.5.5.jar"/>
25 25 <classpathentry kind="lib" path="lib/commons-validator-1.3.1.jar"/>
26 26 <classpathentry kind="lib" path="lib/concurrentlinkedhashmap-lru-1.0_jdk5.jar"/>
27 27 <classpathentry kind="lib" path="lib/core-renderer-R8.jar"/>
12 dependencies.txt
@@ -26,8 +26,8 @@ The following libraries are included in Grails because they are required either
26 26 - Commons BeanUtils 1.8.0 (http://commons.apache.org/beanutils/) Apache 2.0 License
27 27 - required for running Grails applications
28 28
29   -* commons-codec-1.3.jar
30   -- Commons Codec 1.3 (http://commons.apache.org/codec/) Apache 2.0 License
  29 +* commons-codec-1.4.jar
  30 +- Commons Codec 1.4 (http://commons.apache.org/codec/) Apache 2.0 License
31 31 - required for running Grails applications
32 32
33 33 * commons-cli-1.0.jar
@@ -39,8 +39,8 @@ The following libraries are included in Grails because they are required either
39 39 - required for building Grails core
40 40 - required for running Grails applications
41 41
42   -* commons-dbcp-1.2.2.jar
43   -- Commons DBCP 1.2.2 (http://commons.apache.org/dbcp/) Apache 2.0 License
  42 +* commons-dbcp-1.3.jar
  43 +- Commons DBCP 1.3 (http://commons.apache.org/dbcp/) Apache 2.0 License
44 44 - required for building Grails core
45 45 - required for running Grails applications
46 46
@@ -61,8 +61,8 @@ The following libraries are included in Grails because they are required either
61 61 - required for building Grails core
62 62 - required for running Grails application
63 63
64   -* commons-pool-1.5.3.jar
65   -- Commons Pool 1.5.3 (http://commons.apache.org/pool/) Apache 2.0 License
  64 +* commons-pool-1.5.5.jar
  65 +- Commons Pool 1.5.5 (http://commons.apache.org/pool/) Apache 2.0 License
66 66 - required for running Grails applications
67 67
68 68 * commons-validator-1.3.1.jar
6 grails.ipr
@@ -483,14 +483,14 @@
483 483 <root url="jar://$PROJECT_DIR$/lib/oro-2.0.8.jar!/" />
484 484 <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.16.jar!/" />
485 485 <root url="jar://$PROJECT_DIR$/lib/commons-io-1.4.jar!/" />
486   - <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.3.jar!/" />
  486 + <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.4.jar!/" />
487 487 <root url="jar://$PROJECT_DIR$/lib/commons-lang-2.4.jar!/" />
488 488 <root url="jar://$PROJECT_DIR$/lib/commons-fileupload-1.2.1.jar!/" />
489 489 <root url="jar://$PROJECT_DIR$/lib/commons-beanutils-1.8.0.jar!/" />
490 490 <root url="jar://$PROJECT_DIR$/lib/commons-collections-3.2.1.jar!/" />
491 491 <root url="jar://$PROJECT_DIR$/lib/commons-validator-1.3.1.jar!/" />
492   - <root url="jar://$PROJECT_DIR$/lib/commons-dbcp-1.2.2.jar!/" />
493   - <root url="jar://$PROJECT_DIR$/lib/commons-pool-1.5.3.jar!/" />
  492 + <root url="jar://$PROJECT_DIR$/lib/commons-dbcp-1.3.jar!/" />
  493 + <root url="jar://$PROJECT_DIR$/lib/commons-pool-1.5.5.jar!/" />
494 494 </CLASSES>
495 495 <JAVADOC />
496 496 <SOURCES />
4 ivy.xml
@@ -8,12 +8,12 @@
8 8 <dependency org="apache" name="commons-cli" rev="1.0"/>
9 9 <dependency org="apache" name="commons-beanutils" rev="1.7.0"/>
10 10 <dependency org="apache" name="commons-collections" rev="3.2"/>
11   - <dependency org="apache" name="commons-dbcp" rev="1.2.1"/>
  11 + <dependency org="apache" name="commons-dbcp" rev="1.3"/>
12 12 <dependency org="apache" name="commons-el" rev="1.0"/>
13 13 <dependency org="apache" name="commons-fileupload" rev="1.1.1"/>
14 14 <dependency org="apache" name="commons-cli" rev="1.0"/>
15 15 <dependency org="apache" name="commons-logging" rev="1.1"/>
16   - <dependency org="apache" name="commons-pool" rev="1.2"/>
  16 + <dependency org="apache" name="commons-pool" rev="1.5.5"/>
17 17 <dependency org="apache" name="commons-validator" rev="1.3.0"/>
18 18 <dependency org="dom4j" name="dom4j" rev="1.6.1"/>
19 19 <dependency org="junit" name="junit" rev="4.8.1"/>
BIN  lib/commons-codec-1.3.jar
Binary file not shown
BIN  lib/commons-codec-1.4.jar
Binary file not shown
BIN  lib/commons-dbcp-1.2.2.jar
Binary file not shown
BIN  lib/commons-dbcp-1.3.jar
Binary file not shown
BIN  lib/commons-pool-1.5.3.jar
Binary file not shown
BIN  lib/commons-pool-1.5.5.jar
Binary file not shown
2  maven/grails-core.pom.in
@@ -73,7 +73,7 @@
73 73 <dependency>
74 74 <groupId>commons-dbcp</groupId>
75 75 <artifactId>commons-dbcp</artifactId>
76   - <version>1.2.2</version>
  76 + <version>1.3</version>
77 77 </dependency>
78 78
79 79 <dependency>
6 src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -259,7 +259,7 @@ class IvyDependencyManager extends AbstractIvyDependencyManager implements Depen
259 259
260 260 "${compileTimeDependenciesMethod}"("aopalliance:aopalliance:1.0",
261 261 "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.0_jdk5",
262   - "commons-codec:commons-codec:1.3",
  262 + "commons-codec:commons-codec:1.4",
263 263 "commons-collections:commons-collections:3.2.1",
264 264 "commons-io:commons-io:1.4",
265 265 "commons-lang:commons-lang:2.4",
@@ -307,8 +307,8 @@ class IvyDependencyManager extends AbstractIvyDependencyManager implements Depen
307 307 "javax.servlet:jstl:1.1.2"
308 308
309 309 // data source
310   - "${runtimeDependenciesMethod}" "commons-dbcp:commons-dbcp:1.2.2",
311   - "commons-pool:commons-pool:1.5.3",
  310 + "${runtimeDependenciesMethod}" "commons-dbcp:commons-dbcp:1.3",
  311 + "commons-pool:commons-pool:1.5.5",
312 312 "hsqldb:hsqldb:1.8.0.10"
313 313
314 314 // caching
2  src/test/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy
@@ -755,7 +755,7 @@ class IvyDependencyManagerTests extends GroovyTestCase {
755 755 "cglib:cglib-nodep:2.1_3",
756 756 "commons-beanutils:commons-beanutils:1.8.0",
757 757 "commons-collections:commons-collections:3.2.1",
758   - "commons-dbcp:commons-dbcp:1.2.2",
  758 + "commons-dbcp:commons-dbcp:1.3",
759 759 "commons-fileupload:commons-fileupload:1.2.1",
760 760 "commons-io:commons-io:1.4",
761 761 "commons-lang:commons-lang:2.4",

0 comments on commit 0e5f091

Please sign in to comment.
Something went wrong with that request. Please try again.