You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/10/03 17:56:59 UTC
git commit: [KARAF-3256] Cleanup karaf.jar to avoid to embed osgi
packages
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x acc8299db -> 3c2105152
[KARAF-3256] Cleanup karaf.jar to avoid to embed osgi packages
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3c210515
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3c210515
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3c210515
Branch: refs/heads/karaf-3.0.x
Commit: 3c2105152935ceb4eae1eba199914b1912c840ce
Parents: acc8299
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Oct 3 17:56:25 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Oct 3 17:56:25 2014 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/karaf/itests/KarafTestSupport.java | 2 +-
main/pom.xml | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3c210515/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
index 7278aa9..e8d071c 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -296,7 +296,7 @@ public class KarafTestSupport {
}
private void waitForService(String filter, long timeout) throws InvalidSyntaxException, InterruptedException {
- ServiceTracker<Object, Object> st = new ServiceTracker<Object, Object>(bundleContext, bundleContext.createFilter(filter), null);
+ ServiceTracker st = new ServiceTracker(bundleContext, bundleContext.createFilter(filter), null);
try {
st.open();
st.waitForService(timeout);
http://git-wip-us.apache.org/repos/asf/karaf/blob/3c210515/main/pom.xml
----------------------------------------------------------------------
diff --git a/main/pom.xml b/main/pom.xml
index 021527b..ef732ab 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -93,9 +93,8 @@
</Export-Package>
<Private-Package>
org.apache.karaf.main*,
- org.apache.felix.*;-split-package:=merge-first,
- org.apache.karaf.util.*;-split-package:=merge-first,
- org.osgi.*;-split-package:=merge-first,
+ org.apache.felix.utils.properties;-split-package:=merge-first,
+ org.apache.karaf.util.locks;-split-package:=merge-first,
META-INF;-split-package:=merge-first
</Private-Package>
<Import-Package>!*</Import-Package>