[sling-org-apache-sling-installer-it] branch master updated: SLING-9362 : Use Apache Felix cm.json for JSON handling

[cziegeler]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new fb16b5a  SLING-9362 : Use Apache Felix cm.json for JSON handling
fb16b5a is described below

commit fb16b5ae33db1604ccf61613620ad47fd466554e
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Apr 22 13:42:28 2020 +0200

    SLING-9362 : Use Apache Felix cm.json for JSON handling
---
 pom.xml                                                       |  2 +-
 .../org/apache/sling/installer/it/OsgiInstallerTestBase.java  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index ee29c64..2e033b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>org.apache.sling.installer.it</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Apache Sling Installer Integration Tests</name>
diff --git 
a/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java 
b/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
index 43e509c..f71d4b2 100644
--- a/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
+++ b/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
@@ -390,7 +390,7 @@ public class OsgiInstallerTestBase implements 
FrameworkListener {
         }
         return b;
     }
-    
+
     protected Bundle findBundleInVersion(String symbolicName, String version) {
         for(Bundle b : bundleContext.getBundles()) {
             if (symbolicName.equals(b.getSymbolicName()) &&  
b.getHeaders().get(Constants.BUNDLE_VERSION).equals(version)) {
@@ -399,7 +399,7 @@ public class OsgiInstallerTestBase implements 
FrameworkListener {
         }
         return null;
     }
-    
+
     protected Bundle assertBundleInVersion(String info, String symbolicName, 
String version, int state) {
         final Bundle b = findBundleInVersion(symbolicName, version);
         if(info == null) {
@@ -533,11 +533,12 @@ public class OsgiInstallerTestBase implements 
FrameworkListener {
                         mavenBundle("org.osgi", "org.osgi.util.function", 
"1.0.0"),
                         mavenBundle("org.osgi", "org.osgi.util.promise", 
"1.0.0"),
 
-                        mavenBundle("org.apache.felix", 
"org.apache.felix.scr", "2.1.16"),
+                        mavenBundle("org.apache.felix", 
"org.apache.felix.scr", "2.1.20"),
                         mavenBundle("org.apache.felix", 
"org.apache.felix.configadmin", "1.9.16"),
                         mavenBundle("org.apache.felix", 
"org.apache.felix.metatype", "1.2.2"),
-                        mavenBundle("org.apache.felix", 
"org.apache.felix.converter", "1.0.10"),
-                        mavenBundle("org.apache.sling", 
"org.apache.sling.commons.johnzon", "1.1.2"),
+                        mavenBundle("org.apache.felix", 
"org.apache.felix.converter", "1.0.14"),
+                        mavenBundle("org.apache.felix", 
"org.apache.felix.cm.json", "1.0.3-SNAPSHOT"),
+                        mavenBundle("org.apache.sling", 
"org.apache.sling.commons.johnzon", "1.2.1-SNAPSHOT"),
 
                         mavenBundle("org.apache.sling", 
"org.apache.sling.installer.core", POM_VERSION).startLevel(5),
                         mavenBundle("org.apache.sling", 
"org.apache.sling.installer.factory.configuration", 
CONFIG_VERSION).startLevel(5)