Push version to 2018.7.0 "Edge-OSGI Pre-Release"

OpenEMS · May 24, 2018 · b259a77 · b259a77
1 parent 7978035
commit b259a77
Show file tree

Hide file tree

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

diff --git a/io.openems.edge.application/src/io/openems/edge/application/EdgeApp.java b/io.openems.edge.application/src/io/openems/edge/application/EdgeApp.java
@@ -19,8 +19,8 @@ public class EdgeApp {
 
 	private final Logger log = LoggerFactory.getLogger(EdgeApp.class);
 
-	// public final static String OPENEMS_VERSION = "2018.6.0";
-	public final static String OPENEMS_VERSION = "2018.0.0-OSGI-SNAPSHOT";
+	public final static String OPENEMS_VERSION = "2018.7.0";
+	// public final static String OPENEMS_VERSION = "2018.8.0-SNAPSHOT";
 
 	@Reference
 	ConfigurationAdmin cm;

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openems-ui",
-  "version": "2018.4.0-SNAPSHOT",
+  "version": "2018.7.0",
   "license": "AGPL",
   "scripts": {
     "ng": "ng",

diff --git a/ui/pom.xml b/ui/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>io.openems</groupId>
 		<artifactId>pom</artifactId>
-		<version>2018.4.0-SNAPSHOT</version>
+		<version>2018.7.0</version>
 	</parent>
 	<artifactId>edge</artifactId>
 	<packaging>pom</packaging>

diff --git a/ui/src/app/about/about.component.html b/ui/src/app/about/about.component.html
@@ -16,14 +16,14 @@
       <li>
         <a target="_blank" href="https://github.com/OpenEMS/openems" translate>About.Sourcecode</a>
       </li>
-      <!-- <li>
-        <a target="_blank" href="https://github.com/OpenEMS/openems/releases/tag/2018.3.1">
-          <span translate>About.Build</span>: 2018.3.1 (2018-03-16)</a>
-      </li> -->
       <li>
-        <a target="_blank" href="https://github.com/OpenEMS/openems/tree/develop">
-          <span translate>About.Build</span>: 2018.4.0-SNAPSHOT</a>
+        <a target="_blank" href="https://github.com/OpenEMS/openems/releases/tag/2018.7.0">
+          <span translate>About.Build</span>: 2018.7.0 (2018-05-24)</a>
       </li>
+      <!-- <li>
+        <a target="_blank" href="https://github.com/OpenEMS/openems/tree/develop">
+          <span translate>About.Build</span>: 2018.8.0-SNAPSHOT</a>
+      </li> -->
     </ul>
     <p>
       <span [innerHTML]="'About.Contact' | translate:{value: '[email protected]'}"></span>