Updated Branches: refs/heads/master e977ac090 -> cc7e2af53
[KARAF-2549] Add openjpa enterprise feature Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cc7e2af5 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cc7e2af5 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cc7e2af5 Branch: refs/heads/master Commit: cc7e2af53fb1860b24bbdbe3e58c8074fbe56019 Parents: e977ac0 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Dec 19 18:33:20 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Dec 19 18:33:20 2013 +0100 ---------------------------------------------------------------------- .../features/enterprise/src/main/feature/feature.xml | 15 +++++++++++++-- pom.xml | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/cc7e2af5/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 045f0ab..fc7494a 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -47,6 +47,17 @@ <bundle start-level='30'>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.container.context.version}</bundle> </feature> + <feature name='openjpa' description='Apache OpenJPA persistence engine support' version='${openjpa.version}' resolver='(obr)'> + <details>Install Apache OpenJPA as persistence engine, used by the jpa feature.</details> + <feature>jpa</feature> + <feature>http</feature> + <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections.version}</bundle> + <bundle>mvn:commons-pool/commons-pool/${commons-pool.version}</bundle> + <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle> + <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle> + <bundle>mvn:org.apache.openjpa/openjpa/${openjpa.version}</bundle> + </feature> + <feature name='jndi' description='OSGi Service Registry JNDI access' version='${project.version}' resolver='(obr)'> <details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}, including additional service, commands, and MBean.</details> <bundle start-level='30'>mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle> @@ -62,8 +73,8 @@ <feature name='jdbc' description='JDBC service and commands' version='${project.version}' resolver='(obr)'> <details>JDBC support providing service, commands, and MBean.</details> <feature>transaction</feature> - <bundle>mvn:commons-pool/commons-pool/1.6</bundle> - <bundle>mvn:commons-dbcp/commons-dbcp/1.4</bundle> + <bundle>mvn:commons-pool/commons-pool/${commons-pool.version}</bundle> + <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle> <bundle>mvn:org.apache.karaf.jdbc/org.apache.karaf.jdbc.core/${project.version}</bundle> <bundle>mvn:org.apache.karaf.jdbc/org.apache.karaf.jdbc.command/${project.version}</bundle> </feature> http://git-wip-us.apache.org/repos/asf/karaf/blob/cc7e2af5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 37d4325..0f6bba7 100644 --- a/pom.xml +++ b/pom.xml @@ -125,11 +125,13 @@ <commons-beanutils.version>1.8.3</commons-beanutils.version> <commons-codec.version>1.8</commons-codec.version> <commons-collections.version>3.2.1</commons-collections.version> + <commons-dbcp.version>1.4</commons-dbcp.version> <commons-fileupload.version>1.2.2</commons-fileupload.version> <commons-compress.version>1.6</commons-compress.version> <commons-io.version>2.4</commons-io.version> <commons-jexl.version>2.1.1</commons-jexl.version> <commons-lang.version>2.6</commons-lang.version> + <commons-pool.version>1.6</commons-pool.version> <jasypt.bundle.version>1.9.1_1</jasypt.bundle.version> <servlet.spec.groupId>org.apache.geronimo.specs</servlet.spec.groupId> <servlet.spec.artifactId>geronimo-servlet_3.0_spec</servlet.spec.artifactId> @@ -206,6 +208,7 @@ <log4j.version>1.2.17</log4j.version> <maven.version>2.0.9</maven.version> <mina.version>2.0.7</mina.version> + <openjpa.version>2.3.0</openjpa.version> <osgi.version>5.0.0</osgi.version> <osgi.compendium.version>5.0.0</osgi.compendium.version> <org.json.version>20131018</org.json.version>
