Repository: incubator-wave Updated Branches: refs/heads/master 786405704 -> 1e6046cb8
Update xerces, gwt and guava dependencies Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/1e6046cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/1e6046cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/1e6046cb Branch: refs/heads/master Commit: 1e6046cb8672e7dda8ee3b9ce7e8a71b45c52515 Parents: 7864057 Author: Pablo Ojanguren <pablo...@gmail.com> Authored: Sun Oct 23 14:44:30 2016 +0200 Committer: Pablo Ojanguren <pablo...@gmail.com> Committed: Sun Oct 23 14:44:30 2016 +0200 ---------------------------------------------------------------------- wave/build.gradle | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/1e6046cb/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index 8e7b6e4..1ba80a8 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -53,6 +53,16 @@ configurations { gwt } +// +// Workaround for validation API conflicts (GWT has not updated the dependency) +// https://groups.google.com/forum/#!topic/google-web-toolkit/KtdRAWNotXE +// +configurations.gwt { + resolutionStrategy { + force 'javax.validation:validation-api:1.0.0.GA' + } +} + //============================================================================= // Source's //============================================================================= @@ -102,20 +112,23 @@ repositories { maven { url 'https://oss.sonatype.org/content/repositories/google-snapshots/' } + maven { + url 'https://oss.sonatype.org/service/local/repositories/snapshots/content/' + } } dependencies { gwt( [group: "javax.validation", name: "validation-api", version: "1.1.0.Final"], // [?, ?] [group: "javax.validation", name: "validation-api", version: "1.1.0.Final", classifier: "sources"], // [?, ?] - [group: "com.google.gwt", name: "gwt-dev", version: "2.8.0-SNAPSHOT"], // [?, ?] - [group: "com.google.gwt", name: "gwt-user", version: "2.8.0-SNAPSHOT"], // [?, ?] - [group: "com.google.gwt", name: "gwt-codeserver", version: "2.8.0-SNAPSHOT"], // [?, ?] + [group: "com.google.gwt", name: "gwt-dev", version: "2.8.0-rc2"], // [?, ?] + [group: "com.google.gwt", name: "gwt-user", version: "2.8.0-rc2"], // [?, ?] + [group: "com.google.gwt", name: "gwt-codeserver", version: "2.8.0-rc2"], // [?, ?] ) compile ( - [group: "com.google.gwt", name: "gwt-dev", version: "2.8.0-SNAPSHOT"], // [?, ?] - [group: "com.google.gwt", name: "gwt-user", version: "2.8.0-SNAPSHOT"], // [?, ?] - [group: "com.google.gwt", name: "gwt-codeserver", version: "2.8.0-SNAPSHOT"], // [?, ?] + [group: "com.google.gwt", name: "gwt-dev", version: "2.8.0-rc2"], // [?, ?] + [group: "com.google.gwt", name: "gwt-user", version: "2.8.0-rc2"], // [?, ?] + [group: "com.google.gwt", name: "gwt-codeserver", version: "2.8.0-rc2"], // [?, ?] [group: "aopalliance", name: "aopalliance", version: "1.0"], // [?, ?] [group: "cc.kune", name: "gwt-initials-avatars-shared", version: "1.0-SNAPSHOT"], // [?, ?] [group: "cc.kune", name: "gwt-initials-avatars-server", version: "1.0-SNAPSHOT"], // [?, ?] @@ -131,8 +144,8 @@ dependencies { [group: "commons-logging", name: "commons-logging", version: "1.1.1"], // [?, ?] [group: "com.google.code.findbugs", name: "jsr305", version: "2.0.1"], // [?, ?] [group: "com.google.code.gson", name: "gson", version: "2.2.4"], // [?, ?] - [group: "com.google.guava", name: "guava", version: "15.0"], // [?, ?] - [group: "com.google.guava", name: "guava-gwt", version: "15.0"], // [?, ?] + [group: "com.google.guava", name: "guava", version: "20.0-SNAPSHOT"], // [?, ?] + [group: "com.google.guava", name: "guava-gwt", version: "20.0-SNAPSHOT"], // [?, ?] [group: "com.google.gxp", name: "google-gxp", version: "0.2.4-beta"], // [?, ?] [group: "com.google.inject.extensions", name: "guice-assistedinject", version: "3.0"], // [?, ?] [group: "com.google.inject.extensions", name: "guice-servlet", version: "3.0"], // [?, ?] @@ -178,7 +191,7 @@ dependencies { [group: "net.oauth.core", name: "oauth-provider", version: "20100527"], // [?, ?] [group: "net.oauth.core", name: "oauth", version: "20100527"], // [?, ?] [group: "net.oauth.core", name: "oauth-consumer", version: "20100527"], // [?, ?] - [group: "xerces", name: "xerces", version: "2.4.0"], // [?, ?] + [group: "xerces", name: "xercesImpl", version: "2.11.0"], // [?, ?] [group: "xpp3", name: "xpp3", version: "1.1.4c"], // [?, ?] [group: "xpp3", name: "xpp3_xpath", version: "1.1.4c"], // [?, ?] //TODO: Following are included due to tests being in the main src directory @@ -209,9 +222,9 @@ dependencies { [group: "org.jmock", name: "jmock-junit3", version: "2.6.0"], // [?, ?] [group: "org.jmock", name: "jmock", version: "2.6.0"], // [?, ?] [group: "org.mockito", name: "mockito-all", version: "1.9.5"], // [?, ?] - [group: "com.google.gwt", name: "gwt-dev", version: "2.8.0-SNAPSHOT"], // [?, ?] - [group: "com.google.gwt", name: "gwt-user", version: "2.8.0-SNAPSHOT"], // [?, ?] - [group: "com.google.gwt", name: "gwt-codeserver", version: "2.8.0-SNAPSHOT"], // [?, ?] + [group: "com.google.gwt", name: "gwt-dev", version: "2.8.0-rc2"], // [?, ?] + [group: "com.google.gwt", name: "gwt-user", version: "2.8.0-rc2"], // [?, ?] + [group: "com.google.gwt", name: "gwt-codeserver", version: "2.8.0-rc2"], // [?, ?] ) } @@ -702,4 +715,4 @@ clean { delete "war/webclient" delete "generated/" delete "gwt-unitCache" -} \ No newline at end of file +}
