Merge branch 'release/2019.1.0'

.gitignore

@@ -101,6 +101,8 @@ local.properties
 
 # Log file
 *.log
+# do not ignore directories ending in 'log'
+!*.log/
 
 # BlueJ files
 *.ctxt
@@ -195,6 +197,8 @@ typings/
 ### Gradle ###
 .gradle
 **/build/
+# do not ignore '/doc/build' directory
+!*doc/build/
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -210,3 +214,6 @@ gradle-app.setting
 
 
 # End of https://www.gitignore.io/api/java,maven,gradle,angular,eclipse,node
+
+# docs
+/doc/build/package-lock.json

README.md

@@ -52,23 +52,23 @@ Indepth documentation is currently in progress. Please find the latest documents
 
 OpenEMS development was started by [FENECON GmbH](https://www.fenecon.de), a German company specialized in manufacturing and project development of energy storage systems. It is the software stack behind [FEMS - FENECON Energy Management System](https://fenecon.de/page/fems) and widely used in private, commercial and industrial applications.
 
-We are inviting third parties - like universities, hardware manufacturers, software companies, commercial and private owners,... - to use OpenEMS for their own projects and are glad to support them with their first steps. In any case if you are interested in OpenEMS our development team would be glad to hear from you at [email protected].
+In 2019 governance of the OpenEMS project was taken over by the newly founded "OpenEMS Association e.V. (i.Gr.)". We are inviting third parties - like universities, hardware manufacturers, software companies, commercial and private owners,... - to use OpenEMS for their own projects and are glad to support them with their first steps. In any case if you are interested in OpenEMS our development team would be glad to hear from you at [email protected].
 
-OpenEMS is funded by several federal and EU funding projects. If you are a developer and you would like to get hired by one of the partner companies or universities for working on OpenEMS, please send your motivation letter to [email protected].
+OpenEMS is funded by several federal and EU funding projects. If you are a developer and you would like to get hired by one of the partner companies or universities for working on OpenEMS, please send your motivation letter to [email protected].
 
 ## License
 
 * OpenEMS Edge 
 * OpenEMS Backend
 
-Copyright (C) 2016-2018 FENECON GmbH.
+Copyright (C) 2016-2019 FENECON GmbH.
 
 This product includes software developed at FENECON GmbH: you can
 redistribute it and/or modify it under the terms of the [Eclipse Public License version 2.0](LICENSE-EPL-2.0). 
 
  * OpenEMS UI
 
-Copyright (C) 2016-2018 FENECON GmbH.
+Copyright (C) 2016-2019 FENECON GmbH.
 
 This product includes software developed at FENECON GmbH: you can
 redistribute it and/or modify it under the terms of the [GNU Affero General Public License version 3](LICENSE-AGPL-3.0).

build.gradle

@@ -1,3 +1,70 @@
+plugins {
+    id "com.github.node-gradle.node" version "1.3.0"
+    id "org.ajoberstar.reckon" version "0.9.0"
+}
+
+reckon {
+    scopeFromProp()
+    stageFromProp('dev', 'final')
+}
+
+/*
+ * Updates the OpenemsConstants file with the generated Version number
+ */
+task updateOpenemsConstants {
+    def version = project.version.version.getVersion()
+    def versionString = version.getPreReleaseVersion()
+    if (!version.getBuildMetadata().isEmpty()) {
+        versionString += "+" + version.getBuildMetadata()
+    }
+    def openemsConstantsFile = new File('io.openems.common/src/io/openems/common/OpenemsConstants.java')
+    def constants = openemsConstantsFile.getText('UTF-8')
+    constants = constants.replaceAll('(short VERSION_MAJOR = ).*;', '$1' + version.getMajorVersion() + ';')
+    constants = constants.replaceAll('(short VERSION_MINOR = ).*;', '$1' + version.getMinorVersion() + ';')
+    constants = constants.replaceAll('(short VERSION_PATCH = ).*;', '$1' + version.getPatchVersion() + ';')
+    constants = constants.replaceAll('(String VERSION_STRING = \").+(\";)', '$1' + versionString + '$2')
+    openemsConstantsFile.write(constants, 'UTF-8')
+}
+
+/*
+ * Build OpenEMS Edge and Backend Components
+ */
+task buildComponents(dependsOn: updateOpenemsConstants) {
+    subprojects.each { proj ->
+        if (proj.tasks.findAll { it.name == 'jar' }) {
+            dependsOn(proj.jar)
+        }
+    }
+}
+
+/*
+ * Build OpenEMS Edge fat-jar
+ */
+task buildEdge(dependsOn: buildComponents) {
+    dependsOn ":io.openems.edge.application:export.EdgeApp"
+    doLast {
+        copy {
+            from file("${project(":io.openems.edge.application").distsDir}/executable/EdgeApp.jar")
+            into file("${buildDir}")
+            rename ("EdgeApp.jar", "openems-edge.jar")
+        }
+    }
+}
+
+/*
+ * Build OpenEMS Backend fat-jar
+ */
+task buildBackend(dependsOn: buildComponents) {
+    dependsOn ":io.openems.backend.application:export.BackendApp"
+    doLast {
+        copy {
+            from file("${project(":io.openems.backend.application").distsDir}/executable/BackendApp.jar")
+            into file("${buildDir}")
+            rename ("BackendApp.jar", "openems-backend.jar")
+        }
+    }
+}
+
 /*
  * Javadoc
  */
@@ -17,12 +84,18 @@ task aggregatedJavadocs(type: Javadoc, description: 'Generate javadocs from all
 /*
  * Antora docs
  */
-task antora(type:Exec) {
-    commandLine 'docker', 'run', '--privileged', '-v', "$projectDir:/antora", '--rm', '-t', 'antora/antora', 'doc/build/site.yml'
+node {
+    nodeModulesDir = file("${projectDir}/doc/build")
+}
+
+task antora(type: NodeTask) {
+    dependsOn npmInstall
+    script = file("doc/build/node_modules/@antora/cli/bin/antora")
+    args = ["doc/build/site.yml"]
     doLast {
         copy {
             from "doc/build/.nojekyll", "doc/build/CNAME"
             into "${buildDir}/www"
         }
     }
-}
+}

cnf/checkstyle.xml

@@ -6,8 +6,7 @@
 -->
 <!--
     Checkstyle-Configuration: OpenEMS Checkstyle
-    Description: 
-Checkstyle configuration that checks the Google coding conventions from Google Java Style that can be found at https://google.github.io/styleguide/javaguide.html.
+    Description: none
 -->
 <module name="Checker">
   <property name="severity" value="warning"/>
@@ -103,6 +102,7 @@ Checkstyle configuration that checks the Google coding conventions from Google J
       <message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="MemberName">
+      <property name="format" value="^[a-z_][a-zA-Z0-9]*$"/>
       <message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="ParameterName">
@@ -182,13 +182,15 @@ Checkstyle configuration that checks the Google coding conventions from Google J
     <module name="SummaryJavadoc">
       <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
     </module>
-    <module name="JavadocParagraph"/>
+    <module name="JavadocParagraph">
+      <property name="allowNewlineParagraph" value="false"/>
+    </module>
     <module name="AtclauseOrder">
       <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
       <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
     </module>
     <module name="MethodName">
-      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+      <property name="format" value="^[a-z_][a-zA-Z0-9_]*$"/>
       <message key="name.invalidPattern" value="Method name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="SingleLineJavadoc">
@@ -202,6 +204,7 @@ Checkstyle configuration that checks the Google coding conventions from Google J
       <property name="allowMissingJavadoc" value="true"/>
       <property name="suppressLoadErrors" value="true"/>
     </module>
+    <module name="SuppressionCommentFilter"/>
   </module>
   <module name="FileTabCharacter">
     <property name="severity" value="ignore"/>

cnf/pom.xml

@@ -45,17 +45,32 @@
 		<dependency>
 			<groupId>com.squareup.moshi</groupId>
 			<artifactId>moshi</artifactId>
-			<version>1.8.0</version>
+			<version>1.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.11.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>logging-interceptor</artifactId>
+			<version>3.11.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.okio</groupId>
+			<artifactId>okio</artifactId>
+			<version>1.14.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.retrofit2</groupId>
 			<artifactId>retrofit</artifactId>
-			<version>2.5.0</version>
+			<version>2.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.retrofit2</groupId>
 			<artifactId>converter-moshi</artifactId>
-			<version>2.5.0</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!-- info.* -->
 		<dependency>
@@ -74,16 +89,6 @@
 			<artifactId>org.apache.felix.gogo.shell</artifactId>
 			<version>1.1.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.okhttp</artifactId>
-			<version>3.10.0_2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.okio</artifactId>
-			<version>1.13.0_1</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.servicemix.bundles</groupId>
 			<artifactId>org.apache.servicemix.bundles.ws-commons-util</artifactId>
@@ -107,7 +112,7 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20180813</version>
+			<version>20160212</version>
 		</dependency>
 		<dependency>
 			<groupId>org.java-websocket</groupId>

io.openems.edge.ess.sinexcel/.project → com.ed.openems.centurio/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>io.openems.edge.ess.sinexcel</name>
+	<name>com.ed.openems.centurio</name>
 	<comment></comment>
 	<projects>
 	</projects>

doc/.gitignore

@@ -0,0 +1 @@
+/build/