Merge branch 'true-master' into fix/dependendices-2016 # Conflicts: # wave/build.gradle
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/01545135 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/01545135 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/01545135 Branch: refs/heads/fix/dependendices-2016 Commit: 01545135abd2df8b46f3426637eb96c98202ea0c Parents: 5b6c987 19783bc Author: wisebaldone <ehu...@gmail.com> Authored: Wed Apr 19 15:53:23 2017 +1000 Committer: wisebaldone <ehu...@gmail.com> Committed: Wed Apr 19 15:53:23 2017 +1000 ---------------------------------------------------------------------- wave/build.gradle | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/01545135/wave/build.gradle ---------------------------------------------------------------------- diff --cc wave/build.gradle index 99f74bd,bfe2fb9..9aadad0 --- a/wave/build.gradle +++ b/wave/build.gradle @@@ -93,28 -104,40 +93,31 @@@ sourceSets repositories { mavenCentral() maven { - url 'http://archiva.comunes.org/repository/comunes-snapshots/' - } - maven { url 'https://oauth.googlecode.com/svn/code/maven/' } - maven { - url 'https://oss.sonatype.org/content/repositories/google-snapshots/' - } - maven { - url 'https://oss.sonatype.org/service/local/repositories/snapshots/content/' +} +configurations.compile { + resolutionStrategy { + //failOnVersionConflict() } + maven { + url 'https://maven.atlassian.com/3rdparty/' + } } - 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"], // [?, ?] - [group: "com.google.gwt", name: "gwt-user", version: "2.8.0"], // [?, ?] - [group: "com.google.gwt", name: "gwt-codeserver", version: "2.8.0"], // [?, ?] - ) compile ( - [group: "com.google.gwt", name: "gwt-dev", version: "2.8.0"], // [?, ?] - [group: "com.google.gwt", name: "gwt-user", version: "2.8.0"], // [?, ?] - [group: "com.google.gwt", name: "gwt-codeserver", version: "2.8.0"], // [?, ?] - [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"], // [?, ?] - [group: "commons-fileupload", name: "commons-fileupload", version: "1.2.2"], // [?, ?] - [group: "commons-cli", name: "commons-cli", version: "1.2"], // [?, ?] - [group: "commons-codec", name: "commons-codec", version: "1.4"], // [?, ?] + [group: "com.google.code.gson", name: "gson", version: "2.8.0"], // [11/2016, 1/2018] + [group: "com.google.guava", name: "guava", version: "20.0"], // [11/2016, 1/2018] + [group: "com.google.guava", name: "guava-gwt", version: "20.0"], // [11/2016, 1/2018] + [group: "com.google.gwt", name: "gwt-dev", version: "2.8.0"], // [11/2016, 1/2018] + [group: "com.google.gwt", name: "gwt-user", version: "2.8.0"], // [11/2016, 1/2018] + [group: "com.google.gwt", name: "gwt-codeserver", version: "2.8.0"], // [11/2016, 1/2018] + [group: "com.google.gxp", name: "google-gxp", version: "0.2.4-beta"], // [?, ?] + [group: "com.google.protobuf", name: "protobuf-java", version: "2.6.1"], // [?, ?] + [group: "com.google.protobuf", name: "protobuf-java", version: "2.6.1", classifier: 'sources'], // [?, ?] + [group: "com.googlecode.protobuf-java-format", name: "protobuf-java-format", version: "1.2"], // [?, ?] + [group: "com.typesafe", name: "config", version: "1.2.1"], // [?, ?] + [group: "commons-codec", name: "commons-codec", version: "1.10"], // [?, ?] [group: "commons-io", name: "commons-io", version: "2.4"], // [?, ?] [group: "commons-collections", name: "commons-collections", version: "3.2.2"], // [?, ?] [group: "commons-configuration", name: "commons-configuration", version: "1.6"], // [?, ?] @@@ -151,13 -189,23 +154,13 @@@ [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: "20100527"], // [11/2016, depreciate] - [group: "net.oauth.core", name: "oauth", version: "20100527"], // [11/2016, depreciate] - [group: "net.oauth.core", name: "oauth-consumer", version: "20100527"], // [11/2016, depreciate] - [group: "jline", name: "jline", version: "0.9.94"], // [?, ?] - [group: "joda-time", name: "joda-time", version: "1.6"], // [?, ?] - [group: "net.oauth.core", name: "oauth-provider", version: "20100601-atlassian-2"], // [?, ?] - [group: "net.oauth.core", name: "oauth", version: "20100601-atlassian-2"], // [?, ?] - [group: "net.oauth.core", name: "oauth-consumer", version: "20100601-atlassian-2"], // [?, ?] - [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 - [group: "org.mockito", name: "mockito-all", version: "1.9.5"], // [?, ?] - [group: "org.hamcrest", name: "hamcrest-all", version: "1.3"] // [?, ?] - ++ [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: 'dependencies/compile', include: "**/*.jar") // [?, ?] compile fileTree(dir: '../pst/build/libs', include: '**/*.jar') // [?, ?] generateGXP ( - [group: "com.google.gxp", name: "google-gxp", version: "0.2.4-beta"] // [?, ?] + [group: "com.google.gxp", name: "google-gxp", version: "0.2.4-beta"] // [11/2016, depreciate] ) protoCompile ( [group: "com.google.protobuf", name: "protobuf-java", version: "2.6.1"], // [?, ?]
