Applied patch (FELIX-313) to support archive configuration (e.g., excluding
pom.xml and pom.properties from the resulting JAR file).
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@559878 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/maven2/maven-osgi-plugin/pom.xml b/tools/maven2/maven-osgi-plugin/pom.xml
index 6b241b4..b77cfa3 100644
--- a/tools/maven2/maven-osgi-plugin/pom.xml
+++ b/tools/maven2/maven-osgi-plugin/pom.xml
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</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 e63c16f..5f43b89 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
@@ -1,4 +1,4 @@
-/*
+/*
* 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
@@ -112,8 +112,9 @@
/**
* The maven archive configuration to use.
+ * @parameter
*/
- private MavenArchiveConfiguration archiveConfig = new MavenArchiveConfiguration();
+ private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
/**
* The comma separated list of tokens to include in the JAR. Default is
@@ -268,8 +269,8 @@
}
verifyBundleActivator(mainJar);
-
- archiver.createArchive(project, archiveConfig);
+
+ archiver.createArchive(project, archive);
project.getArtifact().setFile(jarFile);
}
@@ -280,7 +281,7 @@
case 0:
break;
case 1:
- archiveConfig.addManifestEntry("Bundle-Activator", mainJar.activators.get(0));
+ archive.addManifestEntry("Bundle-Activator", mainJar.activators.get(0));
break;
default:
getLog().info("[OSGi] Multiple activators found, unable to auto-detect." );
@@ -302,7 +303,7 @@
}
}
if (sb.length() > 0)
- archiveConfig.addManifestEntry("Bundle-Classpath", sb.toString());
+ archive.addManifestEntry("Bundle-Classpath", sb.toString());
}
/**
@@ -363,7 +364,7 @@
}
}
}
- archiveConfig.addManifestEntry(
+ archive.addManifestEntry(
"Export-Package",
printClauses(exports));
}
@@ -478,7 +479,7 @@
sb.append(i.next());
del = ", ";
}
- archiveConfig.addManifestEntry("Import-Package", sb.toString());
+ archive.addManifestEntry("Import-Package", sb.toString());
}
/**
@@ -599,7 +600,7 @@
getLog().info(
"Manifest file: " + file.getAbsolutePath()
+ " will be used");
- archiveConfig.setManifestFile(file);
+ archive.setManifestFile(file);
}
else {
getLog().info("No manifest file specified. Default will be used.");
@@ -621,7 +622,7 @@
getLog().debug(
"Bundle manifest will be modified with the following entries: "
+ entries.toString());
- archiveConfig.addManifestEntries(entries);
+ archive.addManifestEntries(entries);
}
else {
getLog()