Merge branch 'release/2018.1'

OpenEMS · Feb 15, 2018 · 6e44777 · 6e44777
2 parents 14790ff + ecb3d1c
commit 6e44777
Show file tree

Hide file tree

Showing 218 changed files with 11,609 additions and 6,671 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -5,7 +5,7 @@
 	<url>http://openems.io</url>
 	<groupId>io.openems</groupId>
 	<artifactId>edge</artifactId>
-	<version>1.7.1</version>
+	<version>2018.1</version>
 	<packaging>jar</packaging>
 	<scm>
 		<url>https://github.com/OpenEMS/openems</url>

diff --git a/common/.classpath b/common/.classpath
@@ -10,18 +10,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry excluding="main/java/|test/java/" kind="src" path="src"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
 	<url>http://openems.io</url>
 	<groupId>io.openems</groupId>
 	<artifactId>common</artifactId>
-	<version>1.7.1</version>
+	<version>2018.</version>
 	<packaging>jar</packaging>
 	<scm>
 		<url>https://github.com/OpenEMS/openems</url>

diff --git a/common/src/io/openems/common/types/ChannelEnum.java b/common/src/io/openems/common/types/ChannelEnum.java
@@ -0,0 +1,9 @@
+package io.openems.common.types;
+
+import java.util.Locale;
+
+public interface ChannelEnum {
+	int getValue();
+
+	String getName(Locale locale);
+}