Bump version to v0.14.0

build.gradle

@@ -3,10 +3,23 @@ def projectNameLowerCase = 'openmuc'
 
 configure(allprojects) {
     apply plugin: 'java'
-    version = '0.13.1'
+    version = '0.14.0'
     group = 'org.openmuc.framework'
 }
 
+allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.encoding = "UTF-8"
+            options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+        }
+    }
+
+    javadoc {
+        options.encoding = "UTF-8"
+    }
+}
+
 project.ext {
     distributionProjects = subprojects.findAll {
         it.getPath() == ':openmuc-core-api' ||
@@ -21,6 +34,7 @@ project.ext {
                 it.getPath() == ':openmuc-driver-iec62056p21' ||
                 it.getPath() == ':openmuc-driver-knx' ||
                 it.getPath() == ':openmuc-driver-mbus' ||
+                it.getPath() == ':openmuc-driver-wmbus' ||
                 it.getPath() == ':openmuc-driver-modbus' ||
                 it.getPath() == ':openmuc-driver-s7plc' ||
                 it.getPath() == ':openmuc-driver-snmp' ||
@@ -33,8 +47,7 @@ project.ext {
                 it.getPath() == ':openmuc-webui-channelconfigurator' ||
                 it.getPath() == ':openmuc-webui-userconfigurator' ||
                 it.getPath() == ':openmuc-server-restws' ||
-                it.getPath() == ':openmuc-server-asciisocket' ||
-                it.getPath() == ':openmuc-server-modbus'
+                it.getPath() == ':openmuc-server-asciisocket'
     }
 
     docProjects = distributionProjects.findAll {
@@ -55,8 +68,7 @@ configure(subprojects) {
     targetCompatibility = 1.6
 
     repositories {
-    mavenCentral()
-//        maven { url 'http://repo1.maven.org/maven2/' }
+        mavenCentral()
         flatDir {
             dirs 'dependencies', rootDir.getPath() + "/dependencies"
         }
@@ -88,7 +100,6 @@ configure(subprojects) {
     uploadArchives {
         repositories {
             mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
                 repository(url: project.properties.repository) {
                     authentication(userName: project.properties.artifactoryUser, password: project.properties.artifactoryPass)
@@ -206,7 +217,6 @@ task(tar, type: Tar) {
             include 'demo/framework/felix/**'
             include 'demo/framework/bundle/**'
             include 'demo/framework/conf/**'
-            include 'demo/framework/openmuc-config.xml'
             include 'demo/framework/README.txt'
             include 'demo/framework/run-openmuc.bat.winfile'
             include 'demo/framework/build.gradle'

demo/framework/build.gradle

@@ -6,7 +6,7 @@ configurations.create('osgibundles')
 configurations.osgibundles.transitive = false;
 
 dependencies {
-    def openmucversion = '0.13.1'
+    def openmucversion = '0.14.0'
 
     osgibundles files('../../build/libs/openmuc-core-api-' + openmucversion + '.jar')
     osgibundles files('../../build/libs/openmuc-core-spi-' + openmucversion + '.jar')
@@ -26,39 +26,55 @@ dependencies {
     osgibundles files('../projects/simpleappdemo/build/libs/openmuc-demo-simpleapp-' + openmucversion + '.jar')
     osgibundles files('../projects/dummydriver/build/libs/openmuc-driver-dummy-' + openmucversion + '.jar')
 
-    //The Apache Felix Gogo standard shell for OSGi (http://felix.apache.org/site/apache-felix-gogo.html)
+    //--------------------------------------------------------------------------------------------------
+    // The Apache Felix Gogo standard shell for OSGi (http://felix.apache.org/site/apache-felix-gogo.html)
+    //--------------------------------------------------------------------------------------------------
     osgibundles group: 'org.apache.felix', name: 'org.apache.felix.gogo.runtime', version: '0.12.1'
     osgibundles group: 'org.apache.felix', name: 'org.apache.felix.gogo.command', version: '0.14.0'
     osgibundles group: 'org.apache.felix', name: 'org.apache.felix.gogo.shell', version: '0.10.0'
 
-    //Adds a telnet server so that the Felix Gogo Shell can be accessed
-    //using telnet clients. By default this server only listens on
-    //localhost port 6666. Therefor you can on only access it from the
-    //same host on which felix is running.
+    //--------------------------------------------------------------------------------------------------
+    // Adds a telnet server so that the Felix Gogo Shell can be accessed
+    // using telnet clients. By default this server only listens on
+    // localhost port 6666. Therefor you can on only access it from the
+    // same host on which felix is running.
+    //--------------------------------------------------------------------------------------------------
     osgibundles group: 'org.apache.felix', name: 'org.apache.felix.shell.remote', version: '1.1.2'
 
-    //message logging libraries, SLF4J is a light-weight logging API,
-    //Logback is a message logger implementation that implements SLF4J
-    //natively
-    osgibundles group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7'
+    //--------------------------------------------------------------------------------------------------
+    // message logging libraries, SLF4J is a light-weight logging API,
+    // Logback is a message logger implementation that implements SLF4J
+    // natively
+    //--------------------------------------------------------------------------------------------------
+    osgibundles group: 'org.slf4j', name: 'slf4j-api', version: '1.7.10'
     osgibundles group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2'
     osgibundles group: 'ch.qos.logback', name: 'logback-core', version: '1.1.2'
 
-    //Apache Felix Service Component Runtime that implements the OSGi Declarative Services Specification
-    //the OpenMUC core bundles use declarative services and thus depend on them
+    //--------------------------------------------------------------------------------------------------
+    // Apache Felix Service Component Runtime that implements the OSGi Declarative Services Specification
+    // the OpenMUC core bundles use declarative services and thus depend on them
+    //--------------------------------------------------------------------------------------------------
     osgibundles group: 'org.apache.felix', name: 'org.apache.felix.scr', version: '1.8.2'
 
-    //An implementation of the OSGi HTTP Service Specification, needed by the WebUI bundles
-    osgibundles group: 'org.apache.felix', name: 'org.apache.felix.http.bundle', version: '2.3.0'
-    //Implementation of the OSGi Event Admin Service needed by org.apache.felix.http.jetty
-    osgibundles group: 'org.apache.felix', name: 'org.apache.felix.eventadmin', version: '1.4.0'
+    //--------------------------------------------------------------------------------------------------
+    // An implementation of the OSGi HTTP Service Specification, needed by the WebUI bundles
+    //--------------------------------------------------------------------------------------------------
+    osgibundles group: 'org.apache.felix', name: 'org.apache.felix.http.bundle', version: '2.3.2'
+    //--------------------------------------------------------------------------------------------------
+    // Implementation of the OSGi Event Admin Service needed by org.apache.felix.http.jetty
+    //--------------------------------------------------------------------------------------------------
+    osgibundles group: 'org.apache.felix', name: 'org.apache.felix.eventadmin', version: '1.4.2'
 
-    //An implementation of the OSGi Configuration Admin Service, needed by the BundleConfigurator WebUI
-    //to enable users to dynamically configure running bundles.
+    //--------------------------------------------------------------------------------------------------
+    // An implementation of the OSGi Configuration Admin Service, needed by the BundleConfigurator WebUI
+    // to enable users to dynamically configure running bundles.
+    //--------------------------------------------------------------------------------------------------
     osgibundles group: 'org.apache.felix', name: 'org.apache.felix.configadmin', version: '1.8.0'
 
-    //An implementation of the OSGi MetaType Service, needed by the BundleConfigurator WebUI to receive
-    //information about the running bundles:
+    //--------------------------------------------------------------------------------------------------
+    // An implementation of the OSGi MetaType Service, needed by the BundleConfigurator WebUI to receive
+    // information about the running bundles:
+    //--------------------------------------------------------------------------------------------------
     osgibundles group: 'org.apache.felix', name: 'org.apache.felix.metatype', version: '1.0.10'
 
 }

demo/framework/conf/logback.xml

@@ -20,6 +20,5 @@
     </root>
 
     <logger name="org.eclipse.jetty" level="INFO"/>
-    <logger name="org.openmuc.framework.driver.modbus" level="INFO"/>
 
 </configuration>

demo/framework/conf/system.properties

@@ -2,28 +2,34 @@
 logback.configurationFile=conf/logback.xml
 java.util.logging.config.file=conf/jul.properties
 
+# Required by Apache Felix to enable the HTTP Server
+org.apache.felix.http.jettyEnabled=true
+
+# set the location of the channel config file
+# the default is conf/channels.xml
+#org.openmuc.framework.channelconfig=conf/channels.xml
+
 # Required by jSSDP. This configuration makes OpenMUC announce its REST-Service as a SSDP Multicast Message
-org.openmuc.framework.util.ssdp.rest.searchtarget=openmuc:rest
-org.openmuc.framework.util.ssdp.rest.uri.prefix=http://
-org.openmuc.framework.util.ssdp.rest.uri.port=8888
-org.openmuc.framework.util.ssdp.rest.uri.suffix=/rest
+#org.openmuc.framework.util.ssdp.rest.searchtarget=openmuc:rest
+#org.openmuc.framework.util.ssdp.rest.uri.prefix=http://
+#org.openmuc.framework.util.ssdp.rest.uri.port=8888
+#org.openmuc.framework.util.ssdp.rest.uri.suffix=/rest
 
 # Set this value to true, if you want to have the unscaled value in the modbus server. (Default: false)
 # This helps to translate modbus-rtu into modbus-tcp.
 # Example: Register content: "803" which has to be interpreted as "80,3". 
 #	   By defining the Channel as Double Value and specifying a scalingFactor of "0.1" OpenMUC will internally display
 #	   the input as a correct floating point value. On Modbus-TCP Server it will again be "803" if set to true. "80" if false.
-org.openmuc.framework.server.modbus.useUnscaledValues=false
+#org.openmuc.framework.server.modbus.useUnscaledValues=false
 
 # If false (default) then https is used for writing channels via PUT requests.
 # If true then the unsecure http is used for writing channels via PUT requests.
-org.openmuc.framework.server.restws.channel.ChannelResource.enableHttpWrite=false
+#org.openmuc.framework.server.restws.channel.ChannelResource.enableHttpWrite=false
 
 # Set all combinations of serial ports / ttys. This fixes bugs on most of the embedded Linux Systems 
-gnu.io.rxtx.SerialPorts=/dev/ttyACM0:/dev/ttyACM1:/dev/ttyACM2:/dev/ttyACM3:/dev/ttyACM4:/dev/ttyACM5:/dev/ttyACM6:/dev/ttyACM7:/dev/ttyACM8:/dev/ttyACM9:/dev/ttyACM10:/dev/ttyAMA0:/dev/ttyAMA1:/dev/ttyAMA2:/dev/ttyAMA3:/dev/ttyAMA4:/dev/ttyAMA5:/dev/ttyAMA6:/dev/ttyAMA7:/dev/ttyAMA8:/dev/ttyAMA9:/dev/ttyAMA10:/dev/ttyUSB0:/dev/ttyUSB1:/dev/ttyUSB2:/dev/ttyUSB3:/dev/ttyUSB4:/dev/ttyUSB5:/dev/ttyUSB6:/dev/ttyUSB7:/dev/ttyUSB8:/dev/ttyUSB9:/dev/ttyUSB10:/dev/ttyS0:/dev/ttyS1:/dev/ttyS2:/dev/ttyS3:/dev/ttyS4:/dev/ttyS5:/dev/ttyS6:/dev/ttyS7:/dev/ttyS8:/dev/ttyS9:/dev/ttyS10:/dev/ttyO0:/dev/ttyO1:/dev/ttyO2:/dev/ttyO3:/dev/ttyO4:/dev/ttyO5:/dev/ttyO6:/dev/ttyO7:/dev/ttyO8:/dev/ttyO9:/dev/ttyO10:COM0:COM1:COM2:COM3:COM4:COM5:COM6:COM7:COM8:COM9:COM10:COM11:COM12:COM13:COM14:COM15:COM16:COM17:COM18:COM19:COM20
+#gnu.io.rxtx.SerialPorts=/dev/ttyACM0:/dev/ttyACM1:/dev/ttyACM2:/dev/ttyACM3:/dev/ttyACM4:/dev/ttyACM5:/dev/ttyACM6:/dev/ttyACM7:/dev/ttyACM8:/dev/ttyACM9:/dev/ttyACM10:/dev/ttyAMA0:/dev/ttyAMA1:/dev/ttyAMA2:/dev/ttyAMA3:/dev/ttyAMA4:/dev/ttyAMA5:/dev/ttyAMA6:/dev/ttyAMA7:/dev/ttyAMA8:/dev/ttyAMA9:/dev/ttyAMA10:/dev/ttyUSB0:/dev/ttyUSB1:/dev/ttyUSB2:/dev/ttyUSB3:/dev/ttyUSB4:/dev/ttyUSB5:/dev/ttyUSB6:/dev/ttyUSB7:/dev/ttyUSB8:/dev/ttyUSB9:/dev/ttyUSB10:/dev/ttyS0:/dev/ttyS1:/dev/ttyS2:/dev/ttyS3:/dev/ttyS4:/dev/ttyS5:/dev/ttyS6:/dev/ttyS7:/dev/ttyS8:/dev/ttyS9:/dev/ttyS10:/dev/ttyO0:/dev/ttyO1:/dev/ttyO2:/dev/ttyO3:/dev/ttyO4:/dev/ttyO5:/dev/ttyO6:/dev/ttyO7:/dev/ttyO8:/dev/ttyO9:/dev/ttyO10:COM0:COM1:COM2:COM3:COM4:COM5:COM6:COM7:COM8:COM9:COM10:COM11:COM12:COM13:COM14:COM15:COM16:COM17:COM18:COM19:COM20
 
 # TBD.
 org.eclipse.jetty.server.Request.maxFormKeys=2000
 
-# Required by Apache Felix to enable the HTTP Server
-org.apache.felix.http.jettyEnabled=true
+

demo/framework/felix/felix-4.4.1-doc/DEPENDENCIES → demo/framework/felix/felix-4.6.0-doc/DEPENDENCIES

@@ -1,5 +1,5 @@
 Apache Felix Main Distribution
-Copyright 2013 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
 
 This software was developed at the Apache Software Foundation
 (http://www.apache.org) and may have dependencies on other
@@ -9,7 +9,7 @@ I. Included Third-Party Software
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2012).
+Copyright (c) OSGi Alliance (2000, 2014).
 Licensed under the Apache License 2.0.
 
 This product includes software from http://kxml.sourceforge.net.
@@ -20,7 +20,7 @@ II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2012).
+Copyright (c) OSGi Alliance (2000, 2014).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at

demo/framework/felix/felix-4.4.1-doc/NOTICE → demo/framework/felix/felix-4.6.0-doc/NOTICE

@@ -1,13 +1,13 @@
 Apache Felix Main Distribution
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2012).
+Copyright (c) OSGi Alliance (2000, 2014).
 Licensed under the Apache License 2.0.
 
 This product includes software from http://kxml.sourceforge.net.