| commit | 12264ad5650ebbd8672c8029b40b0dbb542b4ffb | [log] [tgz] |
|---|---|---|
| author | Hiram R. Chirino <chirino@apache.org> | Tue Feb 01 20:54:49 2011 +0000 |
| committer | Hiram R. Chirino <chirino@apache.org> | Tue Feb 01 20:54:49 2011 +0000 |
| tree | 4ab388a28ee5746b3720833222567e7a31ed8ac9 | |
| parent | 4b26df93bffdc1e54d0ba0a52f04d87583d54f86 [diff] |
Fixes FELIX-2817 : The maven-bundle-plugin manifest goal should honor the supportedProjectTypes configuration setting. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1066202 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java index d0da8bc..084d55c 100644 --- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -113,7 +113,7 @@ * * @parameter */ - private List supportedProjectTypes = Arrays.asList( new String[] + protected List supportedProjectTypes = Arrays.asList( new String[] { "jar", "bundle" } ); /**
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java index f427003..6e5677e 100644 --- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java +++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -55,7 +55,7 @@ Manifest manifest; try { - if ( "bundle".equals( project.getPackaging() ) ) + if ( supportedProjectTypes.contains( getProject().getArtifact().getType() ) ) { Builder builder = buildOSGiBundle( project, instructions, properties, classpath ); manifest = builder.getJar().getManifest();