[ https://issues.apache.org/jira/browse/KARAF-5867?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16582636#comment-16582636 ]
ASF GitHub Bot commented on KARAF-5867: --------------------------------------- jbonofre closed pull request #597: [KARAF-5867] Add openjpa3 feature URL: https://github.com/apache/karaf/pull/597 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/assemblies/features/enterprise-legacy/src/main/feature/feature.xml b/assemblies/features/enterprise-legacy/src/main/feature/feature.xml index 56e6312ad0..58fe37d03b 100644 --- a/assemblies/features/enterprise-legacy/src/main/feature/feature.xml +++ b/assemblies/features/enterprise-legacy/src/main/feature/feature.xml @@ -90,6 +90,28 @@ </capability> </feature> + <feature name="openjpa" description="Apache OpenJPA 2.4.x persistence engine support" version="2.4.2"> + <details>Enable Apache OpenJPA as persistence engine.</details> + <feature>jndi</feature> + <feature version="[1.2,1.3)">transaction-api</feature> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle> + <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle> + <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle> + <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_6</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle> + <bundle dependency="true">mvn:org.apache.xbean/xbean-asm5-shaded/4.3</bundle> + <bundle>mvn:org.apache.openjpa/openjpa/2.4.2</bundle> + <capability> + osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.apache.openjpa.persistence.PersistenceProviderImpl + </capability> + </feature> + <feature name="hibernate" description="Hibernate 4.2.x JPA persistence engine support" version="${hibernate42.version}"> <details>Enable Hibernate 4.2.x as persistence engine.</details> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle> diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml index 048af06ae6..ea12683491 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -28,6 +28,7 @@ <repository>mvn:org.ops4j.pax.transx/pax-transx-features/${pax.transx.version}/xml/features</repository> <repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository> <repository>mvn:org.apache.aries.jpa/jpa-features/${aries.jpa.version}/xml/features</repository> + <repository>mvn:org.apache.openjpa/openjpa-features/${openjpa.version}/xml/features</repository> <feature name="transaction-api" version="1.2.0"> <bundle dependency="true">mvn:javax.interceptor/javax.interceptor-api/1.2</bundle> @@ -160,23 +161,9 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos <bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle> </feature> - <feature name="openjpa" description="Apache OpenJPA 2.4.x persistence engine support" version="2.4.2"> - <details>Enable Apache OpenJPA as persistence engine.</details> - <feature>jndi</feature> - <feature version="[1.2,1.3)">transaction-api</feature> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle> - <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle> - <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle> - <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.version}</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_6</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle> - <bundle dependency="true">mvn:org.apache.xbean/xbean-asm5-shaded/4.3</bundle> - <bundle>mvn:org.apache.openjpa/openjpa/2.4.2</bundle> + <feature name="openjpa3" description="OpenJPA engine support" version="${openjpa.version}"> + <bundle dependency="true">mvn:org.apache.xbean/xbean-asm6-shaded/4.9</bundle> + <feature version="${openjpa.version}">openjpa</feature> <capability> osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.apache.openjpa.persistence.PersistenceProviderImpl </capability> diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java index 84c5e493ca..be254149bf 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java @@ -93,6 +93,11 @@ public void installOpenJpa240Feature() throws Exception { installAssertAndUninstallFeature("openjpa", "2.4.2"); } + @Test + public void installOpenJpa3Feature() throws Exception { + installAssertAndUninstallFeatures("openjpa3"); + } + @Test public void installHibernate4215FinalFeature() throws Exception { installAssertAndUninstallFeature("hibernate", "4.2.15.Final"); diff --git a/pom.xml b/pom.xml index 5c7e69ba74..2ba587e013 100644 --- a/pom.xml +++ b/pom.xml @@ -247,6 +247,7 @@ <aries.util.version>1.1.3</aries.util.version> <atomikos.version>4.0.4</atomikos.version> + <openjpa.version>3.0.0</openjpa.version> <geronimo.transaction.manager.version>3.1.3</geronimo.transaction.manager.version> <guava.version>20.0</guava.version> <narayana.version>5.9.0.Final</narayana.version> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Provide openjpa 3.0.0 support > ----------------------------- > > Key: KARAF-5867 > URL: https://issues.apache.org/jira/browse/KARAF-5867 > Project: Karaf > Issue Type: New Feature > Components: karaf-feature > Reporter: Jean-Baptiste Onofré > Assignee: Jean-Baptiste Onofré > Priority: Major > Fix For: 4.2.1 > > > OpenJPA 3.0.0 now supports JPA 2.2 and natively provides Karaf features: > http://repo.maven.apache.org/maven2/org/apache/openjpa/openjpa-features/3.0.0/ > To give visibility for users and convenient way of installing OpenJPA, it > makes sense to reference openjpa feature in Karaf enterprise feature and also > update examples/itests to use it. -- This message was sent by Atlassian JIRA (v7.6.3#76005)