Skip to content

Commit e6a3190

Browse files
committed
minor changes in Manifest and OSGiTest base.
- org.hamcrest.core does not need to be a split package anymore, tycho seems to be able to build this now without any workaround - made return of getService() method more groovy'isch
1 parent ff75e23 commit e6a3190

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

com.github.groovyosgi.testing.pizzaservice.test/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Import-Package: groovy.lang,
1212
org.codehaus.groovy.runtime,
1313
org.codehaus.groovy.runtime.callsite,
1414
org.codehaus.groovy.runtime.typehandling,
15-
org.hamcrest;core=split,
15+
org.hamcrest.core,
1616
org.junit;version="4.0.0",
1717
org.junit.matchers;version="4.0.0",
1818
org.junit.runner;version="4.0.0"

com.github.groovyosgi.testing.pizzaservice.test/src/main/groovy/com/github/groovyosgi/testing/OSGiTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ abstract class OSGiTest {
2424
def <T> T getService(Class<T> clazz){
2525
def serviceReference = bundleContext.getServiceReference(clazz.name)
2626
assertThat serviceReference, is(notNullValue())
27-
return bundleContext.getService(serviceReference)
27+
bundleContext.getService(serviceReference)
2828
}
2929

3030
def registerMock(def mock, Hashtable properties = [:]) {

0 commit comments

Comments
 (0)