You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2016/11/24 10:53:08 UTC

[04/50] [abbrv] aries-jax-rs-whiteboard git commit: Fixed build

Fixed build


Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f50f9161
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f50f9161
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f50f9161

Branch: refs/heads/master
Commit: f50f9161aa1b2de185fac9bc24f994cd66adcce2
Parents: 64ea9eb
Author: Carlos Sierra <ca...@liferay.com>
Authored: Tue Oct 11 18:56:50 2016 +0200
Committer: Carlos Sierra <ca...@liferay.com>
Committed: Tue Oct 11 18:56:50 2016 +0200

----------------------------------------------------------------------
 test-cxf/build.gradle | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f50f9161/test-cxf/build.gradle
----------------------------------------------------------------------
diff --git a/test-cxf/build.gradle b/test-cxf/build.gradle
index 82d4055..010c76b 100644
--- a/test-cxf/build.gradle
+++ b/test-cxf/build.gradle
@@ -1,24 +1,4 @@
 dependencies {
-//    compile group: "org.osgi", name: "org.osgi.core", transitive: false, version: "6.0.0"
-//    runtime group: "biz.aQute.bnd", name: "biz.aQute.bndlib", transitive: false, version: "3.1.0"
-//    runtime group: "org.apache.felix", name: "org.apache.felix.configadmin", transitive: false, version: "1.8.8"
-//    runtime group: "org.apache.felix", name: "org.apache.felix.dependencymanager", transitive: false, version: "3.2.0"
-//    runtime group: "org.osgi", name: "org.osgi.service.http.whiteboard", transitive: false, version: "1.0.0"
-//    runtime group: "org.apache.felix", name: "org.apache.felix.gogo.command", transitive: false, transitive: false, version: "0.12.0"
-//    runtime group: "org.apache.felix", name: "org.apache.felix.gogo.runtime", transitive: false, transitive: false, version: "0.10.0"
-//    runtime group: "org.apache.felix", name: "org.apache.felix.gogo.shell", transitive: false, transitive: false, version: "0.10.0"
-//
-//    runtime group: "biz.aQute.bnd", name: "biz.aQute.bndlib", transitive: false, version: "3.1.0"
-//    runtime group: "javax.servlet", name: "javax.servlet-api", transitive: false, version: "3.0.1"
-//    runtime group: "org.osgi", name: "org.osgi.service.http.whiteboard", transitive: false, version: "1.0.0"
-//    runtime group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', transitive: false, version: '2.6'
-//    runtime group: "org.codehaus.woodstox", name: "stax2-api", transitive: false, version: "3.1.4"
-//    runtime group: "org.codehaus.woodstox", name: "woodstox-core-asl", transitive: false, version: "4.4.1"
-//    runtime group: "org.osgi", name: "org.osgi.service.metatype", transitive: false, version: "1.3.0"
-//    runtime group: "log4j", name: "log4j", transitive: false, version: "1.2.17"
-//    runtime group: "org.apache.felix", name: "org.apache.felix.fileinstall", transitive: false, version: "3.5.4"
-//    runtime 'commons-fileupload:commons-fileupload:1.3.2'
-//    compile group: 'org.json', name: 'json', transitive: false, version: '20160212'
 	compile project(path: ':example-jaxrs-application', transitive: false)
 	compile project(path: ':portal-remote-cxf-common', transitive: false)
 	compile project(path: ':portal-remote-cxf-jaxrs-common', transitive: false)
@@ -60,12 +40,18 @@ task getDeps(type: Copy, dependsOn:cleanDeps) {
 }
 
 task run(dependsOn:getDeps) << {
-  new File('felix-cache').deleteDir()
-  javaexec { 
-    main="-jar";
-    args = ["bin/felix.jar"]
-	jvmArgs = ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"]
-	standardInput = System.in
-  } 
+  	def felixCache = file('felix-cache')
+
+	if (felixCache.exists()) {
+		felixCache.deleteDir()
+  	}
+
+	javaexec {
+		main="-jar";
+		args = ["bin/felix.jar"]
+		jvmArgs = ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"]
+		standardInput = System.in
+	}
+
 }