| commit | 1f97eacdb3624a2a261a360bcff1a53489354963 | [log] [tgz] |
|---|---|---|
| author | Brian O'Connor <bocon@onlab.us> | Fri Mar 25 15:53:50 2016 -0700 |
| committer | Brian O'Connor <bocon@onlab.us> | Fri Mar 25 18:16:36 2016 -0700 |
| tree | 4b5e2d59110fdfd4800fd321570ed4f08b985ca4 | |
| parent | d1993845610d601edfa58b08ddcc78a7ea9f36e2 [diff] |
FELIX-5225: SCR descriptor plugin was not putting updated component class files on the analyzer's jar Change-Id: I8c2e3ee37c577d683ef442691d7f79151b8b4256
diff --git a/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java b/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java index 10ef4f7..f8774d4 100644 --- a/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java +++ b/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
@@ -199,6 +199,15 @@ putResource(analyzer, metaTypeFile); } } + + // Embed the processed source files in the target jar + List<String> processedScrFiles = r.getProcessedSourceFiles(); + if (processedScrFiles != null) { + for (String processedScrFile : processedScrFiles) { + log.info("Processed source file: " + processedScrFile); + putResource(analyzer, processedScrFile); + } + } } catch (Throwable t) { log.error("Got unexpected exception while analyzing", t);