Updated Branches: refs/heads/master 846d6e59b -> 8714ee28d
[KARAF-2658] Include Pax CDI 0.6.0 repository in Karaf enterprise features Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8714ee28 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8714ee28 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8714ee28 Branch: refs/heads/master Commit: 8714ee28dd01b57ceeaa7f5c8cb7f8bca224df62 Parents: 846d6e5 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Dec 26 13:39:56 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Dec 26 13:39:56 2013 +0100 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/feature/feature.xml | 2 ++ .../resources/resources/etc/org.apache.karaf.features.repos.cfg | 1 - assemblies/features/standard/src/main/feature/feature.xml | 4 ++-- pom.xml | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/8714ee28/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 cf272bc..bcfa138 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -22,6 +22,8 @@ <!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml --> + <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository> + <feature name='transaction' description='OSGi Transaction Manager' version='${aries.transaction.version}' resolver='(obr)'> <details>JTA implementation provided by Apache Aries Transaction ${aries.transaction.version}</details> <config name='org.apache.aries.transaction'> http://git-wip-us.apache.org/repos/asf/karaf/blob/8714ee28/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg index f449c92..a507ee4 100644 --- a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg +++ b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg @@ -32,4 +32,3 @@ jclouds = org.jclouds.karaf:jclouds-karaf:xml:features:(0,] openejb = org.apache.openejb:openejb-feature:xml:features:(0,] wicket = org.ops4j.pax.wicket:features:xml:features:(0,] hawtio = io.hawt:hawtio-karaf:xml:features:(0,] -pax-cdi = org.ops4j.pax.cdi:pax-cdi-features:xml:features:(0,] http://git-wip-us.apache.org/repos/asf/karaf/blob/8714ee28/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index d9e22a7..f5db49c 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -16,8 +16,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<features name="standard-${project.version}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0";> +<features name="standard-${project.version}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0";> + <repository>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</repository> <feature version="${project.version}" description="OSGi Security for Karaf" name="framework-security"> http://git-wip-us.apache.org/repos/asf/karaf/blob/8714ee28/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1137a7f..9a67acf 100644 --- a/pom.xml +++ b/pom.xml @@ -223,6 +223,7 @@ <osgi.version>5.0.0</osgi.version> <osgi.compendium.version>5.0.0</osgi.compendium.version> <org.json.version>20131018</org.json.version> + <pax.cdi.version>0.6.0</pax.cdi.version> <pax.exam.version>3.4.0</pax.exam.version> <pax.logging.version>1.7.1</pax.logging.version> <pax.base.version>1.4.0</pax.base.version>
