Author: cziegeler Date: Sun Jan 31 12:48:17 2010 New Revision: 905019 URL: http://svn.apache.org/viewvc?rev=905019&view=rev Log: Use latest jcr api to decouple modules from jcr 1.0 (contained in older jcr api releases)
Modified: sling/trunk/bundles/commons/auth/pom.xml sling/trunk/bundles/commons/testing/pom.xml sling/trunk/bundles/extensions/event/pom.xml sling/trunk/bundles/jcr/base/pom.xml sling/trunk/bundles/jcr/classloader/pom.xml sling/trunk/bundles/jcr/contentloader/pom.xml sling/trunk/bundles/jcr/jackrabbit-server/pom.xml sling/trunk/bundles/jcr/ocm/pom.xml sling/trunk/bundles/jcr/resource/pom.xml sling/trunk/bundles/jcr/webconsole/pom.xml sling/trunk/bundles/jcr/webdav/pom.xml sling/trunk/bundles/servlets/post/pom.xml sling/trunk/contrib/extensions/gwt/sample/pom.xml sling/trunk/contrib/extensions/i18n/pom.xml sling/trunk/contrib/jcr/compiler/pom.xml sling/trunk/contrib/jcr/jackrabbit-client/pom.xml sling/trunk/contrib/jcr/prefs/pom.xml sling/trunk/contrib/scripting/scala/engine/pom.xml sling/trunk/installer/jcr/jcrinstall/pom.xml sling/trunk/samples/espblog/pom.xml sling/trunk/samples/webloader/service/pom.xml Modified: sling/trunk/bundles/commons/auth/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/auth/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/commons/auth/pom.xml (original) +++ sling/trunk/bundles/commons/auth/pom.xml Sun Jan 31 12:48:17 2010 @@ -97,10 +97,14 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.resource</artifactId> <version>2.0.4-incubator</version> Modified: sling/trunk/bundles/commons/testing/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/commons/testing/pom.xml (original) +++ sling/trunk/bundles/commons/testing/pom.xml Sun Jan 31 12:48:17 2010 @@ -74,7 +74,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.4</version> + <version>2.0.6</version> <scope>compile</scope> </dependency> <dependency> Modified: sling/trunk/bundles/extensions/event/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/extensions/event/pom.xml (original) +++ sling/trunk/bundles/extensions/event/pom.xml Sun Jan 31 12:48:17 2010 @@ -115,7 +115,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/bundles/jcr/base/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/jcr/base/pom.xml (original) +++ sling/trunk/bundles/jcr/base/pom.xml Sun Jan 31 12:48:17 2010 @@ -90,7 +90,11 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> + </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> Modified: sling/trunk/bundles/jcr/classloader/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/classloader/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/jcr/classloader/pom.xml (original) +++ sling/trunk/bundles/jcr/classloader/pom.xml Sun Jan 31 12:48:17 2010 @@ -86,7 +86,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/bundles/jcr/contentloader/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/jcr/contentloader/pom.xml (original) +++ sling/trunk/bundles/jcr/contentloader/pom.xml Sun Jan 31 12:48:17 2010 @@ -96,7 +96,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/bundles/jcr/jackrabbit-server/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/jcr/jackrabbit-server/pom.xml (original) +++ sling/trunk/bundles/jcr/jackrabbit-server/pom.xml Sun Jan 31 12:48:17 2010 @@ -228,9 +228,13 @@ <dependencies> <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/bundles/jcr/ocm/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/ocm/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/jcr/ocm/pom.xml (original) +++ sling/trunk/bundles/jcr/ocm/pom.xml Sun Jan 31 12:48:17 2010 @@ -146,6 +146,10 @@ <artifactId>servlet-api</artifactId> </dependency> <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> <version>2.0.8</version> @@ -163,7 +167,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: sling/trunk/bundles/jcr/resource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/jcr/resource/pom.xml (original) +++ sling/trunk/bundles/jcr/resource/pom.xml Sun Jan 31 12:48:17 2010 @@ -131,7 +131,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/bundles/jcr/webconsole/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webconsole/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/jcr/webconsole/pom.xml (original) +++ sling/trunk/bundles/jcr/webconsole/pom.xml Sun Jan 31 12:48:17 2010 @@ -81,9 +81,13 @@ <dependencies> <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> Modified: sling/trunk/bundles/jcr/webdav/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/jcr/webdav/pom.xml (original) +++ sling/trunk/bundles/jcr/webdav/pom.xml Sun Jan 31 12:48:17 2010 @@ -101,7 +101,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -122,6 +122,10 @@ </dependency> <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> Modified: sling/trunk/bundles/servlets/post/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/bundles/servlets/post/pom.xml (original) +++ sling/trunk/bundles/servlets/post/pom.xml Sun Jan 31 12:48:17 2010 @@ -100,6 +100,10 @@ <artifactId>servlet-api</artifactId> </dependency> <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -112,7 +116,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/contrib/extensions/gwt/sample/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/gwt/sample/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/contrib/extensions/gwt/sample/pom.xml (original) +++ sling/trunk/contrib/extensions/gwt/sample/pom.xml Sun Jan 31 12:48:17 2010 @@ -120,9 +120,13 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> </dependency> <dependency> <groupId>org.osgi</groupId> Modified: sling/trunk/contrib/extensions/i18n/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/contrib/extensions/i18n/pom.xml (original) +++ sling/trunk/contrib/extensions/i18n/pom.xml Sun Jan 31 12:48:17 2010 @@ -82,7 +82,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.4</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/contrib/jcr/compiler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/compiler/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/contrib/jcr/compiler/pom.xml (original) +++ sling/trunk/contrib/jcr/compiler/pom.xml Sun Jan 31 12:48:17 2010 @@ -84,9 +84,13 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> <!-- logging --> <dependency> Modified: sling/trunk/contrib/jcr/jackrabbit-client/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/jackrabbit-client/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/contrib/jcr/jackrabbit-client/pom.xml (original) +++ sling/trunk/contrib/jcr/jackrabbit-client/pom.xml Sun Jan 31 12:48:17 2010 @@ -88,7 +88,11 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> + </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> </dependency> <dependency> Modified: sling/trunk/contrib/jcr/prefs/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/prefs/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/contrib/jcr/prefs/pom.xml (original) +++ sling/trunk/contrib/jcr/prefs/pom.xml Sun Jan 31 12:48:17 2010 @@ -85,7 +85,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/contrib/scripting/scala/engine/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/engine/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/contrib/scripting/scala/engine/pom.xml (original) +++ sling/trunk/contrib/scripting/scala/engine/pom.xml Sun Jan 31 12:48:17 2010 @@ -121,7 +121,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/installer/jcr/jcrinstall/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/installer/jcr/jcrinstall/pom.xml (original) +++ sling/trunk/installer/jcr/jcrinstall/pom.xml Sun Jan 31 12:48:17 2010 @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> </dependency> <dependency> <groupId>org.apache.sling</groupId> Modified: sling/trunk/samples/espblog/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/samples/espblog/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/samples/espblog/pom.xml (original) +++ sling/trunk/samples/espblog/pom.xml Sun Jan 31 12:48:17 2010 @@ -72,10 +72,14 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> <scope>provided</scope> Modified: sling/trunk/samples/webloader/service/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/samples/webloader/service/pom.xml?rev=905019&r1=905018&r2=905019&view=diff ============================================================================== --- sling/trunk/samples/webloader/service/pom.xml (original) +++ sling/trunk/samples/webloader/service/pom.xml Sun Jan 31 12:48:17 2010 @@ -91,10 +91,14 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.jcr.api</artifactId> - <version>2.0.2-incubator</version> + <version>2.0.6</version> <scope>provided</scope> </dependency> <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.mime</artifactId> <version>2.0.2-incubator</version>