You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/07/21 13:17:53 UTC
[52/54] [abbrv] incubator-quarks git commit: fix gradle changes
fix gradle changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/c477d8a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/c477d8a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/c477d8a6
Branch: refs/heads/master
Commit: c477d8a6639adb94760ad232dfc2cc5ca8730f7c
Parents: a129aa1
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Jul 19 12:09:28 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Jul 19 12:09:28 2016 -0400
----------------------------------------------------------------------
build.gradle | 1 +
connectors/javax.websocket-client/build.gradle | 2 +-
connectors/wsclient-javax.websocket/build.gradle | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/c477d8a6/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 0c383ef..c5eb28e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,6 +46,7 @@ subprojects {
plugins.apply 'java'
plugins.apply 'jacoco'
+ if(["javax.websocket-client", "javax.websocket-server", "edgent.javax.websocket"].contains(project.name)) {
archivesBaseName = "${project.name}"
} else{
archivesBaseName = "${rootProject.name}${project.path.replace(':', '.')}"
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/c477d8a6/connectors/javax.websocket-client/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/javax.websocket-client/build.gradle b/connectors/javax.websocket-client/build.gradle
index 5f29571..d797e63 100644
--- a/connectors/javax.websocket-client/build.gradle
+++ b/connectors/javax.websocket-client/build.gradle
@@ -14,7 +14,7 @@
archivesBaseName = project.name
dependencies {
- compile project(':connectors:org.apache.edgent.javax.websocket')
+ compile project(':connectors:edgent.javax.websocket')
compile 'org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106'
testRuntime ext_classpath
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/c477d8a6/connectors/wsclient-javax.websocket/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/wsclient-javax.websocket/build.gradle b/connectors/wsclient-javax.websocket/build.gradle
index 966ea23..0e0510e 100644
--- a/connectors/wsclient-javax.websocket/build.gradle
+++ b/connectors/wsclient-javax.websocket/build.gradle
@@ -15,7 +15,7 @@ dependencies {
compile project(':api:topology')
compile project(':connectors:common')
compile project(':connectors:wsclient')
- compile project(':connectors:org.apache.edgent.javax.websocket')
+ compile project(':connectors:edgent.javax.websocket')
testCompile project(':providers:direct')
testCompile project(':connectors:javax.websocket-client')
testCompile project(':connectors:javax.websocket-server')