Added auto population of Bundle-Version manifest entry.
Added support for Import-Package manifest entry.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@240355 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/maven2/maven-osgi-plugin/pom.xml b/tools/maven2/maven-osgi-plugin/pom.xml
index 271462c..f647847 100644
--- a/tools/maven2/maven-osgi-plugin/pom.xml
+++ b/tools/maven2/maven-osgi-plugin/pom.xml
@@ -4,7 +4,7 @@
<artifactId>maven-osgi-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven OSGi Plugin</name>
- <version>0.1</version>
+ <version>0.1.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java b/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
index c9a8806..ee8170b 100644
--- a/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
+++ b/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
@@ -32,7 +32,7 @@
/**
* @author <a href="tbennett@apache.org">Timothy Bennett</a>
- * @goal felix-jar
+ * @goal osgi-jar
* @phase package
* @requiresDependencyResolution runtime
* @description build a OSGi bundle jar
@@ -89,7 +89,7 @@
* @todo Add license files in META-INF directory.
*/
public void execute() throws MojoExecutionException {
- File jarFile = new File(basedir, finalName + ".jar");
+ File jarFile = new File(basedir, finalName + "-bundle.jar");
MavenArchiver archiver = new MavenArchiver();
archiver.setOutputFile(jarFile);
@@ -159,6 +159,9 @@
}
bundleClasspath = null;
+ // auto-set the bundle version...
+ archive.addManifestEntry("Bundle-Version", project.getVersion());
+
// create the target bundle archive...
try {
File contentDirectory = new File(outputDirectory);
diff --git a/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java b/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java
index 839a526..3248927 100644
--- a/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java
+++ b/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java
@@ -31,11 +31,12 @@
private String bundleName;
private String bundleDescription;
private String bundleVendor;
- private String bundleVersion;
+ //private String bundleVersion;
//private String bundleClassPath;
private String bundleDate;
private String bundleUpdateLocation;
private String exportPackage;
+ private String importPackage;
private String metadataLocation;
private Hashtable entries = new Hashtable();
@@ -52,12 +53,17 @@
if (getBundleVendor() != null) {
entries.put("Bundle-Vendor", getBundleVendor());
}
+ /*
if (getBundleVersion() != null) {
entries.put("Bundle-Version", getBundleVersion());
}
+ */
if (getExportPackage() != null) {
entries.put("Export-Package", getExportPackage());
}
+ if (getImportPackage() != null) {
+ entries.put("Import-Package", getImportPackage());
+ }
/*
if (getBundleClassPath() != null) {
entries.put("Bundle-ClassPath", getBundleClassPath());
@@ -106,7 +112,7 @@
public void setBundleVendor(String bundleVendor) {
this.bundleVendor = bundleVendor;
}
-
+/*
public String getBundleVersion() {
return bundleVersion;
}
@@ -114,7 +120,7 @@
public void setBundleVersion(String bundleVersion) {
this.bundleVersion = bundleVersion;
}
-
+*/
public String getExportPackage() {
return exportPackage;
}
@@ -122,6 +128,15 @@
public void setExportPackage(String exportPackage) {
this.exportPackage = exportPackage;
}
+
+ public String getImportPackage() {
+ return importPackage;
+ }
+
+ public void setImportPackage(String importPackage) {
+ this.importPackage = importPackage;
+ }
+
/*
public String getBundleClassPath() {
return bundleClassPath;