Author: stefanegli
Date: Tue Sep 10 13:29:33 2013
New Revision: 1521475
URL: http://svn.apache.org/r1521475
Log:
SLING-3051 : updated maven plugin and dependency versions of maven-scr-plugin
and org.apache.felix.scr.annotations to work properly with m2eclipse (otherwise
complains about lifecycle-mapping for scr goal not being mapped, and with these
versions it works perfect). Plus adjusting the outputDirectory as suggested in
SLING-3019
Modified:
sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
Modified:
sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml?rev=1521475&r1=1521474&r2=1521475&view=diff
==============================================================================
---
sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
(original)
+++
sling/trunk/tooling/maven/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
Tue Sep 10 13:29:33 2013
@@ -30,7 +30,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.2</version>
+ <version>1.13.0</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -39,6 +39,9 @@
</goals>
</execution>
</executions>
+ <configuration>
+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -94,7 +97,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.6.0</version>
+ <version>1.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>