Fixed merge conflicts.
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 @@
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 @@
[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 (
