incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jus...@apache.org
Subject svn commit: r1033493 - in /sling/trunk: bundles/auth/core/ bundles/auth/form/ bundles/auth/selector/ bundles/engine/ bundles/extensions/event/ bundles/extensions/explorer/ bundles/extensions/groovy/ bundles/extensions/webconsolesecurityprovider/ bundle...
Date Wed, 10 Nov 2010 14:36:53 GMT
Author: justin
Date: Wed Nov 10 14:36:52 2010
New Revision: 1033493

URL: http://svn.apache.org/viewvc?rev=1033493&view=rev
Log:
SLING-1869 - upgrading to latest SCR plugin and putting scr.annotations in parent

Modified:
    sling/trunk/bundles/auth/core/pom.xml
    sling/trunk/bundles/auth/form/pom.xml
    sling/trunk/bundles/auth/selector/pom.xml
    sling/trunk/bundles/engine/pom.xml
    sling/trunk/bundles/extensions/event/pom.xml
    sling/trunk/bundles/extensions/explorer/pom.xml
    sling/trunk/bundles/extensions/groovy/pom.xml
    sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml
    sling/trunk/bundles/jcr/davex/pom.xml
    sling/trunk/bundles/jcr/resource/pom.xml
    sling/trunk/bundles/jcr/webconsole/pom.xml
    sling/trunk/bundles/scripting/jsp/pom.xml
    sling/trunk/parent/pom.xml

Modified: sling/trunk/bundles/auth/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/pom.xml (original)
+++ sling/trunk/bundles/auth/core/pom.xml Wed Nov 10 14:36:52 2010
@@ -143,8 +143,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.3.0</version>
-            <scope>provided</scope>
         </dependency>
 
         <!-- Test Dependencies -->

Modified: sling/trunk/bundles/auth/form/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/auth/form/pom.xml (original)
+++ sling/trunk/bundles/auth/form/pom.xml Wed Nov 10 14:36:52 2010
@@ -166,8 +166,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.3.0</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: sling/trunk/bundles/auth/selector/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/selector/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/auth/selector/pom.xml (original)
+++ sling/trunk/bundles/auth/selector/pom.xml Wed Nov 10 14:36:52 2010
@@ -132,8 +132,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.3.0</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: sling/trunk/bundles/engine/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Wed Nov 10 14:36:52 2010
@@ -162,8 +162,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.3.0</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: sling/trunk/bundles/extensions/event/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/pom.xml Wed Nov 10 14:36:52 2010
@@ -55,7 +55,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <version>1.4.5-SNAPSHOT</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -113,8 +112,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.3.1-SNAPSHOT</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: sling/trunk/bundles/extensions/explorer/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/explorer/pom.xml (original)
+++ sling/trunk/bundles/extensions/explorer/pom.xml Wed Nov 10 14:36:52 2010
@@ -44,10 +44,6 @@
 
     <build>
         <plugins>
-		     <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

Modified: sling/trunk/bundles/extensions/groovy/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/groovy/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/groovy/pom.xml (original)
+++ sling/trunk/bundles/extensions/groovy/pom.xml Wed Nov 10 14:36:52 2010
@@ -97,8 +97,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.0.0</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>

Modified: sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml (original)
+++ sling/trunk/bundles/extensions/webconsolesecurityprovider/pom.xml Wed Nov 10 14:36:52
2010
@@ -92,8 +92,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.3.0</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: sling/trunk/bundles/jcr/davex/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/davex/pom.xml (original)
+++ sling/trunk/bundles/jcr/davex/pom.xml Wed Nov 10 14:36:52 2010
@@ -90,8 +90,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.0.0</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Wed Nov 10 14:36:52 2010
@@ -57,14 +57,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <version>1.4.2</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-simple</artifactId>
-                            <version>1.5.2</version>
-                        </dependency>
-                    </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -113,8 +105,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.2.0</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.jcr</groupId>

Modified: sling/trunk/bundles/jcr/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webconsole/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webconsole/pom.xml (original)
+++ sling/trunk/bundles/jcr/webconsole/pom.xml Wed Nov 10 14:36:52 2010
@@ -103,8 +103,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.0.0</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: sling/trunk/bundles/scripting/jsp/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp/pom.xml Wed Nov 10 14:36:52 2010
@@ -102,8 +102,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.2.0</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>

Modified: sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1033493&r1=1033492&r2=1033493&view=diff
==============================================================================
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Wed Nov 10 14:36:52 2010
@@ -213,7 +213,7 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.4.4</version>
+                    <version>1.6.0</version>
                     <!-- As QDox is trying to inspect/load the classes
                          we have to add a slf4j implementation to the
                          class path of the plugin - we usually use
@@ -586,6 +586,14 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
                 <scope>provided</scope>
             </dependency>
 
+            <!-- Declarative Services support annotations -->
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.scr.annotations</artifactId>
+                <version>1.4.0</version>
+                <scope>provided</scope>
+            </dependency>
+
             <!-- Basic dependencies for Unit Tests -->
             <dependency>
                 <groupId>junit</groupId>



Mime
View raw message