You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/27 17:59:38 UTC
svn commit: r1676319 - /sling/trunk/testing/mocks/sling-mock/pom.xml
Author: cziegeler
Date: Mon Apr 27 15:59:37 2015
New Revision: 1676319
URL: http://svn.apache.org/r1676319
Log:
Fix scr xml parsing when updating to new scr plugin by using fix for SLING-4670
Modified:
sling/trunk/testing/mocks/sling-mock/pom.xml
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1676319&r1=1676318&r2=1676319&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Mon Apr 27 15:59:37 2015
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -171,12 +171,6 @@
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
<version>3.0.20100224</version>
@@ -236,14 +230,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>