[Git][java-team/maven-bundle-plugin][upstream] 2 commits: New upstream version 4.0.0
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue May 26 20:55:41 BST 2026
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / maven-bundle-plugin
Commits:
62d3c83e by Emmanuel Bourg at 2026-05-25T19:14:53+02:00
New upstream version 4.0.0
- - - - -
b8f48a15 by Emmanuel Bourg at 2026-05-26T01:24:39+02:00
New upstream version 4.1.0
- - - - -
5 changed files:
- pom.xml
- src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java
- src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
- src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java
- src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
Changes:
=====================================
pom.xml
=====================================
@@ -21,14 +21,14 @@
<parent>
<artifactId>felix-parent</artifactId>
<groupId>org.apache.felix</groupId>
- <version>4</version>
+ <version>6</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.1</version>
+ <version>4.1.0</version>
<packaging>maven-plugin</packaging>
<name>Maven Bundle Plugin</name>
@@ -42,9 +42,9 @@
<url>http://felix.apache.org/components/bundle-plugin/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-3.5.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-3.5.1</developerConnection>
- <url>http://svn.apache.org/viewvc/felix/releases/maven-bundle-plugin-3.5.1</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-4.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-4.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/felix/releases/maven-bundle-plugin-4.1.0</url>
</scm>
<!-- Support for publishing the mvn site. -->
@@ -164,7 +164,7 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>3.5.0</version>
+ <version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -228,6 +228,12 @@
<artifactId>jdom</artifactId>
<version>1.1</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<reporting>
=====================================
src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java
=====================================
@@ -52,6 +52,7 @@ import org.apache.maven.shared.dependency.graph.traversal.FilteringDependencyNod
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 AbstractDependencyFilter
}
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() );
}
};
}
=====================================
src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
=====================================
@@ -28,7 +28,7 @@ import org.apache.maven.artifact.Artifact;
* Information result of the bundling process
*
* @author <a href="mailto:carlos at apache.org">Carlos Sanchez</a>
- * @version $Id: BundleInfo.java 1786059 2017-03-08 19:30:10Z sseifert $
+ * @version $Id$
*/
public class BundleInfo
{
=====================================
src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java
=====================================
@@ -42,7 +42,7 @@ import org.apache.maven.project.ProjectBuilderConfiguration;
* Common methods for bundle plugin testing
*
* @author <a href="mailto:carlos at apache.org">Carlos Sanchez</a>
- * @version $Id: AbstractBundlePluginTest.java 1785857 2017-03-07 16:43:30Z sseifert $
+ * @version $Id$
*/
public abstract class AbstractBundlePluginTest extends AbstractMojoTestCase
{
=====================================
src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
=====================================
@@ -28,7 +28,7 @@ import org.codehaus.plexus.PlexusTestCase;
* Test for {@link DefaultMaven2OsgiConverter}
*
* @author <a href="mailto:carlos at apache.org">Carlos Sanchez</a>
- * @version $Id: Maven2OsgiConverterTest.java 1679513 2015-05-15 08:53:36Z cziegeler $
+ * @version $Id$
*/
public class Maven2OsgiConverterTest
extends PlexusTestCase
View it on GitLab: https://salsa.debian.org/java-team/maven-bundle-plugin/-/compare/af0251e5b6395f72980ab2258c19a64dabf752fa...b8f48a15d1785d27ff66a6b6c483156ae3583bfe
--
View it on GitLab: https://salsa.debian.org/java-team/maven-bundle-plugin/-/compare/af0251e5b6395f72980ab2258c19a64dabf752fa...b8f48a15d1785d27ff66a6b6c483156ae3583bfe
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260526/742f40c2/attachment.htm>
More information about the pkg-java-commits
mailing list