Renamed JSON module to Jackson and added Jackson-based YAML support.

rapidoid · Jul 30, 2015 · cfa5a20 · cfa5a20
1 parent 746352a
commit cfa5a20
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -101,7 +101,7 @@
 		<module>rapidoid-sql</module>
 		<module>rapidoid-rql</module>
 		<module>rapidoid-wire</module>
-		<module>rapidoid-json</module>
+		<module>rapidoid-jackson</module>
 		<module>rapidoid-security</module>
 		<module>rapidoid-activity</module>
 		<module>rapidoid-test-commons</module>

diff --git a/rapidoid-html/pom.xml b/rapidoid-html/pom.xml
@@ -19,7 +19,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.rapidoid</groupId>
-			<artifactId>rapidoid-json</artifactId>
+			<artifactId>rapidoid-jackson</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

diff --git a/rapidoid-json/pom.xml → rapidoid-jackson/pom.xml b/rapidoid-json/pom.xml → rapidoid-jackson/pom.xml
@@ -7,20 +7,25 @@
 		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>rapidoid-json</artifactId>
+	<artifactId>rapidoid-jackson</artifactId>
 	<packaging>jar</packaging>
 	<description>Rapidoid JSON</description>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.6.0-rc2</version>
+			<version>2.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-afterburner</artifactId>
-			<version>2.6.0-rc2</version>
+			<version>2.6.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>2.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.rapidoid</groupId>

diff --git a/...src/main/java/org/rapidoid/json/JSON.java → ...src/main/java/org/rapidoid/json/JSON.java b/...src/main/java/org/rapidoid/json/JSON.java → ...src/main/java/org/rapidoid/json/JSON.java
diff --git a/...test/java/org/rapidoid/json/JSONTest.java → ...test/java/org/rapidoid/json/JSONTest.java b/...test/java/org/rapidoid/json/JSONTest.java → ...test/java/org/rapidoid/json/JSONTest.java
diff --git a/...c/test/java/org/rapidoid/json/Person.java → ...c/test/java/org/rapidoid/json/Person.java b/...c/test/java/org/rapidoid/json/Person.java → ...c/test/java/org/rapidoid/json/Person.java
diff --git a/rapidoid-net/pom.xml b/rapidoid-net/pom.xml
@@ -29,7 +29,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.rapidoid</groupId>
-			<artifactId>rapidoid-json</artifactId>
+			<artifactId>rapidoid-jackson</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

diff --git a/rapidoid-x-db-inmem/pom.xml b/rapidoid-x-db-inmem/pom.xml
@@ -29,7 +29,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.rapidoid</groupId>
-			<artifactId>rapidoid-json</artifactId>
+			<artifactId>rapidoid-jackson</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>