Fixed merge conflicts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/e022034a Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/e022034a Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/e022034a Branch: refs/heads/fix/dependendices-2016 Commit: e022034af823344a4bab0b5d2657f862dd86df22 Parents: 0154513 Author: wisebaldone <ehu...@gmail.com> Authored: Wed Apr 19 15:58:58 2017 +1000 Committer: wisebaldone <ehu...@gmail.com> Committed: Wed Apr 19 15:58:58 2017 +1000 ---------------------------------------------------------------------- wave/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/e022034a/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index 9aadad0..f67a9fa 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -95,14 +95,14 @@ repositories { maven { url 'https://oauth.googlecode.com/svn/code/maven/' } + maven { + url 'https://maven.atlassian.com/3rdparty/' + } } configurations.compile { resolutionStrategy { //failOnVersionConflict() } - maven { - url 'https://maven.atlassian.com/3rdparty/' - } } dependencies { compile ( @@ -154,9 +154,9 @@ dependencies { [group: "javax.inject", name: "javax.inject", version: "1"], // [?, ?] [group: "javax.servlet", name: "javax.servlet-api", version: "3.1.0"], // [?, ?] [group: "javax.jdo", name: "jdo2-api", version: "2.1"], // [?, ?] - [group: "net.oauth.core", name: "oauth-provider", version: "20100601-atlassian-2"], // [11/2016, depreciate] - [group: "net.oauth.core", name: "oauth", version: "20100601-atlassian-2"], // [11/2016, depreciate] - [group: "net.oauth.core", name: "oauth-consumer", version: "20100601-atlassian-2"], // [11/2016, depreciate] + [group: "net.oauth.core", name: "oauth-provider", version: "20100601-atlassian-2"], // [11/2016, depreciate] + [group: "net.oauth.core", name: "oauth", version: "20100601-atlassian-2"], // [11/2016, depreciate] + [group: "net.oauth.core", name: "oauth-consumer", version: "20100601-atlassian-2"], // [11/2016, depreciate] ) compile fileTree(dir: '../pst/build/libs', include: '**/*.jar') // [?, ?] generateGXP (
