Repository: gora Updated Branches: refs/heads/master 1a42a6239 -> 0c5eacf4e
Updated jdom to 1.1.3 to eliminate xerces version conflict. Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/c041049c Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/c041049c Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/c041049c Branch: refs/heads/master Commit: c041049c579f85e993c6741eef01dacabd66f14b Parents: a72c5d3 Author: Viacheslav Dobromyslov <[email protected]> Authored: Wed Sep 17 21:23:37 2014 +1100 Committer: Viacheslav Dobromyslov <[email protected]> Committed: Wed Sep 17 21:23:37 2014 +1100 ---------------------------------------------------------------------- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/c041049c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4e1f160..32cfbdd 100644 --- a/pom.xml +++ b/pom.xml @@ -637,7 +637,7 @@ <!-- Misc Dependencies --> <guava.version>13.0</guava.version> <commons-lang.version>2.6</commons-lang.version> - <jdom.version>1.1.2</jdom.version> + <jdom.version>1.1.3</jdom.version> <hsqldb.version>2.2.8</hsqldb.version> <mysql.version>5.1.18</mysql.version> <xerces.version>2.9.1</xerces.version> @@ -1292,11 +1292,11 @@ <artifactId>mysql-connector-java</artifactId> <version>${mysql.version}</version> </dependency --> - <dependency> + <!--dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>${xerces.version}</version> - </dependency> + </dependency --> <!-- Logging Dependencies --> <dependency>
