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 2008/02/04 08:42:04 UTC
svn commit: r618187 - in /incubator/sling/trunk:
jcr/jackrabbit-server/pom.xml launcher/app/pom.xml launcher/webapp/pom.xml
launchpad/launchpad-webapp/pom.xml osgi/obr/pom.xml parent/pom.xml
Author: cziegeler
Date: Sun Feb 3 23:42:02 2008
New Revision: 618187
URL: http://svn.apache.org/viewvc?rev=618187&view=rev
Log:
Use released version and update to latest scr plugin snapshot.
Modified:
incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
incubator/sling/trunk/launcher/app/pom.xml
incubator/sling/trunk/launcher/webapp/pom.xml
incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml
incubator/sling/trunk/osgi/obr/pom.xml
incubator/sling/trunk/parent/pom.xml
Modified: incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/pom.xml?rev=618187&r1=618186&r2=618187&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/pom.xml Sun Feb 3 23:42:02 2008
@@ -213,7 +213,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: incubator/sling/trunk/launcher/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/app/pom.xml?rev=618187&r1=618186&r2=618187&view=diff
==============================================================================
--- incubator/sling/trunk/launcher/app/pom.xml (original)
+++ incubator/sling/trunk/launcher/app/pom.xml Sun Feb 3 23:42:02 2008
@@ -154,26 +154,18 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.0.0</version>
<scope>provided</scope>
</dependency>
- <!--
- Depend on current Felix Framework snapshot due to a bug
- in synchronous shutdown, which prevents Sling from shutting
- controllably.
- -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -194,22 +186,18 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/sling/trunk/launcher/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/webapp/pom.xml?rev=618187&r1=618186&r2=618187&view=diff
==============================================================================
--- incubator/sling/trunk/launcher/webapp/pom.xml (original)
+++ incubator/sling/trunk/launcher/webapp/pom.xml Sun Feb 3 23:42:02 2008
@@ -216,7 +216,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
<!-- The servlet container will have to provide these API classes -->
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml?rev=618187&r1=618186&r2=618187&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml Sun Feb 3 23:42:02 2008
@@ -334,17 +334,15 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/sling/trunk/osgi/obr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/obr/pom.xml?rev=618187&r1=618186&r2=618187&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/obr/pom.xml (original)
+++ incubator/sling/trunk/osgi/obr/pom.xml Sun Feb 3 23:42:02 2008
@@ -122,7 +122,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.0.0</version>
<scope>compile</scope>
</dependency>
Modified: incubator/sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=618187&r1=618186&r2=618187&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Sun Feb 3 23:42:02 2008
@@ -140,7 +140,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
@@ -550,9 +550,40 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>1.0.3</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</dependencyManagement>