Revert "Use Apache Johnzon for JSON parsing (instead of glassfish RI)"
This reverts commit 9a68a08063ffa3f01d00ebf35244ef59b342d0a9. Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/b439fc3e Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/b439fc3e Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/b439fc3e Branch: refs/heads/master Commit: b439fc3ea827c337e6251bd41aebfdf8596d8928 Parents: 3a6ef47 Author: anierbeck <[email protected]> Authored: Sat Apr 11 00:43:35 2015 +0200 Committer: anierbeck <[email protected]> Committed: Sat Apr 11 00:43:35 2015 +0200 ---------------------------------------------------------------------- appender/elasticsearch/pom.xml | 6 +++--- assembly/src/main/feature/feature.xml | 2 +- pom.xml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/b439fc3e/appender/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/appender/elasticsearch/pom.xml b/appender/elasticsearch/pom.xml index ca284a9..e14da93 100644 --- a/appender/elasticsearch/pom.xml +++ b/appender/elasticsearch/pom.xml @@ -48,8 +48,8 @@ <!-- JSON builder --> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-json_1.0_spec</artifactId> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> </dependency> <!-- SLF4J --> <dependency> @@ -122,4 +122,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/b439fc3e/assembly/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml index e41aa2c..1cc46b0 100644 --- a/assembly/src/main/feature/feature.xml +++ b/assembly/src/main/feature/feature.xml @@ -45,7 +45,7 @@ <feature name="decanter-appender-elasticsearch" version="${project.version}" description="Karaf Decanter Elasticsearch Appender"> <feature version="${project.version}">decanter-common</feature> - <bundle>mvn:org.apache.johnzon/javax.json/${johnzon-json.version}</bundle> + <bundle>mvn:org.glassfish/javax.json/${glassfish-json.version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch.bundle.version}</bundle> <bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch/${project.version}</bundle> <configfile finalname="/etc/org.apache.karaf.decanter.appender.elasticsearch.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch/${project.version}/cfg</configfile> http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/b439fc3e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a1695c9..f2bd785 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ <karaf.version>3.0.2</karaf.version> <kibana.version>3.1.1</kibana.version> <slf4j.version>1.7.7</slf4j.version> - <json-api.version>1.0-alpha-1</json-api.version> - <johnzon-json.version>0.7-incubating</johnzon-json.version> + <json-api.version>1.0</json-api.version> + <glassfish-json.version>1.0.4</glassfish-json.version> </properties> <modules> @@ -246,9 +246,9 @@ </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-json_1.0_spec</artifactId> - <version>${json-api.version}</version> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + <version>${json-api.version}</version> </dependency> </dependencies> </dependencyManagement>
