You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2018/08/27 19:12:21 UTC
svn commit: r1839365 - in /felix/trunk/tools/maven-bundle-plugin: pom.xml
src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java
Author: rotty3000
Date: Mon Aug 27 19:12:21 2018
New Revision: 1839365
URL: http://svn.apache.org/viewvc?rev=1839365&view=rev
Log:
FELIX-5920 Prepare maven-bundle-plugin for release with bndlib 4.0.0
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
felix/trunk/tools/maven-bundle-plugin/pom.xml
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java
Modified: felix/trunk/tools/maven-bundle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/pom.xml?rev=1839365&r1=1839364&r2=1839365&view=diff
==============================================================================
--- felix/trunk/tools/maven-bundle-plugin/pom.xml (original)
+++ felix/trunk/tools/maven-bundle-plugin/pom.xml Mon Aug 27 19:12:21 2018
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.2-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven Bundle Plugin</name>
@@ -164,7 +164,7 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>3.5.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java?rev=1839365&r1=1839364&r2=1839365&view=diff
==============================================================================
--- felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java (original)
+++ felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java Mon Aug 27 19:12:21 2018
@@ -52,6 +52,7 @@ import org.apache.maven.shared.dependenc
public abstract class AbstractDependencyFilter
{
private static final Pattern MISSING_KEY_PATTERN = Pattern.compile( "(^|,)\\p{Blank}*(!)?\\p{Blank}*([a-zA-Z]+=)" );
+ private static final String PLACEHOLDER = "$$PLACEHOLDER$$";
/**
* Dependency Graph.
@@ -234,12 +235,15 @@ public abstract class AbstractDependency
}
else if ( "classifier".equals( attr.getKey() ) )
{
- filter = new DependencyFilter( attr.getValue() )
+ // bnd-4.0.0+ no longer accepts empty instructions. However maven expects
+ // the classifier can be an empty value, so use a placeholder for this
+ // scenario.
+ filter = new DependencyFilter( ( "".equals(attr.getValue()) ) ? PLACEHOLDER : attr.getValue() )
{
@Override
public boolean include( Artifact dependency )
{
- return super.matches( dependency.getClassifier() );
+ return super.matches( ( ( dependency.getClassifier() == null ) || ( "".equals( dependency.getClassifier() ) ) ) ? PLACEHOLDER : dependency.getClassifier() );
}
};
}