[FELIX-6460] {maven-test-sources} not working as expected

• Type: Bug
• Status: Resolved
• Priority: Blocker
• Resolution: Fixed
• Affects Version/s: maven-bundle-plugin-2.5.0, maven-bundle-plugin-5.1.2
• Fix Version/s: maven-bundle-plugin-5.1.3
• Component/s: Maven Bundle Plugin
• Flags: Patch
• Assignee: Jean-Baptiste Onofré
• Reporter: Tuomas Kiviaho
• Created: 22/Sep/21 15:10
• Updated: 07/Dec/21 14:31
• Resolved: 07/Dec/21 14:31

Description

I seem to have introduced a bug along my patch for FELIX-3381.

Edit: I've actually failed to verify the actual patch patch  https://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?revision=1602812&view=markup&pathrev=1695270

There is should be a test in BundlePlugin.java whether {maven-sources} and/or {maven-test-sources} placeholders are present but instead I've managed miss a typo {maven-test-resources} that was patched there instead.

Could this simple typo be fixed

BundlePlugin.java

@@ -2143,7 +2143,7 @@
         final String sourcePath = analyzer.getProperty( Analyzer.SOURCEPATH );
         if ( sourcePath != null )
         {
-            if ( sourcePath.contains(MAVEN_SOURCES) || sourcePath.contains(MAVEN_TEST_RESOURCES) )
+            if ( sourcePath.contains(MAVEN_SOURCES) || sourcePath.contains(MAVEN_TEST_SOURCES) )
             {
                 String combinedSource = StringUtils.replace( sourcePath, MAVEN_SOURCES, mavenSourcePaths.toString() );
                 combinedSource = StringUtils.replace( combinedSource, MAVEN_TEST_SOURCES, mavenTestSourcePaths.toString() );

Issue Links

• fixes: FELIX-3381 Support for {maven-test-resources} and {maven-test-sources} placeholders