Author: fmeschbe
Date: Fri Nov 27 20:00:49 2009
New Revision: 884980
URL: http://svn.apache.org/viewvc?rev=884980&view=rev
Log:
SLING-1190 Upgrade embedded jackrabbit repository to 1.6 and provide
prefabricated MANIFEST.MF
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
Modified: sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/pom.xml?rev=884980&r1=884979&r2=884980&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/pom.xml Fri Nov 27 20:00:49 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
@@ -164,11 +164,11 @@
sling,jcr,jackrabbit
</Bundle-Category>
<Bundle-Activator>
-
org.apache.sling.jcr.jackrabbit.server.Activator
+
org.apache.sling.jcr.jackrabbit.server.impl.Activator
</Bundle-Activator>
<Export-Package>
-
org.apache.sling.jcr.jackrabbit.server.security.*,
-
org.apache.jackrabbit.core.security.principal
+
org.apache.sling.jcr.jackrabbit.server.security.*;version=2.0.4-incubator,
+
org.apache.jackrabbit.core.security.principal;version=1.6.0
</Export-Package>
<Private-Package>
org.apache.sling.jcr.jackrabbit.server.impl.*
@@ -199,6 +199,9 @@
poi, poi-scratchpad,
nekohtml, xercesImpl
</Embed-Dependency>
+ <_removeheaders>
+
Embed-Dependency,Private-Package,Include-Resource
+ </_removeheaders>
</instructions>
</configuration>
</execution>
@@ -241,7 +244,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0</version>
<scope>compile</scope>
</dependency>
@@ -249,16 +252,16 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-text-extractors</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0</version>
</dependency>
<!-- OSGi Libraries -->
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
</dependencies>
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF?rev=884980&r1=884979&r2=884980&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
Fri Nov 27 20:00:49 2009
@@ -1,55 +1,66 @@
Manifest-Version: 1.0
-Note: Manifest File built by Maven Bundle Plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.sling.jcr.jackrabbit.server
-Bundle-Version: 2.0.3.incubator-SNAPSHOT
-Bundle-Name: Apache Sling Jackrabbit Embedded Repository
-Bundle-Description: Bundle providing support to embed Jackrabbit Repos
- itory instances and publish via RMI and/or JNDI
+Export-Package: org.apache.sling.jcr.jackrabbit.server.security;uses:=
+ "javax.jcr,javax.security.auth.callback,javax.security.auth.login";ve
+ rsion="2.0.4.incubator",org.apache.sling.jcr.jackrabbit.server.securi
+ ty.accessmanager;uses:="javax.jcr,javax.security.auth";version="2.0.4
+ .incubator",org.apache.jackrabbit.core.security.principal;uses:="org.
+ apache.jackrabbit.api.security.principal,org.slf4j,org.apache.commons
+ .collections.map,javax.jcr,org.apache.jackrabbit.api.security.user,or
+ g.apache.commons.collections.iterators,javax.jcr.observation,org.apac
+ he.commons.collections.set";version="1.6.0"
+Service-Component: OSGI-INF/serviceComponents.xml
+Bundle-ClassPath: .,jackrabbit-jcr-rmi-1.4.1.jar,jackrabbit-core-1.6.0
+ .jar,jackrabbit-jcr-commons-1.6.0.jar,jackrabbit-spi-commons-1.6.0.ja
+ r,jackrabbit-spi-1.6.0.jar,lucene-core-2.4.1.jar,derby-10.2.1.6.jar,c
+ oncurrent-1.3.4.jar,jackrabbit-text-extractors-1.6.0.jar,pdfbox-0.7.3
+ .jar,jempbox-0.2.0.jar,fontbox-0.1.0.jar,poi-3.2-FINAL.jar,poi-scratc
+ hpad-3.2-FINAL.jar,nekohtml-1.9.7.jar,xercesImpl-2.8.1.jar
+Tool: Bnd-0.0.357
+Embed-Transitive: true
+Bundle-Activator: org.apache.sling.jcr.jackrabbit.server.impl.Activato
+ r
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-SymbolicName: org.apache.sling.jcr.jackrabbit.server
+Note: Built by bundle profile
Bundle-Category: sling,jcr,jackrabbit
+Bundle-Name: Apache Sling Jackrabbit Embedded Repository
+Created-By: 1.6.0_13 (Sun Microsystems Inc.)
+DynamicImport-Package: *
Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.5.SNAPSHOT
+Bnd-LastModified: 1259304895649
+Bundle-ManifestVersion: 2
+Bundle-Description: Bundle providing support to embed Jackrabbit Repos
+ itory instances and publish via RMI and/or JNDI
+Import-Package: javax.jcr;version="1.0.0",javax.jcr.lock;version="1.0.
+ 0",javax.jcr.nodetype;version="1.0.0",javax.jcr.observation;version="
+ 1.0.0",javax.jcr.query;version="1.0.0",javax.jcr.util;version="1.0.0"
+ ,javax.jcr.version;version="1.0.0",javax.naming,javax.naming.director
+ y,javax.naming.spi,javax.security.auth,javax.security.auth.callback,j
+ avax.security.auth.login,javax.security.auth.spi,javax.xml.datatype,j
+ avax.xml.namespace,javax.xml.parsers,javax.xml.transform,javax.xml.tr
+ ansform.dom,javax.xml.transform.sax,javax.xml.transform.stream,javax.
+ xml.validation,org.apache.commons.collections,org.apache.commons.coll
+ ections.bidimap,org.apache.commons.collections.buffer,org.apache.comm
+ ons.collections.collection,org.apache.commons.collections.iterators,o
+ rg.apache.commons.collections.list,org.apache.commons.collections.map
+ ,org.apache.commons.collections.set,org.apache.jackrabbit.api;version
+ ="1.6.0",org.apache.jackrabbit.api.jsr283;version="1.6.0",org.apache.
+ jackrabbit.api.jsr283.lock;version="1.6.0",org.apache.jackrabbit.api.
+ jsr283.nodetype;version="1.6.0",org.apache.jackrabbit.api.jsr283.obse
+ rvation;version="1.6.0",org.apache.jackrabbit.api.jsr283.query;versio
+ n="1.6.0",org.apache.jackrabbit.api.jsr283.retention;version="1.6.0",
+ org.apache.jackrabbit.api.jsr283.security;version="1.6.0",org.apache.
+ jackrabbit.api.jsr283.version;version="1.6.0",org.apache.jackrabbit.a
+ pi.observation;version="1.6.0",org.apache.jackrabbit.api.security.pri
+ ncipal;version="1.6.0",org.apache.jackrabbit.api.security.user;versio
+ n="1.6.0",org.apache.sling.jcr.api;version="2.0.2",org.apache.sling.j
+ cr.base;version="2.0.2",org.apache.sling.jcr.jackrabbit.server.securi
+ ty;version="2.0.5",org.apache.sling.jcr.jackrabbit.server.security.ac
+ cessmanager;version="2.0.5",org.osgi.framework;version="1.4.0",org.os
+ gi.service.cm;version="1.2.0",org.osgi.service.component;version="1.0
+ .0",org.osgi.service.log;version="1.3.0",org.osgi.util.tracker;versio
+ n="1.3.3",org.slf4j;version="1.5.2",org.xml.sax,org.xml.sax.helpers
Bundle-DocURL: http://sling.apache.org
-Bundle-Activator: org.apache.sling.jcr.jackrabbit.server.impl.Activator
-Bundle-ClassPath: .,nekohtml-1.9.7.jar,lucene-core-2.3.2.jar,jackrabbi
- t-spi-commons-1.5.0.jar,jackrabbit-jcr-commons-1.5.0.jar,jempbox-0.2.
- 0.jar,jackrabbit-jcr-rmi-1.4.1.jar,concurrent-1.3.4.jar,jackrabbit-te
- xt-extractors-1.5.0.jar,fontbox-0.1.0.jar,jackrabbit-core-1.5.0.jar,d
- erby-10.2.1.6.jar,poi-3.0.2-FINAL.jar,xercesImpl-2.8.1.jar,pdfbox-0.7
- .3.jar,jackrabbit-spi-1.5.0.jar,poi-scratchpad-3.0.2-FINAL.jar
-Export-Package: org.apache.sling.jcr.jackrabbit.server.security;uses:=
- "javax.jcr,javax.security.auth.callback,javax.security.auth.login,jav
- ax.security.auth";version="2.0.3.incubator-SNAPSHOT",org.apache.jackr
- abbit.core.security.principal;uses:="javax.jcr,org.slf4j,org.apache.c
- ommons.collections.iterators,org.apache.jackrabbit.api.security.user,
- org.apache.commons.collections.map,javax.jcr.observation,org.apache.j
- ackrabbit.api.security.principal,org.apache.commons.collections.set";
- version="2.0.3.incubator-SNAPSHOT",org.apache.sling.jcr.jackrabbit.se
- rver.security.accessmanager;uses:="javax.jcr,javax.security.auth";ver
- sion="2.0.3.incubator-SNAPSHOT"
-Import-Package: javax.jcr,javax.jcr.lock,javax.jcr.nodetype,javax.jcr.
- observation,javax.jcr.query,javax.jcr.util,javax.jcr.version,javax.na
- ming,javax.naming.directory,javax.naming.spi,javax.security.auth,java
- x.security.auth.callback,javax.security.auth.login,javax.security.aut
- h.spi,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.
- xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.x
- ml.transform.stream,javax.xml.validation,org.apache.commons.collectio
- ns,org.apache.commons.collections.buffer,org.apache.commons.collectio
- ns.iterators,org.apache.commons.collections.list,org.apache.commons.c
- ollections.map,org.apache.commons.collections.set,org.apache.jackrabb
- it.api;version="1.5",org.apache.jackrabbit.api.jsr283;version="1.5",o
- rg.apache.jackrabbit.api.jsr283.nodetype;version="1.5",org.apache.jac
- krabbit.api.jsr283.retention;version="1.5",org.apache.jackrabbit.api.
- jsr283.security;version="1.5",org.apache.jackrabbit.api.observation;v
- ersion="1.5",org.apache.jackrabbit.api.security.principal;version="1.
- 5",org.apache.jackrabbit.api.security.user;version="1.5",org.apache.s
- ling.jcr.api,org.apache.sling.jcr.base;version="2.0.2.incubator",org.
- apache.sling.jcr.jackrabbit.server.security;version="2.0.3.incubator-
- SNAPSHOT",org.osgi.framework,org.osgi.service.cm,org.osgi.service.com
- ponent,org.osgi.service.log,org.osgi.util.tracker,org.slf4j,org.xml.s
- ax,org.xml.sax.helpers
-DynamicImport-Package: *
-Service-Component: OSGI-INF/serviceComponents.xml
-Bnd-LastModified: 1232723302069
-Tool: Bnd-0.0.255
-Created-By: 1.6.0_10 (Sun Microsystems Inc.)
+Originally-Created-By: 1.6.0_10 (Sun Microsystems Inc.)
+
