Skip to content

Commit 66cea58

Browse files
committed
SLING-7585 - Fix Eclipse in-IDE errors after creating shared modules
Improve in-place OSGI metadata copying for pure Maven modules: - remove META-INF and OSGI-INF on clean - copy SCR descriptors as well
1 parent adb0523 commit 66cea58

2 files changed

Lines changed: 40 additions & 1 deletion

File tree

shared/modules/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
MANIFEST.MF
2+
OSGI-INF/

shared/modules/parent/pom.xml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<configuration>
4343
<excludes>
4444
<exclude>**/MANIFEST.MF</exclude>
45+
<exclude>**/OSGI-INF/*.xml</exclude>
4546
</excludes>
4647
</configuration>
4748
</plugin>
@@ -60,12 +61,31 @@
6061
</activation>
6162
<build>
6263
<plugins>
64+
<plugin>
65+
<artifactId>maven-clean-plugin</artifactId>
66+
<configuration>
67+
<filesets>
68+
<fileset>
69+
<directory>META-INF</directory>
70+
<includes>
71+
<include>*</include>
72+
</includes>
73+
</fileset>
74+
<fileset>
75+
<directory>OSGI-INF</directory>
76+
<includes>
77+
<include>*</include>
78+
</includes>
79+
</fileset>
80+
</filesets>
81+
</configuration>
82+
</plugin>
6383
<plugin>
6484
<artifactId>maven-resources-plugin</artifactId>
6585
<executions>
6686
<execution>
6787
<id>copy-manifest-for-pde</id>
68-
<phase>process-classes</phase>
88+
<phase>process-test-resources</phase>
6989
<goals>
7090
<goal>copy-resources</goal>
7191
</goals>
@@ -81,6 +101,24 @@
81101
</resources>
82102
</configuration>
83103
</execution>
104+
<execution>
105+
<id>copy-scr-descriptors-for-pde</id>
106+
<phase>process-test-resources</phase>
107+
<goals>
108+
<goal>copy-resources</goal>
109+
</goals>
110+
<configuration>
111+
<outputDirectory>OSGI-INF</outputDirectory>
112+
<resources>
113+
<resource>
114+
<directory>${project.build.outputDirectory}/OSGI-INF</directory>
115+
<includes>
116+
<include>*.xml</include>
117+
</includes>
118+
</resource>
119+
</resources>
120+
</configuration>
121+
</execution>
84122
</executions>
85123
</plugin>
86124
</plugins>

0 commit comments

Comments
 (0)