You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/07/27 07:04:19 UTC
[sling-org-apache-sling-installer-it] branch master updated: Update
it tests to use latest R7 config admin, scr and metatype
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 96bd12b Update it tests to use latest R7 config admin, scr and metatype
96bd12b is described below
commit 96bd12b9b434849db8fc2e7e135d884c3b72a3a4
Author: Carsten Ziegeler <cz...@adobe.com>
AuthorDate: Fri Jul 27 09:04:14 2018 +0200
Update it tests to use latest R7 config admin, scr and metatype
---
pom.xml | 2 +-
.../apache/sling/installer/it/OsgiInstallerTestBase.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 226c88d..81b4ef0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,7 +465,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
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 a4fcf34..6fd293c 100644
--- a/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
+++ b/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
@@ -119,7 +119,7 @@ public class OsgiInstallerTestBase implements FrameworkListener {
@Before
public void setup() {
- configAdminTracker = new ServiceTracker<ConfigurationAdmin, ConfigurationAdmin>(bundleContext, ConfigurationAdmin.class, null);
+ configAdminTracker = new ServiceTracker<>(bundleContext, ConfigurationAdmin.class, null);
configAdminTracker.open();
}
@@ -418,7 +418,7 @@ public class OsgiInstallerTestBase implements FrameworkListener {
final InstallableResource result = new MockInstallableResource(id, new FileInputStream(testBundle), digest, null, priority);
return new InstallableResource[] {result};
}
-
+
protected InstallableResource[] getInstallableResource(String configPid, Dictionary<String, Object> data) {
return getInstallableResource(configPid, copy(data), InstallableResource.DEFAULT_PRIORITY);
}
@@ -429,7 +429,7 @@ public class OsgiInstallerTestBase implements FrameworkListener {
}
protected Dictionary<String, Object> copy(Dictionary<String, Object> data) {
- final Dictionary<String, Object> copy = new Hashtable<String, Object>();
+ final Dictionary<String, Object> copy = new Hashtable<>();
final Enumeration<String> keys = data.keys();
while(keys.hasMoreElements()) {
final String key = keys.nextElement();
@@ -504,9 +504,9 @@ public class OsgiInstallerTestBase implements FrameworkListener {
mavenBundle("org.slf4j", "jcl-over-slf4j", "1.7.5"),
mavenBundle("org.slf4j", "log4j-over-slf4j", "1.7.5"),
- mavenBundle("org.apache.felix", "org.apache.felix.scr", "2.0.6"),
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.8.12"),
- mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.1.2"),
+ mavenBundle("org.apache.felix", "org.apache.felix.scr", "2.1.0"),
+ mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.9.2"),
+ mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.2.0"),
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)
)
@@ -610,7 +610,7 @@ public class OsgiInstallerTestBase implements FrameworkListener {
private final class BundleEventListener implements SynchronousBundleListener {
- private final List<BundleEvent> events = new ArrayList<BundleEvent>();
+ private final List<BundleEvent> events = new ArrayList<>();
@Override
public void bundleChanged(org.osgi.framework.BundleEvent event) {