You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2009/01/29 08:23:06 UTC
svn commit: r738781 - in
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin:
AntPlugin.java BundleAllPlugin.java BundlePlugin.java ManifestPlugin.java
WrapPlugin.java
Author: mcculls
Date: Thu Jan 29 07:23:06 2009
New Revision: 738781
URL: http://svn.apache.org/viewvc?rev=738781&view=rev
Log:
FELIX-899: first step, widen dependency resolution and pass everything except test dependencies onto BND
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java?rev=738781&r1=738780&r2=738781&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java Thu Jan 29 07:23:06 2009
@@ -39,7 +39,7 @@
* Generate Ant script to create the bundle (you should run ant:ant first).
*
* @goal ant
- * @requiresDependencyResolution runtime
+ * @requiresDependencyResolution test
* @description generate Ant script to create the bundle
*/
public class AntPlugin extends BundlePlugin
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java?rev=738781&r1=738780&r2=738781&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java Thu Jan 29 07:23:06 2009
@@ -63,7 +63,7 @@
*
* @goal bundleall
* @phase package
- * @requiresDependencyResolution runtime
+ * @requiresDependencyResolution test
* @description build an OSGi bundle jar for all transitive dependencies
*/
public class BundleAllPlugin extends ManifestPlugin
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=738781&r1=738780&r2=738781&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Thu Jan 29 07:23:06 2009
@@ -72,7 +72,7 @@
*
* @goal bundle
* @phase package
- * @requiresDependencyResolution runtime
+ * @requiresDependencyResolution test
* @description build an OSGi bundle jar
*/
public class BundlePlugin extends AbstractMojo
@@ -711,9 +711,7 @@
Artifact artifact = ( Artifact ) it.next();
if ( artifact.getArtifactHandler().isAddedToClasspath() )
{
- if ( Artifact.SCOPE_COMPILE.equals( artifact.getScope() )
- || Artifact.SCOPE_SYSTEM.equals( artifact.getScope() )
- || Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) )
+ if ( !Artifact.SCOPE_TEST.equals( artifact.getScope() ) )
{
File file = getFile( artifact );
if ( file == null )
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java?rev=738781&r1=738780&r2=738781&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java Thu Jan 29 07:23:06 2009
@@ -45,7 +45,7 @@
*
* @goal manifest
* @phase process-classes
- * @requiresDependencyResolution runtime
+ * @requiresDependencyResolution test
*/
public class ManifestPlugin extends BundlePlugin
{
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java?rev=738781&r1=738780&r2=738781&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java Thu Jan 29 07:23:06 2009
@@ -25,7 +25,7 @@
/**
* @goal wrap
* @phase package
- * @requiresDependencyResolution runtime
+ * @requiresDependencyResolution test
* @description build an OSGi bundle jar for direct dependencies
*/
public final class WrapPlugin extends BundleAllPlugin