Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master c739afcda -> 257ec8eab
TAMAYA-294: Update to Johnson 1.1.4 Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/257ec8ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/257ec8ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/257ec8ea Branch: refs/heads/master Commit: 257ec8eab304f4d787205c482e23f6dd7f912bcd Parents: c739afc Author: Phil Ottlinger <[email protected]> Authored: Sat Oct 21 22:46:49 2017 +0200 Committer: Phil Ottlinger <[email protected]> Committed: Sat Oct 21 22:47:04 2017 +0200 ---------------------------------------------------------------------- modules/formats/json/pom.xml | 3 +-- .../json/src/main/java/org/apache/tamaya/json/JSONFormat.java | 2 +- pom.xml | 7 +++---- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/257ec8ea/modules/formats/json/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml index 5f807c5..1bf8345 100644 --- a/modules/formats/json/pom.xml +++ b/modules/formats/json/pom.xml @@ -56,7 +56,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-json_1.0_spec</artifactId> + <artifactId>geronimo-json_1.1_spec</artifactId> </dependency> <dependency> <groupId>org.apache.johnzon</groupId> @@ -130,5 +130,4 @@ under the License. </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/257ec8ea/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java ---------------------------------------------------------------------- diff --git a/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java b/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java index 2b35d5a..1fc239c 100644 --- a/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java +++ b/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java @@ -37,7 +37,7 @@ import javax.json.JsonReaderFactory; /** * Implementation of the {@link org.apache.tamaya.format.ConfigurationFormat} - * able to read configuration properties represented in JSON + * able to read configuration properties with comments represented in JSON * * @see <a href="http://www.json.org";>JSON format specification</a> */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/257ec8ea/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0b7497d..382a487 100644 --- a/pom.xml +++ b/pom.xml @@ -57,9 +57,8 @@ under the License. <maven.javadoc.skip>false</maven.javadoc.skip> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <json.spec.version>1.0-alpha-1</json.spec.version> - <!--johnzon.version>1.1.4</johnzon.version--> - <johnzon.version>0.9-incubating</johnzon.version> + <json.spec.version>1.0</json.spec.version> + <johnzon.version>1.1.4</johnzon.version> <junit.version>4.12</junit.version> <assertj.version>3.8.0</assertj.version> @@ -274,7 +273,7 @@ under the License. <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-json_1.0_spec</artifactId> + <artifactId>geronimo-json_1.1_spec</artifactId> <version>${json.spec.version}</version> </dependency>
