Merge branch 'development' of [email protected]:NeuronRobotics/java-bowler.git into development

Author: madhephaestus

build.gradle

@@ -43,10 +43,11 @@ repositories {
 sourceSets {
     main {
         java {
-            srcDir buildDir.getAbsolutePath()+'/javasdk/NRSDK/src/'
+            srcDirs = [buildDir.getAbsolutePath()+'/javasdk/NRSDK/src/', buildDir.getAbsolutePath()+'/javasdk/NRSDK/addons/']
         }
         resources {
-            srcDir buildDir.getAbsolutePath()+'/javasdk/NRSDK/addons/'
+            srcDirs = [buildDir.getAbsolutePath()+'/javasdk/NRSDK/src/', buildDir.getAbsolutePath()+'/javasdk/NRSDK/addons/']
+            includes = ["**/*.fxml","**/*.xml","**/*.png"]
         }
     }
 }
@@ -58,15 +59,25 @@ dependencies {
     compile fileTree (dir: buildDir.getAbsolutePath()+'/javasdk/NRSDK/lib_addons/', includes: ['*.jar'])
 }
 
-
 // create a fat-jar (class files plus dependencies
 // excludes VRL.jar (plugin jar files must not start with 'vrl-\\d+')
 jar {
 
-    // dependencies except VRL
-    from configurations.runtime.asFileTree.
-        filter({file->return !file.name.startsWith("vrl-0")}).
-        files.collect { zipTree(it) }
+	// remove the security files (from mail.jar / activation.jar) so that the jar will be executable.
+	
+	doFirst { 
+	    // dependencies except VRL
+	    from (configurations.runtime.asFileTree.
+	        filter({file->return !file.name.startsWith("vrl-0")}).
+	        files.collect { zipTree(it) } ){
+	    	exclude 'META-INF/MANIFEST.MF'
+			exclude 'META-INF/*.SF'
+			exclude 'META-INF/*.DSA'
+			exclude 'META-INF/*.RSA'
+	    }
+	}
+	
+
 
     // project class files compiled from source
     from files(sourceSets.main.output.classesDir)

javasdk/NRSDK/src/com/neuronrobotics/sdk/config/build.properties

@@ -1,4 +1,4 @@
 app.name=nrsdk
 app.version=3.11.4
-app.javac.version=1.8
+app.javac.version=1.7