You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by jb...@apache.org on 2023/05/15 03:53:50 UTC
[felix-dev] branch master updated: FELIX-6602 sort resources and exported packages
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new d885d99a6a FELIX-6602 sort resources and exported packages
new 89f6f4c658 Merge pull request #208 from hboutemy/FELIX-6602
d885d99a6a is described below
commit d885d99a6a16660f655a4fd18e8a1a39beef0a15
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Mar 25 00:18:11 2023 +0100
FELIX-6602 sort resources and exported packages
---
.../src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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 3a556776a1..24c5c64d5b 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
@@ -1938,6 +1938,7 @@ public class BundlePlugin extends AbstractMojo
scanner.scan();
String[] paths = scanner.getIncludedFiles();
+ Arrays.sort( paths );
for ( int i = 0; i < paths.length; i++ )
{
packages.put( analyzer.getPackageRef( getPackageName( paths[i] ) ) );
@@ -2076,7 +2077,9 @@ public class BundlePlugin extends AbstractMojo
scanner.addDefaultExcludes();
scanner.scan();
- List<String> includedFiles = Arrays.asList( scanner.getIncludedFiles() );
+ String[] f = scanner.getIncludedFiles();
+ Arrays.sort( f );
+ List<String> includedFiles = Arrays.asList( f );
for ( Iterator<String> j = includedFiles.iterator(); j.hasNext(); )
{