Fix maven-scr-plugin does not generate XML for DS annotations in test…

… bundles (#6214)

The maven-resources-plugin is used to copy back the generated XML to the OSGI-INF directory so it is on the classpath in tests.
The outputDirectory configuration parameter of the maven-scr-plugin is not used because when it is set to ${project.basedir} it empties the OSGI-INF dir and would remove non-generated SCR XML files.

Signed-off-by: Wouter Born <eclipse@maindrain.net>

bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/.gitignore

@@ -0,0 +1 @@
+/*.xml

bundles/pom.xml

@@ -62,6 +62,27 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <outputDirectory>${project.basedir}/OSGI-INF</outputDirectory>
+              <overwrite>true</overwrite>
+              <resources>
+                <resource>
+                  <directory>${project.basedir}/target/classes/OSGI-INF</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/.gitignore

@@ -0,0 +1 @@
+/*.xml

extensions/binding/org.eclipse.smarthome.binding.dmx.test/src/test/java/org/eclipse/smarthome/binding/dmx/test/DmxTestHandlerFactory.java

@@ -26,7 +26,7 @@
  *
  * @author Jan N. Klug - Initial contribution
  */
-@Component(service = ThingHandlerFactory.class, immediate = true, name = "binding.dmx.test")
+@Component(service = ThingHandlerFactory.class)
 public class DmxTestHandlerFactory extends BaseThingHandlerFactory {
 
     @Override

extensions/pom.xml

@@ -60,6 +60,27 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <outputDirectory>${project.basedir}/OSGI-INF</outputDirectory>
+              <overwrite>true</overwrite>
+              <resources>
+                <resource>
+                  <directory>${project.basedir}/target/classes/OSGI-INF</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

pom.xml

@@ -176,6 +176,7 @@
           <configuration>
             <supportedProjectTypes>
               <supportedProjectType>eclipse-plugin</supportedProjectType>
+              <supportedProjectType>eclipse-test-plugin</supportedProjectType>
             </supportedProjectTypes>
           </configuration>
         </plugin>