You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by ma...@apache.org on 2012/09/14 20:43:01 UTC
svn commit: r1384880 - in /db/jdo/trunk/api: API3.MF pom.xml
Author: madams
Date: Fri Sep 14 18:43:01 2012
New Revision: 1384880
URL: http://svn.apache.org/viewvc?rev=1384880&view=rev
Log:
JDO-694 Automating OSGi manifest creation
Removed:
db/jdo/trunk/api/API3.MF
Modified:
db/jdo/trunk/api/pom.xml
Modified: db/jdo/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/pom.xml?rev=1384880&r1=1384879&r2=1384880&view=diff
==============================================================================
--- db/jdo/trunk/api/pom.xml (original)
+++ db/jdo/trunk/api/pom.xml Fri Sep 14 18:43:01 2012
@@ -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,16 +73,16 @@
</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>
@@ -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.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>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>API3.MF</manifestFile>
+ <manifestFile>
+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+ </manifestFile>
</archive>
</configuration>
</plugin>