You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2019/05/29 15:02:19 UTC

[sling-org-apache-sling-fsresource] branch master updated: SLING-8036 Don't embed json handling

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git


The following commit(s) were added to refs/heads/master by this push:
     new 7489d99  SLING-8036 Don't embed json handling
7489d99 is described below

commit 7489d9985a6c12de7739066aa73793767efe23e4
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Wed May 29 17:02:00 2019 +0200

    SLING-8036 Don't embed json handling
---
 pom.xml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 91f42cb..02d804e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,13 +63,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <!-- Embed Apache Johnzon and fscontentparser -->
+                        <!-- Embed fscontentparser -->
                         <Embed-Dependency>
-                            johnzon-core;scope=compile;inline=false,
-                            geronimo-json_1.0_spec;scope=compile;inline=false,
                             org.apache.sling.jcr.contentparser;scope=compile;inline=false
                         </Embed-Dependency>
-                        <_plugin>java.lang.String</_plugin>
                     </instructions>
                 </configuration>
             </plugin>
@@ -122,16 +119,10 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.johnzon</groupId>
-            <artifactId>johnzon-core</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-json_1.0_spec</artifactId>
             <version>1.0-alpha-1</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -180,5 +171,11 @@
             <version>1.0.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.johnzon</groupId>
+            <artifactId>johnzon-core</artifactId>
+            <version>1.0.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>