[RELEASE]squashing 'release/1.2' into 'master'

0xERR0R · Aug 18, 2017 · d716b8a · d716b8a
1 parent 8cc07a5
commit d716b8a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>backend</artifactId>
 	<packaging>war</packaging>
@@ -10,7 +9,7 @@
 	<parent>
 		<groupId>jmstool</groupId>
 		<artifactId>jmstool2</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>1.2</version>
 	</parent>
 	<properties>
 		<mockrunner-version>1.0.4</mockrunner-version>

diff --git a/frontend/pom.xml b/frontend/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>jmstool</groupId>
 		<artifactId>jmstool2</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>1.2</version>
 	</parent>
 	<build>
 		<plugins>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>jmstool</groupId>
 	<artifactId>jmstool2</artifactId>
-	<version>1.2-SNAPSHOT</version>
+	<version>1.2</version>
 	<packaging>pom</packaging>
 
 	<name>jmstool2</name>