Merge pull request #133 from support-project/release/v0.6

Release/v0.6
support-project · Nov 2, 2015 · f668f3c · f668f3c
2 parents 42ad384 + cf48364
commit f668f3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.support-project</groupId>
 	<artifactId>knowledge</artifactId>
 	<packaging>war</packaging>
-	<version>0.6.0</version>
+	<version>0.6.1</version>
 	<name>webapp for knowledge</name>
 	<url>https://support-project.org/</url>
 
@@ -19,6 +19,12 @@
 			<version>0.6.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.support-project</groupId>
+			<artifactId>markedj</artifactId>
+			<version>1.0.4</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -117,12 +123,6 @@
 			<version>4.3.1</version>
 		</dependency>
 
-		<dependency>
-			<groupId>io.github.gitbucket</groupId>
-			<artifactId>markedj</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
-		</dependency>
-
 	</dependencies>
 
 	<repositories>

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
@@ -53,7 +53,7 @@ message.allready.updated=Allready updated.
 message.allready.started=Allready started.
 
 # Common Label
-label.version=0.6.0
+label.version=0.6.1
 label.login=Sign in
 label.previous = Previous
 label.next=Next

diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
@@ -53,7 +53,7 @@ message.allready.updated=すでに更新されています
 message.allready.started=すでに開始済です
 
 # Common Label
-label.version=0.6.0
+label.version=0.6.1
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ