You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/09/23 10:52:11 UTC
karaf git commit: [KARAF-4007] Use official spec bundle for jdbc
Repository: karaf
Updated Branches:
refs/heads/master edd063b37 -> 96782df45
[KARAF-4007] Use official spec bundle for jdbc
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/96782df4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/96782df4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/96782df4
Branch: refs/heads/master
Commit: 96782df454e81c6e26ed024b2b6629adc0268b78
Parents: edd063b
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Sep 23 10:31:35 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Sep 23 10:31:35 2015 +0200
----------------------------------------------------------------------
assemblies/features/enterprise/src/main/feature/feature.xml | 1 +
jdbc/pom.xml | 7 ++-----
pom.xml | 6 ++++++
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/96782df4/assemblies/features/enterprise/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index 2119563..2fb9aa2 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -262,6 +262,7 @@
<feature name="jdbc" description="JDBC service and commands" version="${project.version}">
<details>JDBC support providing service, commands, and MBean.</details>
+ <bundle>mvn:org.osgi/org.osgi.service.jdbc/${org.osgi.service.jdbc.version}</bundle>
<bundle>mvn:org.apache.karaf.jdbc/org.apache.karaf.jdbc.core/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/96782df4/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index b8adcf1..3ce532a 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -46,9 +46,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>5.0.0</version>
- <scope>provided</scope>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -88,8 +86,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.karaf.jdbc,
- org.osgi.service.jdbc
+ org.apache.karaf.jdbc
</Export-Package>
<Private-Package>
org.apache.karaf.jdbc.command,
http://git-wip-us.apache.org/repos/asf/karaf/blob/96782df4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8c6f114..03b63bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,6 +243,7 @@
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>
<maven.version>2.0.9</maven.version>
+ <org.osgi.service.jdbc.version>1.0.0</org.osgi.service.jdbc.version>
<osgi.version>6.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<org.json.version>20140107</org.json.version>
@@ -876,6 +877,11 @@
<version>${osgi.compendium.version}</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jdbc</artifactId>
+ <version>${org.osgi.service.jdbc.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>${felix.configadmin.version}</version>