From 6e6c4f762523814c2e812fb576b3daace584839d Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Sun, 2 Dec 2012 16:52:56 +1100 Subject: [PATCH 1/3] upgrade dependencies --- pom.xml | 12 ++++++------ src/xdocs/releasenotes.xml | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index ce709b9d4..8eb9edbcf 100755 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,8 @@ http://sourceforge.net/tracker/?group_id=29721 - hudson - http://hudson.fazend.com:8081/hudson/job/Checkstyle + hudson + http://hudson.fazend.com:8081/hudson/job/Checkstyle 2001 @@ -157,9 +157,9 @@ 1.2 - com.google.collections - google-collections - 1.0 + com.google.guava + guava + 13.0.1 org.apache.ant @@ -173,7 +173,7 @@ junit junit - 4.10 + 4.11 test diff --git a/src/xdocs/releasenotes.xml b/src/xdocs/releasenotes.xml index 1034d58c4..b4a7a78f0 100755 --- a/src/xdocs/releasenotes.xml +++ b/src/xdocs/releasenotes.xml @@ -10,6 +10,27 @@ +
+

New features:

+
    +
  • + TBD +
    • +
+

Bug fixes:

+
    +
  • + TBD +
    • +
+

Notes:

+
    +
  • + Upgraded dependencies to Guava 13.0.1 and JUnit 4.11. +
    • +
+
+

New features:

    From 0e866d0455fc209a94921a341558b5a62735784f Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Wed, 12 Jun 2013 20:12:03 +1000 Subject: [PATCH 2/3] Upgrading the Guava version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eb9edbcf..c87fe31a5 100755 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ com.google.guava guava - 13.0.1 + 14.0.1 org.apache.ant From 359237496a9ec3e7618e4f54f11e7efe8a6d90c3 Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Wed, 12 Jun 2013 20:45:56 +1000 Subject: [PATCH 3/3] Black magic to get rid of Maven errors in Eclipse. Solution found at http://stackoverflow.com/questions/6352208/how-to-solve-plugin-execution-not-covered-by-lifecycle-configuration-for-sprin --- pom.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c87fe31a5..cda55d8ca 100755 --- a/pom.xml +++ b/pom.xml @@ -199,6 +199,51 @@ src/tests + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-antrun-plugin + [1.0,) + + run + + + + + + + + + org.codehaus.mojo + antlr-maven-plugin + [1.0,) + + generate + + + + + + + + + + + + + org.apache.maven.plugins @@ -381,8 +426,8 @@ - org.apache.maven.plugins - maven-eclipse-plugin + org.apache.maven.plugins + maven-eclipse-plugin 2.8 true @@ -413,8 +458,8 @@