sync v1.2.0

Signed-off-by: gythialy <gythialy.koo+github@gmail.com>

build.gradle

@@ -49,6 +49,8 @@ configure(javaProjects) {
   apply plugin: "net.saliman.cobertura"
   apply plugin: "biz.aQute.bnd.builder"
 
+  uploadArchives.enabled = false
+
   group = cfgGroup
 
   if (!project.properties.containsKey("cfgJavaVersion")) {
@@ -162,6 +164,8 @@ configure(javaProjects) {
 
 configure(repositoryProjects) {
 
+  uploadArchives.enabled = true
+
   if (cfgSignPom) {
     signing {
       if ( project.hasProperty("signing.keyId") ) {
@@ -235,31 +239,33 @@ task javadocAll(type: Javadoc) {
 }
 
 
-task writeSettings << {
-  Writer out = new OutputStreamWriter(new FileOutputStream("build/settings.gradle"));
-  out.write("include ");
-  boolean first = true;
-  for (Project myproject: distributionProjects) {
-    if (!myproject.getProjectDir().equals(getProjectDir())) {
-      if (first == true) {
-        first = false;
-      }
-      else {
-        out.write ", ";
+task writeSettings {
+  doLast {
+    Writer out = new OutputStreamWriter(new FileOutputStream("build/settings.gradle"));
+    out.write("include ");
+    boolean first = true;
+    for (Project myproject: distributionProjects) {
+      if (!myproject.getProjectDir().equals(getProjectDir())) {
+        if (first == true) {
+          first = false;
+        }
+        else {
+          out.write ", ";
+        }
+        out.write '"' + myproject.name + '"'
       }
-      out.write '"' + myproject.name + '"'
     }
-  }
-  out .write "\n\n";
+    out .write "\n\n";
 
-  for (Project myproject: distributionProjects) {
-    if (!myproject.getProjectDir().equals(getProjectDir())) {
-      println myproject.name
-      out.write 'project(":' + myproject.name + '").projectDir = file("' + myproject.getProjectDir().toString().substring((int)(getProjectDir().toString().size() + 1)) + '")\n';
+    for (Project myproject: distributionProjects) {
+      if (!myproject.getProjectDir().equals(getProjectDir())) {
+        println myproject.name
+        out.write 'project(":' + myproject.name + '").projectDir = file("' + myproject.getProjectDir().toString().substring((int)(getProjectDir().toString().size() + 1)) + '")\n';
+      }
     }
-  }
 
-  out.close();
+    out.close();
+  }
 }
 
 task buildDistProjects {

configuration.gradle

@@ -1,9 +1,9 @@
 
 project.ext {
 
-  cfgVersion = '1.1.0'
+  cfgVersion = "1.2.0"
 
-  cfgGroup = 'org.openmuc'
+  cfgGroup = "org.openmuc"
 
   cfgCopyDependencies = false
 
@@ -31,37 +31,37 @@ project.ext {
 tasks.withType(Tar) {
 
   into(project.name) {
-    from('./') {
-      include 'build.gradle'
-      include 'configuration.gradle'
-      include 'license/**'
-      include 'doc/CHANGELOG.txt'
-      include 'run-scripts/**'
-      include 'gradle/wrapper/**'
-      include 'gradlew'
-      include 'gradlew.bat'
-      include 'build/libs/**'
-      include 'src/**'
+    from("./") {
+      include "build.gradle"
+      include "configuration.gradle"
+      include "license/**"
+      include "doc/CHANGELOG.txt"
+      include "run-scripts/**"
+      include "gradle/wrapper/**"
+      include "gradlew"
+      include "gradlew.bat"
+      include "build/libs/**"
+      include "src/**"
     }
 
     if (name.equals("tar") ){
-      exclude '**/dependencies/**/src'
+      exclude "**/dependencies/**/src"
     }
 
   }
 
-  into(project.name + '/doc/user-guide/') {
-    from('./build/asciidoc/html5/') {
-      include '**'
+  into(project.name + "/doc/user-guide/") {
+    from("./build/asciidoc/html5/") {
+      include "**"
     }
-    from('./build/asciidoc/pdf/') {
-      include '**'
+    from("./build/asciidoc/pdf/") {
+      include "*.pdf"
     }
   }
 
-  into(project.name + '/doc/') {
-    from('./build/docs/') {
-      include 'javadoc/**'
+  into(project.name + "/doc/") {
+    from("./build/docs/") {
+      include "javadoc/**"
     }
   }
 
@@ -70,32 +70,32 @@ tasks.withType(Tar) {
 
 //------------------project specific configurations--------------------
 
-apply plugin: 'java'
-apply plugin: 'eclipse'
-apply plugin: 'osgi'
-apply plugin: 'maven'
-apply plugin: 'signing'
+apply plugin: "java"
+apply plugin: "eclipse"
+apply plugin: "osgi"
+apply plugin: "maven"
+apply plugin: "signing"
 
 
 jar {
   manifest {
-    name = 'j60870'
-    instruction 'Export-Package', '!*.internal.*,*'
+    name = "j60870"
+    instruction "Export-Package", "!*.internal.*,*"
   }
 }
 
 uploadArchives {
   repositories {
     mavenDeployer {
       pom.project {
-        name 'j60870'
-        description 'j60870 is an IEC 60870-5-104 client and server library.'
+        name "j60870"
+        description "j60870 is an IEC 60870-5-104 client and server library."
 
         licenses {
           license {
-            name 'GNU General Public License'
-            url 'http://www.gnu.org/copyleft/gpl-3.0.html'
-            distribution 'repo'
+            name "GNU General Public License"
+            url "http://www.gnu.org/copyleft/gpl-3.0.html"
+            distribution "repo"
           }
         }
 

doc/CHANGELOG.txt

@@ -1,3 +1,9 @@
+v1.2.0 04-Jan-2017
+------------------
+
+- CauseOfTransmission field can now be set explicilty when sending
+  SingleCommand (thanks to Dean Ouelette from RTDS).
+
 v1.1.1 04-Oct-2016
 ------------------
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"