[Git][java-team/maven-bundle-plugin][master] 11 commits: Standards-Version updated to 4.7.4
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue May 26 20:55:37 BST 2026
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-bundle-plugin
Commits:
e19a6dc3 by Emmanuel Bourg at 2026-05-25T19:13:52+02:00
Standards-Version updated to 4.7.4
- - - - -
22b9ed2c by Emmanuel Bourg at 2026-05-25T19:14:53+02:00
Update upstream source from tag 'upstream/4.0.0'
Update to upstream version '4.0.0'
with Debian dir 114d36886a7d27124ab6cc424adcb107aea6910e
- - - - -
62d3c83e by Emmanuel Bourg at 2026-05-25T19:14:53+02:00
New upstream version 4.0.0
- - - - -
4b30284c by Emmanuel Bourg at 2026-05-25T19:17:51+02:00
Refreshed the patches
- - - - -
161b507f by Emmanuel Bourg at 2026-05-26T01:22:01+02:00
Track and download the new releases from GitHub
- - - - -
b8f48a15 by Emmanuel Bourg at 2026-05-26T01:24:39+02:00
New upstream version 4.1.0
- - - - -
bcb22315 by Emmanuel Bourg at 2026-05-26T01:24:40+02:00
Update upstream source from tag 'upstream/4.1.0'
Update to upstream version '4.1.0'
with Debian dir 94c2d01edf8a779d40f416e65b90e65e65250299
- - - - -
a0787918 by Emmanuel Bourg at 2026-05-26T01:34:29+02:00
patches
- - - - -
29f8f868 by Emmanuel Bourg at 2026-05-26T20:47:29+02:00
Updated the Maven rules
- - - - -
e6020461 by Emmanuel Bourg at 2026-05-26T21:46:08+02:00
Relocated the version 3.5.1 to the current version
- - - - -
ff4f27e1 by Emmanuel Bourg at 2026-05-26T21:46:19+02:00
Upload to unstable
- - - - -
11 changed files:
- debian/changelog
- debian/control
- debian/libmaven-bundle-plugin-java.poms
- debian/maven.ignoreRules
- debian/patches/0002-FELIX-6602-sort-resources-and-exported-packages.patch
- debian/watch
- 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:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+maven-bundle-plugin (4.1.0-1) unstable; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+ - Updated the Maven rules
+ - Relocated the version 3.5.1 to the current version
+ * Standards-Version updated to 4.7.4
+ * Track and download the new releases from GitHub
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 26 May 2026 21:46:14 +0200
+
maven-bundle-plugin (3.5.1-3) unstable; urgency=medium
[ tony mancill ]
=====================================
debian/control
=====================================
@@ -23,7 +23,7 @@ Build-Depends:
libplexus-archiver-java,
libplexus-utils2-java,
maven-debian-helper (>= 2.0~)
-Standards-Version: 4.7.0
+Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/java-team/maven-bundle-plugin.git
Vcs-Browser: https://salsa.debian.org/java-team/maven-bundle-plugin
Homepage: https://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html
=====================================
debian/libmaven-bundle-plugin-java.poms
=====================================
@@ -25,4 +25,4 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-pom.xml --no-parent --has-package-version
+pom.xml --no-parent --has-package-version --relocate=org.apache.felix:maven-bundle-plugin:3.5.1
=====================================
debian/maven.ignoreRules
=====================================
@@ -1,4 +1,5 @@
+junit junit
org.apache.maven.plugins maven-changes-plugin * * * *
org.apache.maven.shared maven-plugin-testing-harness * * * *
org.apache.rat apache-rat-plugin * * * *
=====================================
debian/patches/0002-FELIX-6602-sort-resources-and-exported-packages.patch
=====================================
@@ -9,7 +9,7 @@ Subject: [PATCH] FELIX-6602 sort resources and exported packages
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -1938,6 +1938,7 @@ public class BundlePlugin extends AbstractMojo
+@@ -1880,6 +1880,7 @@
scanner.scan();
String[] paths = scanner.getIncludedFiles();
@@ -17,7 +17,7 @@ Subject: [PATCH] FELIX-6602 sort resources and exported packages
for ( int i = 0; i < paths.length; i++ )
{
packages.put( analyzer.getPackageRef( getPackageName( paths[i] ) ) );
-@@ -2076,7 +2077,9 @@ public class BundlePlugin extends AbstractMojo
+@@ -2018,7 +2019,9 @@
scanner.addDefaultExcludes();
scanner.scan();
@@ -28,6 +28,3 @@ Subject: [PATCH] FELIX-6602 sort resources and exported packages
for ( Iterator<String> j = includedFiles.iterator(); j.hasNext(); )
{
---
-2.43.0
-
=====================================
debian/watch
=====================================
@@ -1,2 +1,3 @@
version=4
-https://archive.apache.org/dist/felix maven-bundle-plugin at ANY_VERSION@-source-release at ARCHIVE_EXT@
\ No newline at end of file
+opts="mode=git" \
+https://github.com/apache/felix-dev refs/tags/maven-bundle-plugin-(.*)
=====================================
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/97268446ea2fbbc3a79c470773b4af9fcdcd64f0...ff4f27e1aea9d28dc81b5625a6a808b5dd93bf87
--
View it on GitLab: https://salsa.debian.org/java-team/maven-bundle-plugin/-/compare/97268446ea2fbbc3a79c470773b4af9fcdcd64f0...ff4f27e1aea9d28dc81b5625a6a808b5dd93bf87
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/52a9fbcb/attachment.htm>
More information about the pkg-java-commits
mailing list