eclipse-ditto/ditto#898: added ditto-placeholders to assembly.xml as …

…it is now a transitive dependency of ditto-protocol * enhanced RunOSGiContainerIntegrationTest to test loading a "ditto-placeholders" class * update logback to 1.2.6 Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Sep 15, 2021 · 4e5e683 · 4e5e683
1 parent 6bd223e
commit 4e5e683
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -200,7 +200,7 @@
         <jsr305.version>3.0.2</jsr305.version>
 
         <!-- ### Testing dependencies versions -->
-        <logback.version>1.2.3</logback.version>
+        <logback.version>1.2.6</logback.version>
         <junit.version>4.13.1</junit.version>
         <assertj.version>3.19.0</assertj.version>
         <mutability-detector.version>0.10.4</mutability-detector.version>

diff --git a/java/src/main/assembly/assembly.xml b/java/src/main/assembly/assembly.xml
@@ -41,6 +41,7 @@
                 <include>org.eclipse.ditto:ditto-thingsearch-model</include>
                 <include>org.eclipse.ditto:ditto-messages-model</include>
                 <include>org.eclipse.ditto:ditto-connectivity-model</include> <!-- needed as ditto-protocol imports that -->
+                <include>org.eclipse.ditto:ditto-placeholders</include> <!-- needed as ditto-protocol imports that -->
                 <include>org.eclipse.ditto:ditto-protocol</include>
                 <include>org.eclipse.ditto:ditto-client</include>
             </includes>

diff --git a/java/src/test/java/org/eclipse/ditto/client/RunOSGiContainerIntegrationTest.java b/java/src/test/java/org/eclipse/ditto/client/RunOSGiContainerIntegrationTest.java
@@ -72,6 +72,7 @@
 import org.eclipse.ditto.messages.model.MessagesModelFactory;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommand;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
+import org.eclipse.ditto.placeholders.PlaceholderFactory;
 import org.eclipse.ditto.policies.model.PoliciesModelFactory;
 import org.eclipse.ditto.policies.model.signals.announcements.PolicyAnnouncement;
 import org.eclipse.ditto.protocol.Adaptable;
@@ -131,8 +132,8 @@ public Option[] configure() throws IOException {
         final List<Option> allOptions = new ArrayList<>();
         allOptions.add(cleanCaches());
         allOptions.addAll(bundleOptions);
-        allOptions.add(mavenBundle("ch.qos.logback", "logback-core", "1.2.3"));
-        allOptions.add(mavenBundle("ch.qos.logback", "logback-classic", "1.2.3"));
+        allOptions.add(mavenBundle("ch.qos.logback", "logback-core", "1.2.6"));
+        allOptions.add(mavenBundle("ch.qos.logback", "logback-classic", "1.2.6"));
         allOptions.add(junitBundles());
         allOptions.add(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"));
 
@@ -260,6 +261,11 @@ public void shouldBeAbleToResolveBundlesOfUsedDependencies() {
         checkBundleIsPresentInstalledAndActive(FrameworkUtil.getBundle(ConnectivityAnnouncement.class));
         checkBundleIsPresentInstalledAndActive(FrameworkUtil.getBundle(ConnectionClosedAnnouncement.class));
 
+        // ditto-placeholders:
+        LOG.info("Ensuring ditto-placeholders is usable from OSGi..");
+        checkBundleIsPresentInstalledAndActive(FrameworkUtil.getBundle(PlaceholderFactory.class));
+        instantiateClassWithNoArgStaticMethod(PlaceholderFactory.class, "newHeadersPlaceholder");
+
         // ditto-protocol:
         LOG.info("Ensuring ditto-protocol is usable from OSGi..");
         checkBundleIsPresentInstalledAndActive(FrameworkUtil.getBundle(Adaptable.class));