Index: API3.MF
===================================================================
--- API3.MF	(revision 1379474)
+++ API3.MF	(working copy)
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Specification-Version: JDO 3.1
-Bundle-ManifestVersion: 2
-Bundle-Name: Java Data Objects
-Bundle-SymbolicName: javax.jdo
-Bundle-Version: 3.1.0
-Bundle-Localization: plugin
-Export-Package: javax.jdo;version="3.1.0",
- javax.jdo.annotations;version="3.1.0",
- javax.jdo.datastore;version="3.1.0",
- javax.jdo.identity;version="3.1.0",
- javax.jdo.listener;version="3.1.0",
- javax.jdo.spi;version="3.1.0",
- javax.jdo.metadata;version="3.1.0"
-Bundle-Vendor: Apache
-Import-Package: javax.transaction;resolution:=optional,
- javax.persistence;resolution:=optional
Index: pom.xml
===================================================================
--- pom.xml	(revision 1379527)
+++ pom.xml	(working copy)
@@ -14,9 +14,11 @@
     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.
--->     
+-->
 
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
   <parent>
     <groupId>javax.jdo</groupId>
@@ -71,18 +73,18 @@
       </testResource>
     </testResources>
     <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.0.2</version>
         <configuration>
@@ -93,12 +95,41 @@
           <target>1.5</target>
         </configuration>
       </plugin>
+      <!-- The next two plugins are required until such time as https://issues.apache.org/jira/browse/FELIX-3352 is fixed. -->
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.7</version>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <instructions>
+                <Specification-Version>JDO 3.1</Specification-Version>
+                <!-- Keep the API project's symbolic name the same as that in 3.0.1 for backward compatibility reasons -->
+                <Bundle-SymbolicName>javax.jdo</Bundle-SymbolicName>
+                <Bundle-Localization>plugin</Bundle-Localization>
+                <Bundle-DocURL>${project.parent.project.url}</Bundle-DocURL>
+                <Import-Package>
+                  javax.transaction;resolution:=optional,
+                  *
+                </Import-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
-            <manifestFile>API3.MF</manifestFile>
+            <manifestFile>
+              ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+            </manifestFile>
           </archive>
         </configuration>
       </plugin>