FELIX-560: fix bundle:install and bundle:deploy to respect supportedProjectTypes setting
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@656719 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
index 4d51fde..27bb5b7 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
@@ -74,7 +74,7 @@
* @parameter
*/
private List supportedProjectTypes = Arrays.asList( new String[]
- { "bundle" } );
+ { "jar", "bundle" } );
/**
* @parameter expression="${project.distributionManagementArtifactRepository}"
@@ -277,7 +277,7 @@
private void updateRemoteBundleMetadata( Artifact artifact, ObrUpdate update ) throws MojoExecutionException
{
- if ( !"bundle".equals( artifact.getType() ) )
+ if ( !supportedProjectTypes.contains( artifact.getType() ) )
{
return;
}
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
index 7749b00..b8bd97d 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
@@ -55,7 +55,7 @@
* @parameter
*/
private List supportedProjectTypes = Arrays.asList( new String[]
- { "bundle" } );
+ { "jar", "bundle" } );
/**
* Local Repository.
@@ -156,7 +156,7 @@
private void updateLocalBundleMetadata( Artifact artifact, ObrUpdate update ) throws MojoExecutionException
{
- if ( !"bundle".equals( artifact.getType() ) )
+ if ( !supportedProjectTypes.contains( artifact.getType() ) )
{
return;
}