You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/07/09 17:02:04 UTC
[1/3] git commit: [KARAF-3096] Karaf doesn't start with Equinox 3.9.1
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x d4e6a47cf -> 19b909e38
[KARAF-3096] Karaf doesn't start with Equinox 3.9.1
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f335477c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f335477c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f335477c
Branch: refs/heads/karaf-3.0.x
Commit: f335477cc3fcd47d1c508d1d1d2f2bc45111ec7b
Parents: d4e6a47
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Jul 9 16:13:26 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Jul 9 16:13:26 2014 +0200
----------------------------------------------------------------------
.../main/filtered-resources/resources/etc/config.properties | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f335477c/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
index 4452247..c51277a 100644
--- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
@@ -124,11 +124,7 @@ org.osgi.framework.system.capabilities= \
${eecap-${java.specification.version}}, \
service-reference;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin, \
service-reference;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \
- service-reference;effective:=active;objectClass=org.osgi.service.url.URLHandlers, \
- ${services-${karaf.framework}}
-
-services-felix= \
- service-reference;effective:=active;objectClass=org.apache.felix.framework.monitor.MonitoringService
+ service-reference;effective:=active;objectClass=org.osgi.service.url.URLHandlers
eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7"
[2/3] git commit: [KARAF-2861] Upgrade to ASM 5.0.3
Posted by gn...@apache.org.
[KARAF-2861] Upgrade to ASM 5.0.3
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c41cdb0e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c41cdb0e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c41cdb0e
Branch: refs/heads/karaf-3.0.x
Commit: c41cdb0e97c973981086c96be3aec46ecaf3c8fd
Parents: f335477
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Jul 9 17:00:43 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Jul 9 17:00:43 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c41cdb0e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e508ee8..9dfdc4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
<aspectj.bundle.version>1.7.4_1</aspectj.bundle.version>
<ant.bundle.version>1.8.2_2</ant.bundle.version>
<antlr.bundle.version>2.7.7_5</antlr.bundle.version>
- <asm.version>4.1</asm.version>
+ <asm.version>5.0.3</asm.version>
<asm.springsource.version>1.5.3</asm.springsource.version>
<cglib.bundle.version>3.0_1</cglib.bundle.version>
<cglib2.version>2.2.0</cglib2.version>
[3/3] git commit: [KARAF-2602] Support JDK8
Posted by gn...@apache.org.
[KARAF-2602] Support JDK8
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/19b909e3
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/19b909e3
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/19b909e3
Branch: refs/heads/karaf-3.0.x
Commit: 19b909e3883d165ef3ff0dbb678549b56bccafab
Parents: c41cdb0
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Jul 9 17:01:39 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Jul 9 17:01:39 2014 +0200
----------------------------------------------------------------------
.../src/main/filtered-resources/resources/etc/config.properties | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/19b909e3/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
index c51277a..afc7c3d 100644
--- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
@@ -126,6 +126,8 @@ org.osgi.framework.system.capabilities= \
service-reference;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \
service-reference;effective:=active;objectClass=org.osgi.service.url.URLHandlers
+eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7"
eecap-1.6= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \