From 3d851b848c9e439530ddbfe40acd7e8c457b0a9d Mon Sep 17 00:00:00 2001
From: Christian Schneider <chris@die-schneider.net>
Date: Fri, 30 Sep 2016 15:58:10 +0200
Subject: [PATCH 1/2] [OPENJPA-2669] Add karaf feature and adapt imports

---
 openjpa-features/pom.xml                      | 74 +++++++++++++++++++
 openjpa-features/src/main/feature/feature.xml | 35 +++++++++
 openjpa/pom.xml                               |  2 +-
 pom.xml                                       |  1 +
 4 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 openjpa-features/pom.xml
 create mode 100644 openjpa-features/src/main/feature/feature.xml

diff --git a/openjpa-features/pom.xml b/openjpa-features/pom.xml
new file mode 100644
index 0000000000..c6ea981836
--- /dev/null
+++ b/openjpa-features/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
+<!-- Please keep the project tag on one line to avoid confusing the release 
+	plugin. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.openjpa</groupId>
+		<artifactId>openjpa-parent</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>openjpa-features</artifactId>
+	<packaging>pom</packaging>
+	<name>OpenJPA Features</name>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.karaf.tooling</groupId>
+				<artifactId>karaf-maven-plugin</artifactId>
+				<configuration>
+				</configuration>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>features-generate-descriptor</goal>
+						</goals>
+						<configuration>
+							<addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-artifacts</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>target/feature/feature.xml</file>
+									<classifier>features</classifier>
+									<type>xml</type>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/openjpa-features/src/main/feature/feature.xml b/openjpa-features/src/main/feature/feature.xml
new file mode 100644
index 0000000000..b9221d6d46
--- /dev/null
+++ b/openjpa-features/src/main/feature/feature.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<features name="openjpa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
+
+    <feature name="openjpa" description="Apache OpenJPA 3 persistence engine support" version="${project.version}">
+        <details>Apache OpenJPA persistence engine</details>
+        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+        <bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</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-el_1.0_spec/1.0.1</bundle>
+		<bundle dependency="true">mvn:commons-pool/commons-pool/1.6</bundle>
+		<bundle dependency="true">mvn:commons-dbcp/commons-dbcp/1.4</bundle>
+		<bundle dependency="true">mvn:commons-collections/commons-collections/3.2.2</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.14.1_1</bundle>
+        <bundle dependency="true">mvn:org.apache.xbean/xbean-asm5-shaded/4.3</bundle>
+        <bundle>mvn:org.apache.openjpa/openjpa/${project.version}</bundle>
+    </feature>
+
+</features>
diff --git a/openjpa/pom.xml b/openjpa/pom.xml
index 33321f621f..a2588cbae6 100644
--- a/openjpa/pom.xml
+++ b/openjpa/pom.xml
@@ -133,7 +133,7 @@
                         	javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,
                         	javax.xml.bind.*;resolution:=optional,
                         	serp.*;resolution:=optional,
-                        	javax.persistence.*;version="[1.1.0,2.1)",
+                        	javax.persistence.*;version="[1.1.0,2.2)",
                         	*
                         </Import-Package>
                     </instructions>
diff --git a/pom.xml b/pom.xml
index 01428789db..7efcf35ce9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,6 +169,7 @@
         <module>openjpa-integration</module>
         <module>openjpa-all</module>
         <module>openjpa-tools</module>
+        <module>openjpa-features</module>
     </modules>
 
     <profiles>

From 85cd6b50fedeb8ac58584a61d8f84b4ecdf82c8a Mon Sep 17 00:00:00 2001
From: Christian Schneider <chris@die-schneider.net>
Date: Thu, 6 Oct 2016 10:24:23 +0200
Subject: [PATCH 2/2] [OPENJPA-2669] Add jndi

---
 openjpa-features/src/main/feature/feature.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openjpa-features/src/main/feature/feature.xml b/openjpa-features/src/main/feature/feature.xml
index b9221d6d46..f007c54c29 100644
--- a/openjpa-features/src/main/feature/feature.xml
+++ b/openjpa-features/src/main/feature/feature.xml
@@ -20,6 +20,7 @@
 
     <feature name="openjpa" description="Apache OpenJPA 3 persistence engine support" version="${project.version}">
         <details>Apache OpenJPA persistence engine</details>
+	<feature>jndi</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>