Skip to content

Commit e0955cd

Browse files
nikagraclaude
nikagra
and
claude
committed
test: restore the OSGi bundle provisioning the merge broke
Two slips in BundleOptions. The shaded guava bundle kept the org.apache.cassandra groupId from scylladb#895, which versionAsInProject() cannot resolve through our dependencies.properties. The 4.19.3 merge resolved the lz4Bundle() conflict to our side and dropped upstream's CASSJAVA-122 sun.misc extension bundle, which lz4-java imports. Every Osgi*IT is @ignore'd and no lane runs them (scylladb#1293), so neither showed. Refs: DRIVER-1126 Co-Authored-By: Claude Fable 5.1 <[email protected]>
1 parent 65b85ee commit e0955cd

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

‎osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/BundleOptions.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class BundleOptions {
3434
public static CompositeOption commonBundles() {
3535
return () ->
3636
options(
37-
mavenBundle("org.apache.cassandra", "java-driver-guava-shaded")
37+
mavenBundle("com.scylladb", "java-driver-guava-shaded")
3838
.versionAsInProject()
3939
.startLevel(1),
4040
mavenBundle("io.dropwizard.metrics", "metrics-core").versionAsInProject().startLevel(1),
@@ -119,6 +119,9 @@ public static CompositeOption lz4Bundle() {
119119
return () ->
120120
options(
121121
mavenBundle("at.yawk.lz4", "lz4-java").versionAsInProject(),
122+
// at.yawk.lz4 requires sun.misc package
123+
mavenBundle("com.diffplug.osgi", "com.diffplug.osgi.extension.sun.misc")
124+
.version("0.0.0"),
122125
systemProperty("cassandra.compression").value("LZ4"));
123126
}
124127

0 commit comments

Comments
 (0)