Merge pull request #130 from support-project/develop

Edit Release v0.6.0
support-project · Oct 30, 2015 · 42ad384 · 42ad384
2 parents 8abef90 + 82deca7
commit 42ad384
Show file tree

Hide file tree

Showing 4 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-SNAPSHOT</version>
+	<version>0.6.0</version>
 	<name>webapp for knowledge</name>
 	<url>https://support-project.org/</url>
 
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>org.support-project</groupId>
 			<artifactId>web</artifactId>
-			<version>0.6.0-SNAPSHOT</version>
+			<version>0.6.0</version>
 		</dependency>
 
 		<dependency>

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 pre3
+label.version=0.6.0
 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 pre3
+label.version=0.6.0
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ

diff --git a/src/test/java/org/support/project/knowledge/logic/MarkdownLogicTest.java b/src/test/java/org/support/project/knowledge/logic/MarkdownLogicTest.java
@@ -76,7 +76,7 @@ private String[] read(String str) throws IOException {
 	public void test1() throws Exception {
 		String markdown = FileUtil.read(getClass().getResourceAsStream("markdown/markdown-1.md"));
 		String html = FileUtil.read(getClass().getResourceAsStream("markdown/result-1.txt"));
-		String result = MarkdownLogic.get().markdownToHtml(markdown).getHtml();
+		String result = MarkdownLogic.get().markdownToHtml(markdown, MarkdownLogic.ENGINE_PEGDOWN).getHtml();
 		try {
 			org.junit.Assert.assertArrayEquals(read(html), read(result));
 		} catch (AssertionError e) {
@@ -94,7 +94,7 @@ public void test1() throws Exception {
 	public void test2() throws UnsupportedEncodingException, IOException, ParseException, TransformerFactoryConfigurationError, TransformerException {
 		String markdown = FileUtil.read(getClass().getResourceAsStream("markdown/markdown-2.md"));
 		String html = FileUtil.read(getClass().getResourceAsStream("markdown/result-2.txt"));
-		String result = MarkdownLogic.get().markdownToHtml(markdown).getHtml();
+		String result = MarkdownLogic.get().markdownToHtml(markdown, MarkdownLogic.ENGINE_PEGDOWN).getHtml();
 		try {
 			org.junit.Assert.assertArrayEquals(read(html), read(result));
 		} catch (AssertionError e) {
@@ -112,7 +112,7 @@ public void test2() throws UnsupportedEncodingException, IOException, ParseExcep
 	public void test3() throws ParseException, UnsupportedEncodingException, IOException, TransformerFactoryConfigurationError, TransformerException {
 		String markdown = FileUtil.read(getClass().getResourceAsStream("markdown/markdown-3.md"));
 		String html = FileUtil.read(getClass().getResourceAsStream("markdown/result-3.txt"));
-		String result = MarkdownLogic.get().markdownToHtml(markdown).getHtml();
+		String result = MarkdownLogic.get().markdownToHtml(markdown, MarkdownLogic.ENGINE_PEGDOWN).getHtml();
 		try {
 			org.junit.Assert.assertArrayEquals(read(html), read(result));
 		} catch (AssertionError e) {
@@ -130,7 +130,7 @@ public void test3() throws ParseException, UnsupportedEncodingException, IOExcep
 	public void test4() throws ParseException, UnsupportedEncodingException, IOException, TransformerFactoryConfigurationError, TransformerException {
 		String markdown = FileUtil.read(getClass().getResourceAsStream("markdown/markdown-4.md"));
 		String html = FileUtil.read(getClass().getResourceAsStream("markdown/result-4.txt"));
-		String result = MarkdownLogic.get().markdownToHtml(markdown).getHtml();
+		String result = MarkdownLogic.get().markdownToHtml(markdown, MarkdownLogic.ENGINE_PEGDOWN).getHtml();
 		try {
 			org.junit.Assert.assertArrayEquals(read(html), read(result));
 		} catch (AssertionError e) {
@@ -148,7 +148,7 @@ public void test4() throws ParseException, UnsupportedEncodingException, IOExcep
 	public void test5() throws ParseException, UnsupportedEncodingException, IOException, TransformerFactoryConfigurationError, TransformerException {
 		String markdown = FileUtil.read(getClass().getResourceAsStream("markdown/markdown-5.md"));
 		String html = FileUtil.read(getClass().getResourceAsStream("markdown/result-5.txt"));
-		String result = MarkdownLogic.get().markdownToHtml(markdown).getHtml();
+		String result = MarkdownLogic.get().markdownToHtml(markdown, MarkdownLogic.ENGINE_PEGDOWN).getHtml();
 		try {
 			org.junit.Assert.assertArrayEquals(read(html), read(result));
 		} catch (AssertionError e) {