This is an automated email from the ASF dual-hosted git repository. paulrutter pushed a commit to branch maintenance/FELIX-6741-Upgrade-dependencies-for-maven-bundle-plugin in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 8cc01b4d0f882db8cd91aaa813f0601a59de707c Author: Paul Rütter <[email protected]> AuthorDate: Sun Dec 1 13:37:31 2024 +0100 FELIX-6741 Upgrade dependencies for maven-bundle-plugin - Upgrade all dependencies, including bnd 7.1.0 --- tools/maven-bundle-plugin/changelog.txt | 5 +++ tools/maven-bundle-plugin/pom.xml | 41 ++++++++++++---------- .../apache/felix/bundleplugin/BundlePlugin.java | 3 +- .../bundleplugin/baseline/BaselineReport.java | 33 +++++++++-------- 4 files changed, 45 insertions(+), 37 deletions(-) diff --git a/tools/maven-bundle-plugin/changelog.txt b/tools/maven-bundle-plugin/changelog.txt index 5a60fdadaf..f0fb150f5c 100644 --- a/tools/maven-bundle-plugin/changelog.txt +++ b/tools/maven-bundle-plugin/changelog.txt @@ -1,3 +1,8 @@ +Changes from 6.0.0 to 6.1.0 +--------------------------- +* Improvement + * FELIX-6741 Upgrade dependencies for maven-bundle-plugin (bnd 7.1.0 among other updates). See https://github.com/bndtools/bnd/wiki/Changes-in-7.1.0 + Changes from 5.1.9 to 6.0.0 --------------------------- * Improvement diff --git a/tools/maven-bundle-plugin/pom.xml b/tools/maven-bundle-plugin/pom.xml index 19848a9658..93d43c7e52 100644 --- a/tools/maven-bundle-plugin/pom.xml +++ b/tools/maven-bundle-plugin/pom.xml @@ -168,72 +168,77 @@ <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>6.0.0</version> + <artifactId>osgi.core</artifactId> + <version>8.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.metatype</artifactId> + <version>1.2.4</version> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>7.0.0</version> + <version>7.1.0</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.25</version> + <version>2.0.16</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.bundlerepository</artifactId> - <version>1.6.6</version> + <version>2.0.10</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.utils</artifactId> - <version>1.6.0</version> + <version>1.11.8</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.8.1</version> + <version>3.9.9</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.3.9</version> + <version>3.9.9</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>3.3.9</version> + <version>3.9.9</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.8.1</version> + <version>3.9.9</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> - <version>3.0</version> + <version>4.0.0</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-archiver</artifactId> - <version>3.5.2</version> + <version>3.6.3</version> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> - <version>3.0</version> + <version>3.3.0</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.3.0</version> + <version>4.0.2</version> </dependency> <dependency> <groupId>org.sonatype.plexus</groupId> @@ -243,17 +248,17 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-sink-api</artifactId> - <version>1.0</version> + <version>2.0.0</version> </dependency> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-site-renderer</artifactId> - <version>1.0</version> + <version>2.0.0</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> - <version>3.4</version> + <version>3.15.1</version> <scope>provided</scope> </dependency> <dependency> @@ -271,7 +276,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.13.1</version> + <version>4.13.2</version> <scope>test</scope> </dependency> </dependencies> diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java index 7c54ba1b75..db38474ae1 100644 --- a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +++ b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java @@ -550,8 +550,7 @@ public class BundlePlugin extends AbstractMojo Properties properties = new Properties(); properties.putAll( getDefaultProperties( currentProject ) ); properties.putAll( transformDirectives( originalInstructions ) ); - - if ( new MavenArchiver().parseOutputTimestamp( outputTimestamp ) != null ) + if (MavenArchiver.parseBuildOutputTimestamp(outputTimestamp).isPresent()) { properties.put( Constants.REPRODUCIBLE, "true" ); } diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java index 43665a65bb..9eba731287 100644 --- a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java +++ b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java @@ -324,23 +324,6 @@ public final class BaselineReport return !skip && outputDirectory != null; } - public void generate( @SuppressWarnings( "deprecation" ) org.codehaus.doxia.sink.Sink sink, Locale locale ) - throws MavenReportException - { - final Context ctx = new Context(); - ctx.sink = sink; - ctx.locale = locale; - - try - { - execute(ctx); - } - catch ( Exception e ) - { - getLog().warn( "An error occurred while producing the report page, see nested exceptions", e ); - } - } - public String getCategoryName() { return MavenReport.CATEGORY_PROJECT_REPORTS; @@ -361,6 +344,22 @@ public final class BaselineReport return ResourceBundle.getBundle( "baseline-report", locale, getClass().getClassLoader() ); } + @Override + public void generate(Sink sink, Locale locale) throws MavenReportException { + final Context ctx = new Context(); + ctx.sink = sink; + ctx.locale = locale; + + try + { + execute(ctx); + } + catch ( Exception e ) + { + getLog().warn( "An error occurred while producing the report page, see nested exceptions", e ); + } + } + public String getOutputName() { return "baseline-report";
