Revert "Add OSGi import instruction to on all packages (#29)"

Not sure why this fails on travis but runs locally. I'll have to retry piecemeal... This reverts commit 98a7282.
ben-manes · Sep 26, 2015 · 3e2526d · 3e2526d
1 parent 704b1b7
commit 3e2526d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: java
-sudo: true
+sudo: false
 
 jdk:
   - oraclejdk8

diff --git a/guava/build.gradle b/guava/build.gradle
@@ -14,12 +14,6 @@ dependencies {
 }
 
 bundle {
-  instruction 'Import-Package', [
-    'com.github.benmanes.caffeine',
-    'com.github.benmanes.caffeine.base',
-    'com.github.benmanes.caffeine.cache',
-    'com.github.benmanes.caffeine.cache.stats',
-  ].join(';')
   instruction 'Export-Package', 'com.github.benmanes.caffeine.guava.*'
 }
 

diff --git a/jcache/build.gradle b/jcache/build.gradle
@@ -25,12 +25,6 @@ dependencies {
 }
 
 bundle {
-  instruction 'Import-Package', [
-    'com.github.benmanes.caffeine',
-    'com.github.benmanes.caffeine.base',
-    'com.github.benmanes.caffeine.cache',
-    'com.github.benmanes.caffeine.cache.stats',
-  ].join(';')
   instruction 'Export-Package', 'com.github.benmanes.caffeine.jcache.*'
 }
 

diff --git a/simulator/build.gradle b/simulator/build.gradle
@@ -28,10 +28,6 @@ test {
 }
 
 bundle {
-  instruction 'Import-Package', [
-    'com.github.benmanes.caffeine.cache.tracing',
-    'com.github.benmanes.caffeine.cache.tracing.async',
-  ].join(';')
   instruction 'Export-Package', [
     'com.github.benmanes.caffeine.simulator',
     'com.github.benmanes.caffeine.simulator.admission',

diff --git a/tracing/async/build.gradle b/tracing/async/build.gradle
@@ -14,6 +14,5 @@ test {
 }
 
 bundle {
-  instruction 'Import-Package', 'com.github.benmanes.caffeine.cache.tracing'
   instruction 'Export-Package', 'com.github.benmanes.caffeine.cache.tracing.async.*'
 }